Merge pull request #431 from jwillemsen/jwi-export

Use taox11 export macros
RemedyIT · Apr 4, 2024 · cb3752a · cb3752a
2 parents 5d09981 + b45e18a
commit cb3752a
Show file tree

Hide file tree

Showing 19 changed files with 176 additions and 222 deletions.
diff --git a/ciaox11/core/ciaox11_core_export.h b/ciaox11/core/ciaox11_core_export.h
@@ -8,25 +8,25 @@
 #ifndef CIAOX11_CORE_EXPORT_H
 #define CIAOX11_CORE_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAOX11_CORE_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (CIAOX11_CORE_HAS_DLL)
 #  define CIAOX11_CORE_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAOX11_CORE_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && CIAOX11_CORE_HAS_DLL */
 
 #if !defined (CIAOX11_CORE_HAS_DLL)
 #  define CIAOX11_CORE_HAS_DLL 1
 #endif /* ! CIAOX11_CORE_HAS_DLL */
 
 #if defined (CIAOX11_CORE_HAS_DLL) && (CIAOX11_CORE_HAS_DLL == 1)
 #  if defined (CIAOX11_CORE_BUILD_DLL)
-#    define CIAOX11_CORE_Export ACE_Proper_Export_Flag
-#    define CIAOX11_CORE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_CORE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_CORE_Export TAOX11_Proper_Export_Flag
+#    define CIAOX11_CORE_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_CORE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* CIAOX11_CORE_BUILD_DLL */
-#    define CIAOX11_CORE_Export ACE_Proper_Import_Flag
-#    define CIAOX11_CORE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_CORE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_CORE_Export TAOX11_Proper_Import_Flag
+#    define CIAOX11_CORE_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_CORE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* CIAOX11_CORE_BUILD_DLL */
 #else /* CIAOX11_CORE_HAS_DLL == 1 */
 #  define CIAOX11_CORE_Export
@@ -35,5 +35,3 @@
 #endif /* CIAOX11_CORE_HAS_DLL == 1 */
 
 #endif /* CIAOX11_CORE_EXPORT_H */
-
-// End of auto generated file.
diff --git a/ciaox11/deployment/handlers/ciaox11_deployment_handler_export.h b/ciaox11/deployment/handlers/ciaox11_deployment_handler_export.h
@@ -8,25 +8,25 @@
 #ifndef CIAOX11_DEPLOYMENT_HANDLER_EXPORT_H
 #define CIAOX11_DEPLOYMENT_HANDLER_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL)
 #  define CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL */
 
 #if !defined (CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL)
 #  define CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL 1
 #endif /* ! CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL */
 
 #if defined (CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL) && (CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL == 1)
 #  if defined (CIAOX11_DEPLOYMENT_HANDLER_BUILD_DLL)
-#    define CIAOX11_Deployment_Handler_Export ACE_Proper_Export_Flag
-#    define CIAOX11_DEPLOYMENT_HANDLER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_DEPLOYMENT_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_Deployment_Handler_Export TAOX11_Proper_Export_Flag
+#    define CIAOX11_DEPLOYMENT_HANDLER_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_DEPLOYMENT_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* CIAOX11_DEPLOYMENT_HANDLER_BUILD_DLL */
-#    define CIAOX11_Deployment_Handler_Export ACE_Proper_Import_Flag
-#    define CIAOX11_DEPLOYMENT_HANDLER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_DEPLOYMENT_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_Deployment_Handler_Export TAOX11_Proper_Import_Flag
+#    define CIAOX11_DEPLOYMENT_HANDLER_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_DEPLOYMENT_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* CIAOX11_DEPLOYMENT_HANDLER_BUILD_DLL */
 #else /* CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL == 1 */
 #  define CIAOX11_Deployment_Handler_Export
@@ -35,5 +35,3 @@
 #endif /* CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL == 1 */
 
 #endif /* CIAOX11_DEPLOYMENT_HANDLER_EXPORT_H */
-
-// End of auto generated file.
diff --git a/ciaox11/deployment/handlers/ciaox11_deployment_state_export.h b/ciaox11/deployment/handlers/ciaox11_deployment_state_export.h
@@ -8,25 +8,25 @@
 #ifndef CIAOX11_DEPLOYMENT_STATE_EXPORT_H
 #define CIAOX11_DEPLOYMENT_STATE_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAOX11_DEPLOYMENT_STATE_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (CIAOX11_DEPLOYMENT_STATE_HAS_DLL)
 #  define CIAOX11_DEPLOYMENT_STATE_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAOX11_DEPLOYMENT_STATE_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && CIAOX11_DEPLOYMENT_STATE_HAS_DLL */
 
 #if !defined (CIAOX11_DEPLOYMENT_STATE_HAS_DLL)
 #  define CIAOX11_DEPLOYMENT_STATE_HAS_DLL 1
 #endif /* ! CIAOX11_DEPLOYMENT_STATE_HAS_DLL */
 
 #if defined (CIAOX11_DEPLOYMENT_STATE_HAS_DLL) && (CIAOX11_DEPLOYMENT_STATE_HAS_DLL == 1)
 #  if defined (CIAOX11_DEPLOYMENT_STATE_BUILD_DLL)
-#    define CIAOX11_Deployment_State_Export ACE_Proper_Export_Flag
-#    define CIAOX11_DEPLOYMENT_STATE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_DEPLOYMENT_STATE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_Deployment_State_Export TAOX11_Proper_Export_Flag
+#    define CIAOX11_DEPLOYMENT_STATE_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_DEPLOYMENT_STATE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* CIAOX11_DEPLOYMENT_STATE_BUILD_DLL */
-#    define CIAOX11_Deployment_State_Export ACE_Proper_Import_Flag
-#    define CIAOX11_DEPLOYMENT_STATE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_DEPLOYMENT_STATE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_Deployment_State_Export TAOX11_Proper_Import_Flag
+#    define CIAOX11_DEPLOYMENT_STATE_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_DEPLOYMENT_STATE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* CIAOX11_DEPLOYMENT_STATE_BUILD_DLL */
 #else /* CIAOX11_DEPLOYMENT_STATE_HAS_DLL == 1 */
 #  define CIAOX11_Deployment_State_Export
@@ -35,5 +35,3 @@
 #endif /* CIAOX11_DEPLOYMENT_STATE_HAS_DLL == 1 */
 
 #endif /* CIAOX11_DEPLOYMENT_STATE_EXPORT_H */
-
-// End of auto generated file.
diff --git a/ciaox11/deployment/interceptors/ciaox11_deployment_interceptors_export.h b/ciaox11/deployment/interceptors/ciaox11_deployment_interceptors_export.h
@@ -8,25 +8,25 @@
 #ifndef CIAOX11_DEPLOYMENT_INTERCEPTORS_EXPORT_H
 #define CIAOX11_DEPLOYMENT_INTERCEPTORS_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL)
 #  define CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL */
 
 #if !defined (CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL)
 #  define CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL 1
 #endif /* ! CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL */
 
 #if defined (CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL) && (CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL == 1)
 #  if defined (CIAOX11_DEPLOYMENT_INTERCEPTORS_BUILD_DLL)
-#    define CIAOX11_Deployment_Interceptors_Export ACE_Proper_Export_Flag
-#    define CIAOX11_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_Deployment_Interceptors_Export TAOX11_Proper_Export_Flag
+#    define CIAOX11_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* CIAOX11_DEPLOYMENT_INTERCEPTORS_BUILD_DLL */
-#    define CIAOX11_Deployment_Interceptors_Export ACE_Proper_Import_Flag
-#    define CIAOX11_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_Deployment_Interceptors_Export TAOX11_Proper_Import_Flag
+#    define CIAOX11_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* CIAOX11_DEPLOYMENT_INTERCEPTORS_BUILD_DLL */
 #else /* CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL == 1 */
 #  define CIAOX11_Deployment_Interceptors_Export
@@ -36,4 +36,3 @@
 
 #endif /* CIAOX11_DEPLOYMENT_INTERCEPTORS_EXPORT_H */
 
-// End of auto generated file.
diff --git a/ciaox11/logger/ciaox11_logger_export.h b/ciaox11/logger/ciaox11_logger_export.h
@@ -7,25 +7,25 @@
 #ifndef CIAOX11_LOGGER_EXPORT_H
 #define CIAOX11_LOGGER_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAOX11_LOGGER_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (CIAOX11_LOGGER_HAS_DLL)
 #  define CIAOX11_LOGGER_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAOX11_LOGGER_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && CIAOX11_LOGGER_HAS_DLL */
 
 #if !defined (CIAOX11_LOGGER_HAS_DLL)
 #  define CIAOX11_LOGGER_HAS_DLL 1
 #endif /* ! CIAOX11_LOGGER_HAS_DLL */
 
 #if defined (CIAOX11_LOGGER_HAS_DLL) && (CIAOX11_LOGGER_HAS_DLL == 1)
 #  if defined (CIAOX11_LOGGER_BUILD_DLL)
-#    define CIAOX11_Logger_Export ACE_Proper_Export_Flag
-#    define CIAOX11_LOGGER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_Logger_Export TAOX11_Proper_Export_Flag
+#    define CIAOX11_LOGGER_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* CIAOX11_LOGGER_BUILD_DLL */
-#    define CIAOX11_Logger_Export ACE_Proper_Import_Flag
-#    define CIAOX11_LOGGER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAOX11_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define CIAOX11_Logger_Export TAOX11_Proper_Import_Flag
+#    define CIAOX11_LOGGER_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define CIAOX11_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* CIAOX11_LOGGER_BUILD_DLL */
 #else /* CIAOX11_LOGGER_HAS_DLL == 1 */
 #  define CIAOX11_Logger_Export
@@ -35,4 +35,3 @@
 
 #endif /* CIAOX11_LOGGER_EXPORT_H */
 
-// End of auto generated file.
diff --git a/connectors/dds4ccm/impl/dds4ccm_impl_export.h b/connectors/dds4ccm/impl/dds4ccm_impl_export.h
@@ -8,25 +8,25 @@
 #ifndef DDS4CCM_IMPL_EXPORT_H
 #define DDS4CCM_IMPL_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DDS4CCM_IMPL_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (DDS4CCM_IMPL_HAS_DLL)
 #  define DDS4CCM_IMPL_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DDS4CCM_IMPL_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && DDS4CCM_IMPL_HAS_DLL */
 
 #if !defined (DDS4CCM_IMPL_HAS_DLL)
 #  define DDS4CCM_IMPL_HAS_DLL 1
 #endif /* ! DDS4CCM_IMPL_HAS_DLL */
 
 #if defined (DDS4CCM_IMPL_HAS_DLL) && (DDS4CCM_IMPL_HAS_DLL == 1)
 #  if defined (DDS4CCM_IMPL_BUILD_DLL)
-#    define DDS4CCM_IMPL_Export ACE_Proper_Export_Flag
-#    define DDS4CCM_IMPL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DDS4CCM_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define DDS4CCM_IMPL_Export TAOX11_Proper_Export_Flag
+#    define DDS4CCM_IMPL_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define DDS4CCM_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* DDS4CCM_IMPL_BUILD_DLL */
-#    define DDS4CCM_IMPL_Export ACE_Proper_Import_Flag
-#    define DDS4CCM_IMPL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DDS4CCM_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define DDS4CCM_IMPL_Export TAOX11_Proper_Import_Flag
+#    define DDS4CCM_IMPL_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define DDS4CCM_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* DDS4CCM_IMPL_BUILD_DLL */
 #else /* DDS4CCM_IMPL_HAS_DLL == 1 */
 #  define DDS4CCM_IMPL_Export
@@ -35,5 +35,3 @@
 #endif /* DDS4CCM_IMPL_HAS_DLL == 1 */
 
 #endif /* DDS4CCM_IMPL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/connectors/dds4ccm/logger/dds4ccm_logger_export.h b/connectors/dds4ccm/logger/dds4ccm_logger_export.h
@@ -7,25 +7,25 @@
 #ifndef DDS4CCM_LOGGER_EXPORT_H
 #define DDS4CCM_LOGGER_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DDS4CCM_LOGGER_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (DDS4CCM_LOGGER_HAS_DLL)
 #  define DDS4CCM_LOGGER_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DDS4CCM_LOGGER_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && DDS4CCM_LOGGER_HAS_DLL */
 
 #if !defined (DDS4CCM_LOGGER_HAS_DLL)
 #  define DDS4CCM_LOGGER_HAS_DLL 1
 #endif /* ! DDS4CCM_LOGGER_HAS_DLL */
 
 #if defined (DDS4CCM_LOGGER_HAS_DLL) && (DDS4CCM_LOGGER_HAS_DLL == 1)
 #  if defined (DDS4CCM_LOGGER_BUILD_DLL)
-#    define DDS4CCM_Logger_Export ACE_Proper_Export_Flag
-#    define DDS4CCM_LOGGER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DDS4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define DDS4CCM_Logger_Export TAOX11_Proper_Export_Flag
+#    define DDS4CCM_LOGGER_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define DDS4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* DDS4CCM_LOGGER_BUILD_DLL */
-#    define DDS4CCM_Logger_Export ACE_Proper_Import_Flag
-#    define DDS4CCM_LOGGER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DDS4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define DDS4CCM_Logger_Export TAOX11_Proper_Import_Flag
+#    define DDS4CCM_LOGGER_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define DDS4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* DDS4CCM_LOGGER_BUILD_DLL */
 #else /* DDS4CCM_LOGGER_HAS_DLL == 1 */
 #  define DDS4CCM_Logger_Export
@@ -35,4 +35,3 @@
 
 #endif /* DDS4CCM_LOGGER_EXPORT_H */
 
-// End of auto generated file.
diff --git a/connectors/psdd4ccm/logger/psdd4ccm_logger_export.h b/connectors/psdd4ccm/logger/psdd4ccm_logger_export.h
@@ -7,25 +7,25 @@
 #ifndef PSDD4CCM_LOGGER_EXPORT_H
 #define PSDD4CCM_LOGGER_EXPORT_H
 
-#include "ace/config-all.h"
+#include "tao/x11/taox11_export_macros.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (PSDD4CCM_LOGGER_HAS_DLL)
+#if defined (TAOX11_AS_STATIC_LIBS) && !defined (PSDD4CCM_LOGGER_HAS_DLL)
 #  define PSDD4CCM_LOGGER_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && PSDD4CCM_LOGGER_HAS_DLL */
+#endif /* TAOX11_AS_STATIC_LIBS && PSDD4CCM_LOGGER_HAS_DLL */
 
 #if !defined (PSDD4CCM_LOGGER_HAS_DLL)
 #  define PSDD4CCM_LOGGER_HAS_DLL 1
 #endif /* ! PSDD4CCM_LOGGER_HAS_DLL */
 
 #if defined (PSDD4CCM_LOGGER_HAS_DLL) && (PSDD4CCM_LOGGER_HAS_DLL == 1)
 #  if defined (PSDD4CCM_LOGGER_BUILD_DLL)
-#    define PSDD4CCM_Logger_Export ACE_Proper_Export_Flag
-#    define PSDD4CCM_LOGGER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define PSDD4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define PSDD4CCM_Logger_Export TAOX11_Proper_Export_Flag
+#    define PSDD4CCM_LOGGER_SINGLETON_DECLARATION(T) TAOX11_EXPORT_SINGLETON_DECLARATION (T)
+#    define PSDD4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  else /* PSDD4CCM_LOGGER_BUILD_DLL */
-#    define PSDD4CCM_Logger_Export ACE_Proper_Import_Flag
-#    define PSDD4CCM_LOGGER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define PSDD4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#    define PSDD4CCM_Logger_Export TAOX11_Proper_Import_Flag
+#    define PSDD4CCM_LOGGER_SINGLETON_DECLARATION(T) TAOX11_IMPORT_SINGLETON_DECLARATION (T)
+#    define PSDD4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) TAOX11_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
 #  endif /* PSDD4CCM_LOGGER_BUILD_DLL */
 #else /* PSDD4CCM_LOGGER_HAS_DLL == 1 */
 #  define PSDD4CCM_Logger_Export
@@ -35,4 +35,3 @@
 
 #endif /* PSDD4CCM_LOGGER_EXPORT_H */
 
-// End of auto generated file.
diff --git a/connectors/psdd4ccm/middleware/zmq/psdd4ccm/impl/zmq_psdd_context_i.h b/connectors/psdd4ccm/middleware/zmq/psdd4ccm/impl/zmq_psdd_context_i.h
@@ -40,52 +40,30 @@ namespace PSDD
       Context_Impl () = default;
       ~Context_Impl () override;
 
-      void
-      initialize (const Config&);
+      void initialize (const Config&);
 
-      void
-      register_client ();
+      void register_client ();
 
-      void
-      unregister_client ();
+      void unregister_client ();
 
-      SubscriberSocket
-      create_subscriber_socket (
-          const Config&);
+      SubscriberSocket create_subscriber_socket (const Config&);
 
-      WriterSocket
-      create_publisher_socket (
-          const Config&);
+      WriterSocket create_publisher_socket (const Config&);
 
-      WriterSocket
-      create_publisher_multiplex_socket (
-          const Config&);
+      WriterSocket create_publisher_multiplex_socket (const Config&);
 
-      void
-      schedule_listener (
-          IDL::traits<::PSDD::ZMQ::Listener>::ref_type l);
+      void schedule_listener (IDL::traits<::PSDD::ZMQ::Listener>::ref_type l);
 
-      void
-      remove_listener (
-          IDL::traits<::PSDD::ZMQ::Listener>::ref_type l);
+      void remove_listener (IDL::traits<::PSDD::ZMQ::Listener>::ref_type l);
 
-      void
-      reset_listeners ();
+      void reset_listeners ();
 
     private:
-      bool
-      bind (
-          Socket&,
-          const std::vector<std::string>&);
-
-      bool
-      connect (
-          Socket&,
-          const std::vector<std::string>&);
-
-      bool
-      setup_multiplex (
-        const Config&);
+      bool bind (Socket&, const std::vector<std::string>&);
+
+      bool connect (Socket&, const std::vector<std::string>&);
+
+      bool setup_multiplex (const Config&);
 
       void* context_ { nullptr };