From c1b6a6377a5796dce4f05c8bbc564f9b177cfbf4 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 3 Apr 2024 10:30:13 +0200 Subject: [PATCH] Removed ACE trace macros, not used for x11 * ciaox11/core/ciaox11_core_export.h: * ciaox11/deployment/handlers/ciaox11_deployment_handler_export.h: * ciaox11/deployment/handlers/ciaox11_deployment_state_export.h: * ciaox11/deployment/interceptors/ciaox11_deployment_interceptors_export.h: * ciaox11/logger/ciaox11_logger_export.h: * connectors/dds4ccm/impl/dds4ccm_impl_export.h: * connectors/dds4ccm/logger/dds4ccm_logger_export.h: * connectors/psdd4ccm/logger/psdd4ccm_logger_export.h: * ddsx11/logger/ddsx11_logger_export.h: * ddsx11/tests/logger_backend/log_backend_export.h: * exf/deployment/amh/ciaox11_exf_amh_export.h: * exf/deployment/core/ciaox11_exf_core_export.h: * exf/deployment/handlers/ciaox11_exf_handler_export.h: * exf/deployment/logger/ciaox11_exf_logger_export.h: * exf/deployment/monitor/ciaox11_exf_monitor_export.h: * exf/deployment/scheduler/ciaox11_exf_scheduler_export.h: --- ciaox11/core/ciaox11_core_export.h | 20 ------------------- .../ciaox11_deployment_handler_export.h | 20 ------------------- .../ciaox11_deployment_state_export.h | 20 ------------------- .../ciaox11_deployment_interceptors_export.h | 20 ------------------- ciaox11/logger/ciaox11_logger_export.h | 20 ------------------- connectors/dds4ccm/impl/dds4ccm_impl_export.h | 20 ------------------- .../dds4ccm/logger/dds4ccm_logger_export.h | 18 ----------------- .../psdd4ccm/logger/psdd4ccm_logger_export.h | 18 ----------------- ddsx11/logger/ddsx11_logger_export.h | 18 ----------------- .../tests/logger_backend/log_backend_export.h | 20 ------------------- exf/deployment/amh/ciaox11_exf_amh_export.h | 20 ------------------- exf/deployment/core/ciaox11_exf_core_export.h | 20 ------------------- .../handlers/ciaox11_exf_handler_export.h | 20 ------------------- .../logger/ciaox11_exf_logger_export.h | 20 ------------------- .../monitor/ciaox11_exf_monitor_export.h | 20 ------------------- .../scheduler/ciaox11_exf_scheduler_export.h | 20 ------------------- 16 files changed, 314 deletions(-) diff --git a/ciaox11/core/ciaox11_core_export.h b/ciaox11/core/ciaox11_core_export.h index b5110b08f..819dbaeb6 100644 --- a/ciaox11/core/ciaox11_core_export.h +++ b/ciaox11/core/ciaox11_core_export.h @@ -34,26 +34,6 @@ # define CIAOX11_CORE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* CIAOX11_CORE_HAS_DLL == 1 */ -// Set CIAOX11_CORE_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAOX11_CORE_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAOX11_CORE_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAOX11_CORE_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAOX11_CORE_NTRACE */ - -#if (CIAOX11_CORE_NTRACE == 1) -# define CIAOX11_CORE_TRACE(X) -#else /* (CIAOX11_CORE_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAOX11_CORE_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAOX11_CORE_NTRACE == 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 index c4f73bb46..e1774aeba 100644 --- a/ciaox11/deployment/handlers/ciaox11_deployment_handler_export.h +++ b/ciaox11/deployment/handlers/ciaox11_deployment_handler_export.h @@ -34,26 +34,6 @@ # define CIAOX11_DEPLOYMENT_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* CIAOX11_DEPLOYMENT_HANDLER_HAS_DLL == 1 */ -// Set CIAOX11_DEPLOYMENT_HANDLER_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAOX11_DEPLOYMENT_HANDLER_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAOX11_DEPLOYMENT_HANDLER_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAOX11_DEPLOYMENT_HANDLER_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAOX11_DEPLOYMENT_HANDLER_NTRACE */ - -#if (CIAOX11_DEPLOYMENT_HANDLER_NTRACE == 1) -# define CIAOX11_DEPLOYMENT_HANDLER_TRACE(X) -#else /* (CIAOX11_DEPLOYMENT_HANDLER_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAOX11_DEPLOYMENT_HANDLER_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAOX11_DEPLOYMENT_HANDLER_NTRACE == 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 index 04c9bb0c3..e84f5a746 100644 --- a/ciaox11/deployment/handlers/ciaox11_deployment_state_export.h +++ b/ciaox11/deployment/handlers/ciaox11_deployment_state_export.h @@ -34,26 +34,6 @@ # define CIAOX11_DEPLOYMENT_STATE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* CIAOX11_DEPLOYMENT_STATE_HAS_DLL == 1 */ -// Set CIAOX11_DEPLOYMENT_STATE_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAOX11_DEPLOYMENT_STATE_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAOX11_DEPLOYMENT_STATE_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAOX11_DEPLOYMENT_STATE_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAOX11_DEPLOYMENT_STATE_NTRACE */ - -#if (CIAOX11_DEPLOYMENT_STATE_NTRACE == 1) -# define CIAOX11_DEPLOYMENT_STATE_TRACE(X) -#else /* (CIAOX11_DEPLOYMENT_STATE_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAOX11_DEPLOYMENT_STATE_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAOX11_DEPLOYMENT_STATE_NTRACE == 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 index 2286d416d..6d73c79f7 100644 --- a/ciaox11/deployment/interceptors/ciaox11_deployment_interceptors_export.h +++ b/ciaox11/deployment/interceptors/ciaox11_deployment_interceptors_export.h @@ -34,26 +34,6 @@ # define CIAOX11_DEPLOYMENT_INTERCEPTORS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* CIAOX11_DEPLOYMENT_INTERCEPTORS_HAS_DLL == 1 */ -// Set CIAOX11_DEPLOYMENT_INTERCEPTORS_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAOX11_DEPLOYMENT_INTERCEPTORS_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAOX11_DEPLOYMENT_INTERCEPTORS_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAOX11_DEPLOYMENT_INTERCEPTORS_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAOX11_DEPLOYMENT_INTERCEPTORS_NTRACE */ - -#if (CIAOX11_DEPLOYMENT_INTERCEPTORS_NTRACE == 1) -# define CIAOX11_DEPLOYMENT_INTERCEPTORS_TRACE(X) -#else /* (CIAOX11_DEPLOYMENT_INTERCEPTORS_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAOX11_DEPLOYMENT_INTERCEPTORS_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAOX11_DEPLOYMENT_INTERCEPTORS_NTRACE == 1) */ - #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 index 35a657ecc..73c5f1dbe 100644 --- a/ciaox11/logger/ciaox11_logger_export.h +++ b/ciaox11/logger/ciaox11_logger_export.h @@ -33,26 +33,6 @@ # define CIAOX11_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* CIAOX11_LOGGER_HAS_DLL == 1 */ -// Set CIAOX11_LOGGER_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAOX11_LOGGER_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAOX11_LOGGER_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAOX11_LOGGER_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAOX11_LOGGER_NTRACE */ - -#if (CIAOX11_LOGGER_NTRACE == 1) -# define CIAOX11_LOGGER_TRACE(X) -#else /* (CIAOX11_LOGGER_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAOX11_LOGGER_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAOX11_LOGGER_NTRACE == 1) */ - #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 index 5a6edcf72..bc091b03e 100644 --- a/connectors/dds4ccm/impl/dds4ccm_impl_export.h +++ b/connectors/dds4ccm/impl/dds4ccm_impl_export.h @@ -34,26 +34,6 @@ # define DDS4CCM_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* DDS4CCM_IMPL_HAS_DLL == 1 */ -// Set DDS4CCM_IMPL_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (DDS4CCM_IMPL_NTRACE) -# if (ACE_NTRACE == 1) -# define DDS4CCM_IMPL_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define DDS4CCM_IMPL_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !DDS4CCM_IMPL_NTRACE */ - -#if (DDS4CCM_IMPL_NTRACE == 1) -# define DDS4CCM_IMPL_TRACE(X) -#else /* (DDS4CCM_IMPL_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define DDS4CCM_IMPL_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (DDS4CCM_IMPL_NTRACE == 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 index 458cd578a..3635a3c71 100644 --- a/connectors/dds4ccm/logger/dds4ccm_logger_export.h +++ b/connectors/dds4ccm/logger/dds4ccm_logger_export.h @@ -33,24 +33,6 @@ # define DDS4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* DDS4CCM_LOGGER_HAS_DLL == 1 */ -// Set DDS4CCM_LOGGER_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (DDS4CCM_LOGGER_NTRACE) -# if (ACE_NTRACE == 1) -# define DDS4CCM_LOGGER_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define DDS4CCM_LOGGER_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !DDS4CCM_LOGGER_NTRACE */ - -#if (DDS4CCM_LOGGER_NTRACE == 0) -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define DDS4CCM_LOGGER_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (DDS4CCM_LOGGER_NTRACE == 1) */ - #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 index 3c711e1b9..70a705e47 100644 --- a/connectors/psdd4ccm/logger/psdd4ccm_logger_export.h +++ b/connectors/psdd4ccm/logger/psdd4ccm_logger_export.h @@ -33,24 +33,6 @@ # define PSDD4CCM_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* PSDD4CCM_LOGGER_HAS_DLL == 1 */ -// Set PSDD4CCM_LOGGER_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (PSDD4CCM_LOGGER_NTRACE) -# if (ACE_NTRACE == 1) -# define PSDD4CCM_LOGGER_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define PSDD4CCM_LOGGER_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !PSDD4CCM_LOGGER_NTRACE */ - -#if (PSDD4CCM_LOGGER_NTRACE == 0) -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define PSDD4CCM_LOGGER_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (PSDD4CCM_LOGGER_NTRACE == 1) */ - #endif /* PSDD4CCM_LOGGER_EXPORT_H */ // End of auto generated file. diff --git a/ddsx11/logger/ddsx11_logger_export.h b/ddsx11/logger/ddsx11_logger_export.h index 2d843567c..9f6457cbd 100644 --- a/ddsx11/logger/ddsx11_logger_export.h +++ b/ddsx11/logger/ddsx11_logger_export.h @@ -33,24 +33,6 @@ # define DDSX11_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* DDSX11_LOGGER_HAS_DLL == 1 */ -// Set DDSX11_LOGGER_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (DDSX11_LOGGER_NTRACE) -# if (ACE_NTRACE == 1) -# define DDSX11_LOGGER_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define DDSX11_LOGGER_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !DDSX11_LOGGER_NTRACE */ - -#if (DDSX11_LOGGER_NTRACE == 0) -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define DDSX11_LOGGER_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (DDSX11_LOGGER_NTRACE == 1) */ - #endif /* DDSX11_LOGGER_EXPORT_H */ // End of auto generated file. diff --git a/ddsx11/tests/logger_backend/log_backend_export.h b/ddsx11/tests/logger_backend/log_backend_export.h index 375b01b8a..2e03e0ff9 100644 --- a/ddsx11/tests/logger_backend/log_backend_export.h +++ b/ddsx11/tests/logger_backend/log_backend_export.h @@ -36,26 +36,6 @@ # define DNCX11_LOG_BACKEND_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* DNCX11_LOG_BACKEND_HAS_DLL == 1 */ -// Set DNCX11_LOG_BACKEND_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (DNCX11_LOG_BACKEND_NTRACE) -# if (ACE_NTRACE == 1) -# define DNCX11_LOG_BACKEND_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define DNCX11_LOG_BACKEND_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !DNCX11_LOG_BACKEND_NTRACE */ - -#if (DNCX11_LOG_BACKEND_NTRACE == 1) -# define DNCX11_LOG_BACKEND_TRACE(X) -#else /* (DNCX11_LOG_BACKEND_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define DNCX11_LOG_BACKEND_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (DNCX11_LOG_BACKEND_NTRACE == 1) */ - #endif /* DNCX11_LOG_BACKEND_EXPORT_H */ // End of auto generated file. diff --git a/exf/deployment/amh/ciaox11_exf_amh_export.h b/exf/deployment/amh/ciaox11_exf_amh_export.h index 55ab3d26c..449b46b31 100644 --- a/exf/deployment/amh/ciaox11_exf_amh_export.h +++ b/exf/deployment/amh/ciaox11_exf_amh_export.h @@ -34,26 +34,6 @@ # define CIAOX11_EXF_AMH_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* CIAOX11_EXF_AMH_HAS_DLL == 1 */ -// Set CIAOX11_EXF_AMH_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAOX11_EXF_AMH_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAOX11_EXF_AMH_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAOX11_EXF_AMH_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAOX11_EXF_AMH_NTRACE */ - -#if (CIAOX11_EXF_AMH_NTRACE == 1) -# define CIAOX11_EXF_AMH_TRACE(X) -#else /* (CIAOX11_EXF_AMH_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAOX11_EXF_AMH_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAOX11_EXF_AMH_NTRACE == 1) */ - #endif /* CIAOX11_EXF_AMH_EXPORT_H */ // End of auto generated file. diff --git a/exf/deployment/core/ciaox11_exf_core_export.h b/exf/deployment/core/ciaox11_exf_core_export.h index 0363417f9..b646ec95b 100644 --- a/exf/deployment/core/ciaox11_exf_core_export.h +++ b/exf/deployment/core/ciaox11_exf_core_export.h @@ -34,26 +34,6 @@ # define CIAOX11_EXF_CORE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* CIAOX11_EXF_CORE_HAS_DLL == 1 */ -// Set CIAOX11_EXF_CORE_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAOX11_EXF_CORE_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAOX11_EXF_CORE_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAOX11_EXF_CORE_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAOX11_EXF_CORE_NTRACE */ - -#if (CIAOX11_EXF_CORE_NTRACE == 1) -# define CIAOX11_EXF_CORE_TRACE(X) -#else /* (CIAOX11_EXF_CORE_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAOX11_EXF_CORE_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAOX11_EXF_CORE_NTRACE == 1) */ - #endif /* CIAOX11_EXF_CORE_EXPORT_H */ // End of auto generated file. diff --git a/exf/deployment/handlers/ciaox11_exf_handler_export.h b/exf/deployment/handlers/ciaox11_exf_handler_export.h index c6ac6b61a..ff8da0415 100644 --- a/exf/deployment/handlers/ciaox11_exf_handler_export.h +++ b/exf/deployment/handlers/ciaox11_exf_handler_export.h @@ -34,26 +34,6 @@ # define CIAOX11_EXF_HANDLER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* CIAOX11_EXF_HANDLER_HAS_DLL == 1 */ -// Set CIAOX11_EXF_HANDLER_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAOX11_EXF_HANDLER_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAOX11_EXF_HANDLER_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAOX11_EXF_HANDLER_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAOX11_EXF_HANDLER_NTRACE */ - -#if (CIAOX11_EXF_HANDLER_NTRACE == 1) -# define CIAOX11_EXF_HANDLER_TRACE(X) -#else /* (CIAOX11_EXF_HANDLER_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAOX11_EXF_HANDLER_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAOX11_EXF_HANDLER_NTRACE == 1) */ - #endif /* CIAOX11_EXF_HANDLER_EXPORT_H */ // End of auto generated file. diff --git a/exf/deployment/logger/ciaox11_exf_logger_export.h b/exf/deployment/logger/ciaox11_exf_logger_export.h index b1ed528d6..efdea96fb 100644 --- a/exf/deployment/logger/ciaox11_exf_logger_export.h +++ b/exf/deployment/logger/ciaox11_exf_logger_export.h @@ -33,26 +33,6 @@ # define CIAOX11_EXF_LOGGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* CIAOX11_EXF_LOGGER_HAS_DLL == 1 */ -// Set CIAOX11_EXF_LOGGER_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAOX11_EXF_LOGGER_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAOX11_EXF_LOGGER_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAOX11_EXF_LOGGER_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAOX11_EXF_LOGGER_NTRACE */ - -#if (CIAOX11_EXF_LOGGER_NTRACE == 1) -# define CIAOX11_EXF_LOGGER_TRACE(X) -#else /* (CIAOX11_EXF_LOGGER_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAOX11_EXF_LOGGER_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAOX11_EXF_LOGGER_NTRACE == 1) */ - #endif /* CIAOX11_EXF_LOGGER_EXPORT_H */ // End of auto generated file. diff --git a/exf/deployment/monitor/ciaox11_exf_monitor_export.h b/exf/deployment/monitor/ciaox11_exf_monitor_export.h index 1cb9e49a0..673b55ca0 100644 --- a/exf/deployment/monitor/ciaox11_exf_monitor_export.h +++ b/exf/deployment/monitor/ciaox11_exf_monitor_export.h @@ -34,26 +34,6 @@ # define CIAOX11_EXF_MONITOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* CIAOX11_EXF_MONITOR_HAS_DLL == 1 */ -// Set CIAOX11_EXF_MONITOR_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAOX11_EXF_MONITOR_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAOX11_EXF_MONITOR_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAOX11_EXF_MONITOR_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAOX11_EXF_MONITOR_NTRACE */ - -#if (CIAOX11_EXF_MONITOR_NTRACE == 1) -# define CIAOX11_EXF_MONITOR_TRACE(X) -#else /* (CIAOX11_EXF_MONITOR_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAOX11_EXF_MONITOR_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAOX11_EXF_MONITOR_NTRACE == 1) */ - #endif /* CIAOX11_EXF_MONITOR_EXPORT_H */ // End of auto generated file. diff --git a/exf/deployment/scheduler/ciaox11_exf_scheduler_export.h b/exf/deployment/scheduler/ciaox11_exf_scheduler_export.h index ebf79b974..011531cce 100644 --- a/exf/deployment/scheduler/ciaox11_exf_scheduler_export.h +++ b/exf/deployment/scheduler/ciaox11_exf_scheduler_export.h @@ -34,26 +34,6 @@ # define CIAOX11_EXF_SCHEDULER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) #endif /* CIAOX11_EXF_SCHEDULER_HAS_DLL == 1 */ -// Set CIAOX11_EXF_SCHEDULER_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAOX11_EXF_SCHEDULER_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAOX11_EXF_SCHEDULER_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAOX11_EXF_SCHEDULER_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAOX11_EXF_SCHEDULER_NTRACE */ - -#if (CIAOX11_EXF_SCHEDULER_NTRACE == 1) -# define CIAOX11_EXF_SCHEDULER_TRACE(X) -#else /* (CIAOX11_EXF_SCHEDULER_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAOX11_EXF_SCHEDULER_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAOX11_EXF_SCHEDULER_NTRACE == 1) */ - #endif /* CIAOX11_EXF_SCHEDULER_EXPORT_H */ // End of auto generated file.