chore: add compatibility with c++ 20

Author: syslucas

.github/workflows/ci-pr-validation.yaml

@@ -167,7 +167,7 @@ jobs:
           sudo apt-get install -y libcurl4-openssl-dev libssl-dev \
             protobuf-compiler libprotobuf-dev libboost-dev \
             libboost-dev libboost-program-options-dev \
-            libzstd-dev libsnappy-dev libgmock-dev libgtest-dev
+            libzstd-dev libsnappy-dev libgmock-dev libgtest-dev libroaring-dev
       - name: CMake
         run: cmake -B build -DBUILD_PERF_TOOLS=ON -DCMAKE_CXX_STANDARD=20
       - name: Build

LegacyFindPackages.cmake

@@ -93,6 +93,8 @@ endif ()
 message("Protobuf_INCLUDE_DIRS: " ${Protobuf_INCLUDE_DIRS})
 message("Protobuf_LIBRARIES: " ${Protobuf_LIBRARIES})
 
+find_package(roaring REQUIRED)
+
 # NOTE: CMake might not find curl and zlib on some platforms like Ubuntu, in this case, find them manually
 set(CURL_NO_CURL_CMAKE ON)
 find_package(curl QUIET)
@@ -129,6 +131,7 @@ if (LINK_STATIC AND NOT VCPKG_TRIPLET)
 elseif (LINK_STATIC AND VCPKG_TRIPLET)
     find_package(Protobuf REQUIRED)
     message(STATUS "Found protobuf static library: " ${Protobuf_LIBRARIES})
+    find_package(roaring REQUIRED)
     if (MSVC AND (${CMAKE_BUILD_TYPE} STREQUAL Debug))
         find_library(ZLIB_LIBRARIES NAMES zlibd)
     else ()

lib/NegativeAcksTracker.h

@@ -42,6 +42,11 @@ using ClientImplPtr = std::shared_ptr<ClientImpl>;
 class ExecutorService;
 using ExecutorServicePtr = std::shared_ptr<ExecutorService>;
 using LedgerId = int64_t;
+#if __cplusplus >= 202002L
+using ConditionalRoaringMap = Roaring64Map;
+#else
+using ConditionalRoaringMap = roaring::Roaring64Map;
+#endif
 
 class NegativeAcksTracker : public std::enable_shared_from_this<NegativeAcksTracker> {
    public:
@@ -68,7 +73,7 @@ class NegativeAcksTracker : public std::enable_shared_from_this<NegativeAcksTrac
     std::chrono::milliseconds nackDelay_;
     std::chrono::milliseconds timerInterval_;
     typedef typename std::chrono::steady_clock Clock;
-    std::map<Clock::time_point, std::unordered_map<LedgerId, roaring::Roaring64Map>> nackedMessages_;
+    std::map<Clock::time_point, std::unordered_map<LedgerId, ConditionalRoaringMap>> nackedMessages_;
 
     const DeadlineTimerPtr timer_;
     std::atomic_bool closed_{false};

vcpkg.json

@@ -43,6 +43,10 @@
       "name": "protobuf",
       "version>=": "3.21.12"
     },
+    {
+      "name": "roaring",
+      "version>=": "2.0.4"
+    },
     {
       "name": "snappy",
       "version>=": "1.1.10"
@@ -54,9 +58,6 @@
     {
       "name": "zstd",
       "version>=": "1.5.5"
-    },
-    {
-      "name": "roaring"
     }
   ],
   "features": {