diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-07-19 18:25:05 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-07-19 18:25:05 +0000 |
| commit | 786b5c988cd3e9410ef76f8d7a9854873e0dabaa (patch) | |
| tree | 65c8747200745cdb737b2e4b708d365f9669935e | |
| parent | e7915ce3e2a687e4d42611156afb4d9e306f9602 (diff) | |
| download | ATCD-786b5c988cd3e9410ef76f8d7a9854873e0dabaa.tar.gz | |
Sun Jul 19 18:25:47 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* DAnCE/Logger/Logger_Service.cpp:
* DAnCE/Logger/Logger_Service.h:
Unicode fixes
| -rw-r--r-- | CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | CIAO/DAnCE/Logger/Logger_Service.cpp | 14 | ||||
| -rw-r--r-- | CIAO/DAnCE/Logger/Logger_Service.h | 2 |
3 files changed, 15 insertions, 9 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 529dab50c76..85457174991 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,10 +1,16 @@ +Sun Jul 19 18:25:47 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/Logger/Logger_Service.cpp: + * DAnCE/Logger/Logger_Service.h: + Unicode fixes + Sun Jul 19 17:22:08 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> * tests/IDL_Test/Keywords/Keywords.mpc: avoids mfc, as building with mfc enabled causes 'interface' to become a language keyword, where it otherwise would not be. - + Sun Jul 19 09:50:47 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ciao/Servants/Port_Activator_T.cpp: diff --git a/CIAO/DAnCE/Logger/Logger_Service.cpp b/CIAO/DAnCE/Logger/Logger_Service.cpp index 74ef349cb5d..62299a9ef93 100644 --- a/CIAO/DAnCE/Logger/Logger_Service.cpp +++ b/CIAO/DAnCE/Logger/Logger_Service.cpp @@ -9,7 +9,7 @@ namespace DAnCE { Logger_Service::Logger_Service (void) - : filename_ (""), + : filename_ (ACE_TEXT("")), trace_ (false), log_level_ (5) { @@ -27,7 +27,7 @@ namespace DAnCE ACE_Env_Value<int> trace (ACE_TEXT("DANCE_TRACE_ENABLE"), this->trace_); this->trace_ = trace; - ACE_Env_Value<const char *> filename (ACE_TEXT("DANCE_LOG_FILE"), this->filename_.c_str ()); + ACE_Env_Value<const ACE_TCHAR *> filename (ACE_TEXT("DANCE_LOG_FILE"), this->filename_.c_str ()); this->filename_ = filename; this->parse_args (argc, argv); @@ -62,7 +62,7 @@ namespace DAnCE { case 'l': DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT ("DAnCE_Logger::parse_args - ") - ACE_TEXT ("Log level is %C\n"), + ACE_TEXT ("Log level is %s\n"), get_opts.opt_arg ())); level = ACE_OS::atoi (get_opts.opt_arg ()); if (level != 0) @@ -76,9 +76,9 @@ namespace DAnCE case 'f': DANCE_DEBUG ((LM_TRACE, DLINFO ACE_TEXT ("DAnCE_Logger::parse_args - ") - ACE_TEXT ("Log file becomes %C\n"), + ACE_TEXT ("Log file becomes %s\n"), get_opts.opt_arg ())); - this->filename_ = ACE_TEXT_ALWAYS_CHAR (get_opts.opt_arg ()); + this->filename_ = get_opts.opt_arg (); break; case 'h': //case '?': // Display help for use of the server. @@ -154,9 +154,9 @@ namespace DAnCE ACE_Log_Msg_Backend * Logger_Service::get_logger_backend (CORBA::ORB_ptr) { - if (this->filename_ != "") + if (this->filename_ != ACE_TEXT("")) { - File_Logger_Backend * the_backend; + File_Logger_Backend * the_backend = 0; ACE_NEW_THROW_EX (the_backend, File_Logger_Backend (this->filename_.c_str()), CORBA::NO_MEMORY()); diff --git a/CIAO/DAnCE/Logger/Logger_Service.h b/CIAO/DAnCE/Logger/Logger_Service.h index 2832fdf209c..4ad8b8bacab 100644 --- a/CIAO/DAnCE/Logger/Logger_Service.h +++ b/CIAO/DAnCE/Logger/Logger_Service.h @@ -19,7 +19,7 @@ namespace DAnCE void parse_args (int argc, ACE_TCHAR **argv); void set_levels (void); - ACE_CString filename_; + ACE_TString filename_; bool trace_; int log_level_; }; |