Skip to content

ARROW-11724: [C++] Resolve namespace collisions with protobuf 3.15 #9542

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

Closed
xhochy wants to merge 1 commit into from
Closed

ARROW-11724: [C++] Resolve namespace collisions with protobuf 3.15 #9542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions cpp/src/arrow/flight/client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@
#include "arrow/flight/serialization_internal.h"
#include "arrow/flight/types.h"

namespace pb = arrow::flight::protocol;

namespace arrow {

namespace flight {

namespace pb = arrow::flight::protocol;

const char* kWriteSizeDetailTypeId = "flight::FlightWriteSizeStatusDetail";

FlightCallOptions::FlightCallOptions()
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/arrow/flight/flight_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@
#include "arrow/flight/middleware_internal.h"
#include "arrow/flight/test_util.h"

namespace pb = arrow::flight::protocol;

namespace arrow {
namespace flight {

namespace pb = arrow::flight::protocol;

const char kValidUsername[] = "flight_username";
const char kValidPassword[] = "flight_password";
const char kInvalidUsername[] = "invalid_flight_username";
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/arrow/flight/serialization_internal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@
#include "arrow/util/bit_util.h"
#include "arrow/util/logging.h"

namespace pb = arrow::flight::protocol;

static constexpr int64_t kInt32Max = std::numeric_limits<int32_t>::max();

namespace arrow {
namespace flight {
namespace internal {

namespace pb = arrow::flight::protocol;

using arrow::ipc::IpcPayload;

using google::protobuf::internal::WireFormatLite;
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/arrow/flight/server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ using ServerContext = grpc::ServerContext;
template <typename T>
using ServerWriter = grpc::ServerWriter<T>;

namespace pb = arrow::flight::protocol;

namespace arrow {
namespace flight {

namespace pb = arrow::flight::protocol;

// Macro that runs interceptors before returning the given status
#define RETURN_WITH_MIDDLEWARE(CONTEXT, STATUS) \
do { \
Expand Down