Skip to content

Commit 3d3df5a

Browse files
committed
Use @pitrou solution to abseil symbol visibility issue
1 parent 3157818 commit 3d3df5a

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

cpp/src/arrow/flight/transport/grpc/customize_grpc.h

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,26 @@
2020
#include <limits>
2121
#include <memory>
2222

23+
// HACK: Workaround absl::Mutex ABI incompatibility by making sure the
24+
// non-debug version of Abseil is included
25+
// (https://github.com/conda-forge/abseil-cpp-feedstock/issues/104,
26+
// https://github.com/abseil/abseil-cpp/issues/1624)
27+
28+
#if __has_include(<absl/synchronization/mutex.h>)
29+
30+
# ifndef NDEBUG
31+
# define ARROW_NO_NDEBUG
32+
# define NDEBUG
33+
# endif
34+
35+
# include <absl/synchronization/mutex.h>
36+
37+
# ifdef ARROW_NO_NDEBUG
38+
# undef NDEBUG
39+
# endif
40+
41+
#endif
42+
2343
#include "arrow/flight/platform.h"
2444
#include "arrow/flight/type_fwd.h"
2545
#include "arrow/flight/visibility.h"

cpp/src/arrow/flight/transport/grpc/grpc_client.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#pragma once
2121

22+
#include "arrow/flight/transport/grpc/protocol_grpc_internal.h"
2223
#include "arrow/flight/visibility.h"
2324

2425
namespace arrow {

0 commit comments

Comments
 (0)