diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-10-29 12:31:15 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-10-29 12:31:15 +0000 |
| commit | c6b2ce5cced1990a441f5e1b569cc870bb73d72e (patch) | |
| tree | b2891ec1cbb7e10c1b4dd863b394c9106969a261 | |
| parent | b190cff0b8b8b40e4c64fc171a1796ba119b9032 (diff) | |
| download | ATCD-c6b2ce5cced1990a441f5e1b569cc870bb73d72e.tar.gz | |
Thu Oct 29 11:31:31 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* DAnCE/Logger/Log_Macros.h:
* DAnCE/Logger/Logger_Service.h:
Unicode fixes
| -rw-r--r-- | CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | CIAO/DAnCE/Logger/Log_Macros.h | 4 | ||||
| -rw-r--r-- | CIAO/DAnCE/Logger/Logger_Service.h | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index daada1d0ada..ae1bddaf190 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Oct 29 11:31:31 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/Logger/Log_Macros.h: + * DAnCE/Logger/Logger_Service.h: + Unicode fixes + Mon Oct 26 11:19:31 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * connectors/dds4ccm/docs/DDS for CCM FTF 22Oct09.doc: diff --git a/CIAO/DAnCE/Logger/Log_Macros.h b/CIAO/DAnCE/Logger/Log_Macros.h index fffb1bb1f46..4b2f9c35274 100644 --- a/CIAO/DAnCE/Logger/Log_Macros.h +++ b/CIAO/DAnCE/Logger/Log_Macros.h @@ -17,7 +17,7 @@ # else # define DANCE_NTRACE ACE_NTRACE # endif -#endif DANCE_NTRACE +#endif DANCE_NTRACE */ #define DLINFO ACE_TEXT("(%P|%t) [%M] - %T - ") @@ -43,7 +43,7 @@ # define DANCE_ENABLE_TRACE() ACE_Trace::start_tracing () # define DANCE_DISABLE_TRACE() ACE_Trace::stop_tracing () # undef DLINFO // Make log messages indent with tracing. -# define DLINFO "%I(%P|%t) [%M] - %T - " +# define DLINFO ACE_TEXT("%I(%P|%t) [%M] - %T - ") # include "ace/Trace.h" #endif /* DANCE_NTRACE */ diff --git a/CIAO/DAnCE/Logger/Logger_Service.h b/CIAO/DAnCE/Logger/Logger_Service.h index 4ad8b8bacab..5713bf96755 100644 --- a/CIAO/DAnCE/Logger/Logger_Service.h +++ b/CIAO/DAnCE/Logger/Logger_Service.h @@ -7,8 +7,7 @@ #include "DAnCE/Logger/File_Logger_Backend.h" namespace DAnCE - { - +{ class DAnCE_Logger_Export Logger_Service : public ::DAnCE::DAnCELoggerFactory { public: @@ -23,7 +22,6 @@ namespace DAnCE bool trace_; int log_level_; }; - } // DAnCE ACE_FACTORY_DECLARE (DAnCE_Logger, Logger_Service) |