File tree Expand file tree Collapse file tree 2 files changed +9
-1
lines changed
Expand file tree Collapse file tree 2 files changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -127,6 +127,14 @@ message("ROARING_LIBRARIES: " ${ROARING_LIBRARIES})
127127if (NOT ROARING_INCLUDE_DIRS OR NOT ROARING_LIBRARIES)
128128 message (FATAL_ERROR "Could not find libroaring" )
129129endif ()
130+ file (READ "${ROARING_INCLUDE_DIRS} /roaring/roaring.hh" ROARING_HEADER_CONTENTS)
131+ string (REGEX MATCH "namespace roaring" ROARING_HAS_NAMESPACE "${ROARING_HEADER_CONTENTS} " )
132+ if (ROARING_HAS_NAMESPACE)
133+ message (STATUS "Roaring64Map is in namespace roaring" )
134+ else ()
135+ message (STATUS "Roaring64Map is in global namespace" )
136+ add_definitions (-DROARING_NAMESPACE_GLOBAL)
137+ endif ()
130138
131139if (LINK_STATIC AND NOT VCPKG_TRIPLET)
132140 find_library (LIB_ZSTD NAMES libzstd.a)
Original file line number Diff line number Diff line change @@ -42,7 +42,7 @@ using ClientImplPtr = std::shared_ptr<ClientImpl>;
4242class ExecutorService ;
4343using ExecutorServicePtr = std::shared_ptr<ExecutorService>;
4444using LedgerId = int64_t ;
45- #if __cplusplus >= 202002L
45+ #ifdef ROARING_NAMESPACE_GLOBAL
4646using ConditionalRoaringMap = Roaring64Map;
4747#else
4848using ConditionalRoaringMap = roaring::Roaring64Map;
You can’t perform that action at this time.
0 commit comments