[core] remove namespace v6, keep v5. Remove build of compatibility ta…

ecal/core/CMakeLists.txt

@@ -736,20 +736,23 @@ endmacro()
 # We now create two libraries
 # One of them is a compatibility version that should facilitate easier migration.
 # ecal_core, ecal_core_v5.
+# We removed again the compatibility libraries.
+# We might reintroduce it, but then for *ALL* functionality.
 #######################################
 
 add_ecal_core_library(${PROJECT_NAME})
-target_compile_definitions(${PROJECT_NAME}
-  PUBLIC 
-    ECAL_CORE_V5_FUNCTIONALTIY=1
-)
 
-add_ecal_core_library(core_v5)
-target_compile_definitions(core_v5 
-  PUBLIC
-    ECAL_CORE_NAMESPACE_V5_INLINE=1
-    ECAL_CORE_V5_FUNCTIONALTIY=1
-)
+#target_compile_definitions(${PROJECT_NAME}
+#  PUBLIC 
+#    ECAL_CORE_V5_FUNCTIONALTIY=1
+#)
+
+#add_ecal_core_library(core_v5)
+#target_compile_definitions(core_v5 
+#  PUBLIC
+#    ECAL_CORE_NAMESPACE_V5_INLINE=1
+#    ECAL_CORE_V5_FUNCTIONALTIY=1
+#)
 
 ###
 ## Iinstall header files only once...

ecal/core/include/ecal/pubsub/publisher.h

@@ -40,8 +40,6 @@ namespace eCAL
 {
   class CPublisherImpl;
 
-  ECAL_CORE_NAMESPACE_V6
-  {
     /**
      * @brief eCAL publisher class.
     **/
@@ -169,5 +167,5 @@ namespace eCAL
     private:
       std::shared_ptr<CPublisherImpl> m_publisher_impl;
     };
-  }
+
 }

ecal/core/include/ecal/pubsub/subscriber.h

@@ -38,8 +38,6 @@ namespace eCAL
 {
   class CSubscriberImpl;
 
-  ECAL_CORE_NAMESPACE_V6
-  {
     /**
      * @brief eCAL subscriber class.
     **/
@@ -148,5 +146,4 @@ namespace eCAL
     private:
       std::shared_ptr<CSubscriberImpl> m_subscriber_impl;
     };
-  }
 }

ecal/core/include/ecal/pubsub/types.h

@@ -110,8 +110,6 @@ namespace eCAL
     }
   }
 
-  ECAL_CORE_NAMESPACE_V6
-  {
     /**
      * @brief Receive callback function type with topic id and data struct. The topic id contains the topic name, the process
      *          name, the host name and a uniques topic identifier.
@@ -157,6 +155,5 @@ namespace eCAL
      * @param data_      Event callback data structure with the event specific information.
     **/
     using SubEventCallbackT = std::function<void(const STopicId& topic_id_, const SSubEventCallbackData& data_)>;
-  }
 }
 

ecal/core/include/ecal/service/client.h

@@ -39,8 +39,6 @@ namespace eCAL
 {
   class CServiceClientImpl;
 
-  ECAL_CORE_NAMESPACE_V6
-  {
     /**
      * @brief Service client wrapper class.
     **/
@@ -156,7 +154,6 @@ namespace eCAL
         bool IsConnected() const;
 
     private:
-      std::shared_ptr<eCAL::v6::CServiceClientImpl> m_service_client_impl;
+      std::shared_ptr<eCAL::CServiceClientImpl> m_service_client_impl;
     };
-  }
 }

ecal/core/include/ecal/service/client_instance.h

@@ -35,17 +35,14 @@
 
 namespace eCAL
 {
-  ECAL_CORE_NAMESPACE_V6
-  {
-    class CServiceClientImpl;
-  }
+  class CServiceClientImpl;
 
   class ECAL_API_CLASS CClientInstance final
   {
   public:
     // Constructor
     ECAL_API_EXPORTED_MEMBER
-      CClientInstance(const SEntityId& entity_id_, const std::shared_ptr<v6::CServiceClientImpl>& service_client_id_impl_);
+      CClientInstance(const SEntityId& entity_id_, const std::shared_ptr<CServiceClientImpl>& service_client_id_impl_);
 
     // Defaulted destructor
     ~CClientInstance() = default;
@@ -113,6 +110,6 @@ namespace eCAL
 
   private:
     SEntityId                             m_entity_id;
-    const std::shared_ptr<eCAL::v6::CServiceClientImpl> m_service_client_impl;
+    const std::shared_ptr<eCAL::CServiceClientImpl> m_service_client_impl;
   };
 }

ecal/core/include/ecal/service/server.h

@@ -35,8 +35,6 @@
 
 namespace eCAL
 {
-  ECAL_CORE_NAMESPACE_V6
-  {
     class CServiceServerImpl;
 
     /**
@@ -130,5 +128,4 @@ namespace eCAL
     private:
       std::shared_ptr<CServiceServerImpl> m_service_server_impl;
     };
-  }
 } 

ecal/core/include/ecal/service/types.h

@@ -168,41 +168,38 @@ namespace eCAL
   **/
   using ServiceMethodCallbackT = std::function<int(const SServiceMethodInformation& method_info_, const std::string& request_, std::string& response_)>;
 
-  ECAL_CORE_NAMESPACE_V6
+  /**
+   * @brief eCAL client event callback struct.
+  **/
+  struct SClientEventCallbackData
   {
-      /**
-     * @brief eCAL client event callback struct.
-    **/
-    struct SClientEventCallbackData
-    {
-      eClientEvent      type{ eClientEvent::none };  //!< event type
-      long long         time = 0;                  //!< event time in µs
-    };
-
-    /**
-     * @brief Client event callback function type.
-     *
-     * @param service_id_  The service id struct of the connection that triggered the event.
-     * @param data_        Event callback data structure with the event specific information.
-    **/
-    using ClientEventCallbackT = std::function<void(const SServiceId& service_id_, const SClientEventCallbackData& data_)>;
-
-    /**
-     * @brief eCAL server event callback struct.
-    **/
-    struct SServerEventCallbackData
-    {
-      eServerEvent      type{ eServerEvent::none };  //!< event type
-      long long         time = 0;                  //!< event time in µs
-    };
-
-    /**
-     * @brief Server event callback function type.
-     *
-     * @param service_id_  The service id struct of the connection that triggered the event.
-     * @param data_        Event callback data structure with the event specific information.
-    **/
-    using ServerEventCallbackT = std::function<void(const SServiceId& service_id_, const struct SServerEventCallbackData& data_)>;
-  }
-
+    eClientEvent      type{ eClientEvent::none };  //!< event type
+    long long         time = 0;                  //!< event time in µs
+  };
+
+  /**
+   * @brief Client event callback function type.
+   *
+   * @param service_id_  The service id struct of the connection that triggered the event.
+   * @param data_        Event callback data structure with the event specific information.
+  **/
+  using ClientEventCallbackT = std::function<void(const SServiceId& service_id_, const SClientEventCallbackData& data_)>;
+
+  /**
+   * @brief eCAL server event callback struct.
+  **/
+  struct SServerEventCallbackData
+  {
+    eServerEvent      type{ eServerEvent::none };  //!< event type
+    long long         time = 0;                  //!< event time in µs
+  };
+
+  /**
+   * @brief Server event callback function type.
+   *
+   * @param service_id_  The service id struct of the connection that triggered the event.
+   * @param data_        Event callback data structure with the event specific information.
+  **/
+  using ServerEventCallbackT = std::function<void(const SServiceId& service_id_, const struct SServerEventCallbackData& data_)>;
+
 }

ecal/core/include/ecal/v5/ecal_subscriber.h

@@ -196,7 +196,7 @@ namespace eCAL
         * @return  True if succeeded, false if not.
        **/
       ECAL_API_EXPORTED_MEMBER
-        bool AddReceiveCallback(v6::ReceiveCallbackT callback_);
+        bool AddReceiveCallback(eCAL::ReceiveCallbackT callback_);
 
       /**
        * @brief Remove callback function for incoming receives.

ecal/core/src/pubsub/ecal_publisher.cpp

@@ -38,8 +38,6 @@
 
 namespace eCAL
 {
-  ECAL_CORE_NAMESPACE_V6
-  {
     CPublisher::CPublisher(const std::string& topic_name_, const SDataTypeInformation& data_type_info_, const Publisher::Configuration& config_)
     {
       // create publisher implementation
@@ -134,5 +132,4 @@ namespace eCAL
       if (m_publisher_impl == nullptr) return SDataTypeInformation();
       return(m_publisher_impl->GetDataTypeInformation());
     }
-  }
 }

ecal/core/src/pubsub/ecal_publisher_impl.cpp

@@ -401,7 +401,7 @@ namespace eCAL
     return(true);
   }
 
-  bool CPublisherImpl::SetEventCallback(const v6::PubEventCallbackT callback_)
+  bool CPublisherImpl::SetEventCallback(const PubEventCallbackT callback_)
   {
     if (!m_created) return false;
 
@@ -728,7 +728,7 @@ namespace eCAL
     // new event handling with topic id
     if(m_event_id_callback)
     {
-      v6::SPubEventCallbackData data;
+      SPubEventCallbackData data;
       data.event_type          = type_;
       data.event_time          = eCAL::Time::GetMicroSeconds();
       data.subscriber_datatype = data_type_info_;

ecal/core/src/pubsub/ecal_publisher_impl.h

@@ -86,7 +86,7 @@ namespace eCAL
     bool RemoveEventCallback(ePublisherEvent type_);
 
     // future event callback interface
-    bool SetEventCallback(const v6::PubEventCallbackT callback_);
+    bool SetEventCallback(const PubEventCallbackT callback_);
     bool RemoveEventCallback();
 
     bool SetAttribute(const std::string& attr_name_, const std::string& attr_value_);
@@ -166,7 +166,7 @@ namespace eCAL
     EventCallbackMapT                      m_event_callback_map;
 
     std::mutex                             m_event_id_callback_mutex;
-    v6::PubEventCallbackT                  m_event_id_callback;
+    PubEventCallbackT                  m_event_id_callback;
 
     long long                              m_id = 0;
     long long                              m_clock = 0;

ecal/core/src/pubsub/ecal_subscriber.cpp

@@ -31,8 +31,6 @@
 
 namespace eCAL
 {
-  ECAL_CORE_NAMESPACE_V6
-  {
     CSubscriber::CSubscriber(const std::string& topic_name_, const SDataTypeInformation& data_type_info_, const Subscriber::Configuration& config_)
     {
       // create subscriber implementation
@@ -107,5 +105,4 @@ namespace eCAL
       if (m_subscriber_impl == nullptr) return SDataTypeInformation{};
       return m_subscriber_impl->GetDataTypeInformation();
     }
-  }
 }

ecal/core/src/pubsub/ecal_subscriber_impl.cpp

@@ -165,7 +165,7 @@ namespace eCAL
     return(false);
   }
 
-  bool CSubscriberImpl::SetReceiveCallback(v6::ReceiveCallbackT callback_)
+  bool CSubscriberImpl::SetReceiveCallback(ReceiveCallbackT callback_)
   {
     if (!m_created) return(false);
 
@@ -233,7 +233,7 @@ namespace eCAL
     return(true);
   }
 
-  bool CSubscriberImpl::SetEventIDCallback(const v6::SubEventCallbackT callback_)
+  bool CSubscriberImpl::SetEventIDCallback(const SubEventCallbackT callback_)
   {
     if (!m_created) return false;
 
@@ -782,7 +782,7 @@ namespace eCAL
     // new event handling with topic id
     if (m_event_id_callback)
     {
-      v6::SSubEventCallbackData data;
+      SSubEventCallbackData data;
       data.event_type         = type_;
       data.event_time         = eCAL::Time::GetMicroSeconds();
       data.publisher_datatype = data_type_info_;

ecal/core/src/pubsub/ecal_subscriber_impl.h

@@ -69,15 +69,15 @@ namespace eCAL
 
     bool Read(std::string& buf_, long long* time_ = nullptr, int rcv_timeout_ms_ = 0);
 
-    bool SetReceiveCallback(v6::ReceiveCallbackT callback_);
+    bool SetReceiveCallback(ReceiveCallbackT callback_);
     bool RemoveReceiveCallback();
 
     // deprecated event callback interface
     bool SetEventCallback(eSubscriberEvent type_, v5::SubEventCallbackT callback_);
     bool RemoveEventCallback(eSubscriberEvent type_);
 
     // future event callback interface
-    bool SetEventIDCallback(const v6::SubEventCallbackT callback_);
+    bool SetEventIDCallback(const SubEventCallbackT callback_);
     bool RemoveEventCallback();
 
     bool SetAttribute(const std::string& attr_name_, const std::string& attr_value_);
@@ -157,7 +157,7 @@ namespace eCAL
     long long                                 m_read_time = 0;
 
     std::mutex                                m_receive_callback_mutex;
-    v6::ReceiveCallbackT                      m_receive_callback;
+    ReceiveCallbackT                      m_receive_callback;
     std::atomic<int>                          m_receive_time;
 
     std::deque<size_t>                        m_sample_hash_queue;
@@ -167,7 +167,7 @@ namespace eCAL
     EventCallbackMapT                         m_event_callback_map;
 
     std::mutex                                m_event_id_callback_mutex;
-    v6::SubEventCallbackT                     m_event_id_callback;
+    SubEventCallbackT                     m_event_id_callback;
 
     std::atomic<long long>                    m_clock;
 

ecal/core/src/service/ecal_clientgate.cpp

@@ -60,18 +60,18 @@ namespace eCAL
     m_created = false;
   }
 
-  bool CClientGate::Register(const std::string& service_name_, const std::shared_ptr<v6::CServiceClientImpl>& client_)
+  bool CClientGate::Register(const std::string& service_name_, const std::shared_ptr<CServiceClientImpl>& client_)
   {
     if (!m_created) return(false);
 
     // register internal client
     const std::unique_lock<std::shared_timed_mutex> lock(m_service_client_map_mutex);
-    m_service_client_map.emplace(std::pair<std::string, std::shared_ptr<v6::CServiceClientImpl>>(service_name_, client_));
+    m_service_client_map.emplace(std::pair<std::string, std::shared_ptr<CServiceClientImpl>>(service_name_, client_));
 
     return(true);
   }
 
-  bool CClientGate::Unregister(const std::string& service_name_, const std::shared_ptr<v6::CServiceClientImpl>& client_)
+  bool CClientGate::Unregister(const std::string& service_name_, const std::shared_ptr<CServiceClientImpl>& client_)
   {
     if (!m_created) return(false);
     bool ret_state = false;