...

callback_dispatcher.cc

@@ -5,15 +5,6 @@
 pEp::CallbackDispatcher pEp::callback_dispatcher;
 
 namespace pEp {
-    bool CallbackDispatcher::once = true;
-
-    CallbackDispatcher::CallbackDispatcher()
-    {
-        if (!once)
-            throw std::out_of_range("CallbackDispatcher is a singleton");
-        once = false;
-    }
-
     PEP_STATUS CallbackDispatcher::messageToSend(::message *msg)
     {
         return callback_dispatcher._messageToSend(msg);

callback_dispatcher.hh

@@ -21,11 +21,7 @@ namespace pEp {
         };
         std::vector<callbacks> targets;
 
-        static bool once;
-
     public:
-        CallbackDispatcher();
-
         void add(
                 ::messageToSend_t messageToSend,
                 ::notifyHandshake_t notifyHandshake,