changes for build with new compiler

Author: bas524

CMakeLists.txt

@@ -40,7 +40,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" MAT
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wextra -Wshadow")
 endif ()
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_C_STANDARD 11)
 

bins/broker/CMakeLists.txt

@@ -118,16 +118,7 @@ set(SOURCE_FILES
     s2s_proto/S2SProto.h
     session/DBMSSession.cpp
     session/DBMSSession.h
-    net/SocketReactor.cpp
-    net/SocketReactor.h
-    net/ParallelSocketReactor.h
-    net/ParallelSocketAcceptor.h
-    net/SocketNotifier.cpp
-    net/SocketNotifier.h
-    net/SocketNotification.cpp
-    net/SocketNotification.h
-    net/NotificationCenter.cpp
-    net/NotificationCenter.h)
+    )
 
 if (ENABLE_WEB_ADMIN)
   add_definitions(-DENABLE_WEB_ADMIN)
@@ -236,11 +227,11 @@ else ()
   endif ()
 endif ()
 
-target_link_libraries(broker PRIVATE upmq::protocol protobuf::libprotobuf ${CMAKE_DL_LIBS} ${POCO_LIBS})
+target_link_libraries(broker PRIVATE upmq::protocol ${CMAKE_DL_LIBS} ${POCO_LIBS})
 if (NOT WIN32)
-  target_link_libraries(broker PRIVATE Threads::Threads)
+  target_link_libraries(broker PRIVATE Threads::Threads -Wl,--copy-dt-needed-entries protobuf::libprotobuf)
 else ()
-  target_link_libraries(broker PRIVATE ws2_32 mswsock iphlpapi)
+  target_link_libraries(broker PRIVATE protobuf::libprotobuf ws2_32 mswsock iphlpapi)
 endif ()
 
 macro(copy_poco_lib APP DLL)

bins/broker/destination/Destination.cpp

@@ -196,7 +196,7 @@ void Destination::subscribeOnNotify(Subscription &subscription) const {
   TRACE(log);
   {
     upmq::ScopedWriteRWLock writeRWLock(_routingLock);
-    _routing.insert(std::make_pair(subscription.routingKey(), std::make_unique<Poco::FIFOEvent<const MessageDataContainer *>>()));
+    _routing.insert(std::make_pair(subscription.routingKey(), std::make_unique<Poco::BasicEvent<const MessageDataContainer *>>()));
     *_routing[subscription.routingKey()] += Poco::delegate(&subscription, &Subscription::onEvent);
   }
   subscription.setHasNotify(true);

bins/broker/destination/Destination.h

@@ -23,7 +23,7 @@
 #include <Poco/Data/Session.h>
 #endif
 
-#include <Poco/FIFOEvent.h>
+#include <Poco/BasicEvent.h>
 #include <Poco/Logger.h>
 #include <memory>
 #include <utility>
@@ -42,7 +42,7 @@ class Destination {
   /// @brief SubscriptionsList - map<subs-name, subs>
   using SubscriptionsList = FSUnorderedMap<std::string, Subscription>;
   /// @brief RoutingList - map<routingKey, message>
-  using RoutingList = std::unordered_map<std::string, std::unique_ptr<Poco::FIFOEvent<const MessageDataContainer *>>>;
+  using RoutingList = std::unordered_map<std::string, std::unique_ptr<Poco::BasicEvent<const MessageDataContainer *>>>;
   /// @brief NotAckConsumersInfoList - map<object_id, message_count>
   using NotAckConsumersInfoList = std::unordered_map<std::string, std::unique_ptr<std::atomic_int>>;
   /// @brief Session2SubscriptionMap - map<session_id, {subs-name}>

bins/broker/misc/FixedSizeUnorderedMap.h

@@ -274,15 +274,15 @@ class FSUnorderedMap {
  public:
   explicit FSUnorderedMap(size_t size) : _items(size), _size(size) {}
   FSUnorderedMap(FSUnorderedMap &&o) noexcept
-      : _items(std::move(o._items)), _size(std::move(o._size)), _realSize(o._realSize.load()), _validIndexes(o._validIndexes) {}
+      : _items(std::move(o._items)), _size(o._size), _realSize(o._realSize.load()), _validIndexes(o._validIndexes) {}
   FSReadLockedValue<Key, Value> find(const Key &key) const {
     size_t index = Poco::hash(key) % _size;
     return _items.at(index).find(key);
   }
   FSUnorderedMap &operator=(FSUnorderedMap &&o) noexcept {
     upmq::ScopedWriteRWLock thisRWLock(_validIndexesLock);
     _items = std::move(o._items);
-    _size = std::move(o._size);
+    _size = o._size;
     _realSize = o._realSize.load();
     _validIndexes = o._validIndexes;
     return *this;

bins/broker/net/ReactorHeaders.h

@@ -5,7 +5,7 @@
 #ifndef UPMQ_BINS_BROKER_NET_REACTORHEADERS_H_
 #define UPMQ_BINS_BROKER_NET_REACTORHEADERS_H_
 
-#define UPMQ_REACTOR
+//#define UPMQ_REACTOR
 
 #ifdef UPMQ_REACTOR
 #include "SocketNotifier.h"

bins/broker/web/TemplateParamReplacer.h

@@ -20,6 +20,7 @@
 #include <string>
 #include <map>
 #include <vector>
+#include <cstdint>
 
 class TemplateParamReplacer {
  public:

libs/libupmq/decaf/internal/security/provider/crypto/SHA1MessageDigestSpi.cpp

@@ -285,7 +285,7 @@ class SHA1MessageDigestSpiImpl {
       memset(((unsigned char *)data) + index, 0, SHA_BLOCKSIZE - index);
       maybeReverseBytes(data, SHA_BLOCKSIZE);
       SHA1Transform(state, data);
-      memset((unsigned char *)data, 0, SHA_BLOCKSIZE - 8 - index);
+      memset((unsigned char *)data, 0, SHA_BLOCKSIZE - 8);
     } else {
       memset(((unsigned char *)data) + index, 0, SHA_BLOCKSIZE - 8 - index);
     }

libs/libupmq/decaf/lang/Pointer.h

@@ -284,7 +284,7 @@ class Pointer : public REFCOUNTER {
 
   template <typename T1, typename R1>
   bool operator!=(const Pointer<T1, R1> &right) const {
-    return !(this->value == right.get());
+    return this->value != right.get();
   }
 
   template <typename T1>
@@ -377,9 +377,9 @@ template <typename T>
 struct less<decaf::lang::Pointer<T> > {  //: public binary_function<decaf::lang::Pointer<T>, decaf::lang::Pointer<T>,
   // bool> {
 
-  typedef decaf::lang::Pointer<T> first_argument_type;
-  typedef decaf::lang::Pointer<T> second_argument_type;
-  typedef bool result_type;
+  using first_argument_type = decaf::lang::Pointer<T>;
+  using second_argument_type = decaf::lang::Pointer<T>;
+  using result_type = bool;
 
   bool operator()(const decaf::lang::Pointer<T> &left, const decaf::lang::Pointer<T> &right) const { return less<T *>()(left.get(), right.get()); }
 };

libs/libupmq/decaf/lang/System.cpp

@@ -38,7 +38,7 @@
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_SYSCTL_H
-#include <sys/sysctl.h>
+//#include <sys/sysctl.h>
 #endif
 #ifdef HAVE_STRING_H
 #include <cstring>