Cleanup tools includes

fairmq/FairMQTransportFactory.cxx

@@ -13,7 +13,8 @@
 #include <fairmq/ofi/TransportFactory.h>
 #endif
 #include <FairMQLogger.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Unique.h>
+#include <fairmq/tools/Strings.h>
 
 #include <fairlogger/Logger.h>
 

fairmq/JSONParser.cxx

@@ -15,7 +15,6 @@
 #include "JSONParser.h"
 #include "FairMQChannel.h"
 #include <fairmq/PropertyOutput.h>
-#include <fairmq/tools/CppSTL.h>
 #include <fairmq/tools/Strings.h>
 
 #include <fairlogger/Logger.h>

fairmq/Properties.cxx

@@ -7,12 +7,10 @@
  ********************************************************************************/
 
 #include <fairmq/Properties.h>
-#include <fairmq/Tools.h>
 
 #include <boost/filesystem.hpp>
 
 using namespace std;
-using namespace fair::mq::tools;
 using boost::any_cast;
 
 namespace fair

fairmq/ofi/Context.cxx

@@ -7,7 +7,7 @@
  ********************************************************************************/
 
 #include <fairmq/ofi/Context.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 #include <FairMQLogger.h>
 
 #include <asiofi/version.hpp>

fairmq/ofi/Message.cxx

@@ -7,7 +7,6 @@
  ********************************************************************************/
 
 #include <fairmq/ofi/Message.h>
-#include <fairmq/Tools.h>
 #include <FairMQLogger.h>
 
 #include <asiofi.hpp>

fairmq/ofi/Poller.cxx

@@ -8,7 +8,7 @@
 
 #include <fairmq/ofi/Poller.h>
 #include <fairmq/ofi/Socket.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 #include <FairMQLogger.h>
 
 #include <zmq.h>

fairmq/ofi/TransportFactory.cxx

@@ -10,7 +10,6 @@
 #include <fairmq/ofi/Poller.h>
 #include <fairmq/ofi/Socket.h>
 #include <fairmq/ofi/TransportFactory.h>
-#include <fairmq/Tools.h>
 
 #include <stdexcept>
 

fairmq/plugins/PMIx/PMIxPlugin.cxx

@@ -9,7 +9,7 @@
 #include "PMIxPlugin.h"
 
 #include <fairmq/sdk/commands/Commands.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 
 #include <sstream>
 #include <stdexcept>

fairmq/run/runUuidGenerator.cxx

@@ -5,7 +5,7 @@
 *              GNU Lesser General Public Licence (LGPL) version 3,             *
 *                  copied verbatim in the file "LICENSE"                       *
 ********************************************************************************/
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Unique.h>
 
 #include <boost/program_options.hpp>
 

fairmq/sdk/DDSEnvironment.cxx

@@ -11,7 +11,7 @@
 #include <cstdlib>
 #include <dds/dds.h>
 #include <fairlogger/Logger.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/InstanceLimit.h>
 #include <fairmq/sdk/DDSInfo.h>
 #include <sstream>
 #include <utility>

fairmq/sdk/DDSSession.cxx

@@ -14,7 +14,8 @@
 #include <cstdlib>
 #include <dds/dds.h>
 #include <fairlogger/Logger.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
+#include <fairmq/tools/Semaphore.h>
 #include <fairmq/sdk/DDSAgent.h>
 #include <fairmq/sdk/DDSEnvironment.h>
 #include <fairmq/sdk/DDSTopology.h>

fairmq/sdk/DDSTopology.cxx

@@ -11,7 +11,6 @@
 #include <boost/range/iterator_range.hpp>
 #include <dds/dds.h>
 #include <fairlogger/Logger.h>
-#include <fairmq/Tools.h>
 #include <fairmq/sdk/DDSEnvironment.h>
 #include <memory>
 #include <sstream>

fairmq/sdk/runDDSCommandUI.cxx

@@ -9,7 +9,7 @@
 #include <fairmq/sdk/commands/Commands.h>
 #include <fairmq/States.h>
 #include <fairmq/SDK.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 
 #include <boost/program_options.hpp>
 

fairmq/shmem/Message.h

@@ -12,7 +12,6 @@
 #include "Manager.h"
 #include "Region.h"
 #include "UnmanagedRegion.h"
-#include <fairmq/Tools.h>
 #include <FairMQLogger.h>
 #include <FairMQMessage.h>
 #include <FairMQUnmanagedRegion.h>

fairmq/shmem/Monitor.cxx

@@ -9,7 +9,7 @@
 #include "Monitor.h"
 #include "Common.h"
 
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 #include <fairlogger/Logger.h>
 
 #include <boost/interprocess/managed_shared_memory.hpp>

fairmq/shmem/Poller.h

@@ -9,7 +9,7 @@
 #define FAIR_MQ_SHMEM_POLLER_H_
 
 #include "Socket.h"
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 #include <FairMQChannel.h>
 #include <FairMQLogger.h>
 #include <FairMQPoller.h>

fairmq/shmem/Socket.h

@@ -15,7 +15,7 @@
 #include <FairMQSocket.h>
 #include <FairMQMessage.h>
 #include <FairMQLogger.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 
 #include <zmq.h>
 
@@ -386,8 +386,7 @@ class Socket final : public fair::mq::Socket
     {
         size_t eventsSize = sizeof(uint32_t);
         if (zmq_getsockopt(fSocket, ZMQ_EVENTS, events, &eventsSize) < 0) {
-            throw SocketError(
-                tools::ToString("failed setting ZMQ_EVENTS, reason: ", zmq_strerror(errno)));
+            throw SocketError(tools::ToString("failed setting ZMQ_EVENTS, reason: ", zmq_strerror(errno)));
         }
     }
 

fairmq/shmem/TransportFactory.h

@@ -19,7 +19,7 @@
 #include <FairMQTransportFactory.h>
 #include <fairmq/ProgOptions.h>
 #include <FairMQLogger.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 
 #include <boost/version.hpp>
 

fairmq/zeromq/Context.h

@@ -9,7 +9,7 @@
 #ifndef FAIR_MQ_ZMQ_CONTEXT_H_
 #define FAIR_MQ_ZMQ_CONTEXT_H_
 
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 #include <FairMQLogger.h>
 #include <FairMQUnmanagedRegion.h>
 

fairmq/zeromq/Poller.h

@@ -10,7 +10,7 @@
 #define FAIR_MQ_ZMQ_POLLER_H
 
 #include <fairmq/zeromq/Socket.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 #include <FairMQChannel.h>
 #include <FairMQLogger.h>
 #include <FairMQPoller.h>

fairmq/zeromq/Socket.h

@@ -12,7 +12,7 @@
 #include <FairMQLogger.h>
 #include <FairMQMessage.h>
 #include <FairMQSocket.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 #include <fairmq/zeromq/Context.h>
 #include <fairmq/zeromq/Message.h>
 

fairmq/zeromq/TransportFactory.h

@@ -14,7 +14,6 @@
 #include <fairmq/zeromq/Socket.h>
 #include <fairmq/zeromq/Poller.h>
 #include <fairmq/zeromq/UnmanagedRegion.h>
-#include <fairmq/Tools.h>
 #include <FairMQTransportFactory.h>
 #include <fairmq/ProgOptions.h>