diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-08-01 07:35:05 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-08-01 07:35:05 +0000 |
| commit | 8162310ed72bc90aa3f443af7ecbafdbafbd8dd4 (patch) | |
| tree | f01de3cdf3482f4c3217b57448187384cbf8e799 | |
| parent | aa1e93943fb82ad9154d1c8852a4c1d09e7eed05 (diff) | |
| download | ATCD-8162310ed72bc90aa3f443af7ecbafdbafbd8dd4.tar.gz | |
Wed Aug 1 07:34:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/HTIOP/test_config.h | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b7f074ad03f..2097ad3d74b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Wed Aug 1 07:34:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp: + * orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp: + * orbsvcs/tests/HTIOP/test_config.h: + Replaced ACE_LIB_TEXT with ACE_TEXT + Tue Jul 31 14:12:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Valuetype.mpc: diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp index a6d24d562cd..f11dc27dbee 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp @@ -64,7 +64,7 @@ main (int argc, char* argv[]) const char* ior_file_name = "Consumer.ior"; FILE *output_file= ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(ior_file_name), - ACE_LIB_TEXT("w")); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp index f58236884ca..63da3f4dfd8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp @@ -22,7 +22,7 @@ TAO_MonitorManager::init (int argc, ACE_TCHAR* argv[]) ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->task_.mutex_, -1); this->task_.argv_.add ("fake_process_name"); - ACE_Get_Opt opts (argc, argv, ACE_LIB_TEXT ("o:"), 0, 0, + ACE_Get_Opt opts (argc, argv, ACE_TEXT ("o:"), 0, 0, ACE_Get_Opt::PERMUTE_ARGS, 1); static const ACE_TCHAR* orbarg = ACE_TEXT ("ORBArg"); static const ACE_TCHAR* nonamesvc = ACE_TEXT ("NoNameSvc"); diff --git a/TAO/orbsvcs/tests/HTIOP/test_config.h b/TAO/orbsvcs/tests/HTIOP/test_config.h index c87f7c6ecb4..875869710c2 100644 --- a/TAO/orbsvcs/tests/HTIOP/test_config.h +++ b/TAO/orbsvcs/tests/HTIOP/test_config.h @@ -42,9 +42,6 @@ // The second #undef protects against being reset in a config.h file. #undef ACE_NDEBUG -#undef ACE_TEXT -#define ACE_TEXT ACE_LIB_TEXT - #if defined (ACE_HAS_WINCE) // Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'. // PPC 2002 only accepts '\log' as a valid directory name, while 'log\' works under WinCE 3.0. |