Skip to content

GH-49991: [C++][FlightRPC] Fix unity build ordering issue #49990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spotaws wants to merge 2 commits into
base: main
Choose a base branch
from
+12 −6
Open

GH-49991: [C++][FlightRPC] Fix unity build ordering issue #49990

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0ff085
fix Unity build ordering issue
spotaws May 19, 2026
498a728
Simplify
kou May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions cpp/src/arrow/flight/transport/grpc/util_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,23 @@

#pragma once

#include <grpcpp/version_info.h>

#include "arrow/flight/transport/grpc/protocol_grpc_internal.h"
#include "arrow/flight/types.h"
#include "arrow/flight/visibility.h"
#include "arrow/util/macros.h"

#define GRPC_CPP_VERSION_CHECK(major, minor, patch) \
((GRPC_CPP_VERSION_MAJOR > (major) || \
(GRPC_CPP_VERSION_MAJOR == (major) && GRPC_CPP_VERSION_MINOR > (minor)) || \
((GRPC_CPP_VERSION_MAJOR == (major) && GRPC_CPP_VERSION_MINOR == (minor) && \
GRPC_CPP_VERSION_PATCH >= (patch)))))

#if GRPC_CPP_VERSION_CHECK(1, 80, 0)
# include <absl/status/status.h>
#endif

namespace grpc {

class Status;
Expand All @@ -34,12 +46,6 @@ class Status;

namespace flight {

#define GRPC_CPP_VERSION_CHECK(major, minor, patch) \
((GRPC_CPP_VERSION_MAJOR > (major) || \
(GRPC_CPP_VERSION_MAJOR == (major) && GRPC_CPP_VERSION_MINOR > (minor)) || \
((GRPC_CPP_VERSION_MAJOR == (major) && GRPC_CPP_VERSION_MINOR == (minor) && \
GRPC_CPP_VERSION_PATCH >= (patch)))))

#define GRPC_RETURN_NOT_OK(expr) \
do { \
::arrow::Status _s = (expr); \
Expand Down
Loading