Use ACE_OS instead of ACE_OS_String

    * ACE/ace/OS_NS_time.inl:
    * ACE/examples/APG/Config/ARGV_Example.cpp:
    * ACE/examples/APG/Config/Get_Opt.cpp:
    * ACE/examples/APG/Config/Get_Opt_Long.cpp:
    * ACE/tests/ARGV_Test.cpp:
    * TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp:
    * TAO/orbsvcs/orbsvcs/Event/EC_Thread_Flags.cpp:
    * TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp:
    * TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp:
    * TAO/orbsvcs/tests/Event/ThreadFlags/testflags.cpp:
    * TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp:
    * TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp:
    * TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp:
    * TAO/tests/Bug_3941_Regression/test.cpp:

1 files changed, 10 insertions, 10 deletions

diff --git a/ACE/tests/ARGV_Test.cpp b/ACE/tests/ARGV_Test.cpp
index 74f7d7485e2..4fe4eff6478 100644
--- a/ACE/tests/ARGV_Test.cpp
+++ b/ACE/tests/ARGV_Test.cpp
@@ -67,14 +67,14 @@ static int
 test_argv_type_converter (void)
 {
   char *argv[20];
-  argv[0] = ACE_OS_String::strdup ("one");
-  argv[1] = ACE_OS_String::strdup ("two");
-  argv[2] = ACE_OS_String::strdup ("three");
-  argv[3] = ACE_OS_String::strdup ("four");
+  argv[0] = ACE_OS::strdup ("one");
+  argv[1] = ACE_OS::strdup ("two");
+  argv[2] = ACE_OS::strdup ("three");
+  argv[3] = ACE_OS::strdup ("four");
   argv[4] = 0;
 
   char *save_argv[20];
-  ACE_OS_String::memcpy (save_argv, argv, sizeof (argv));
+  ACE_OS::memcpy (save_argv, argv, sizeof (argv));
 
   int argc = 4;
 
@@ -111,14 +111,14 @@ static int
 test_argv_type_converter2 (void)
 {
   ACE_TCHAR *argv[20];
-  argv[0] = ACE_OS_String::strdup (ACE_TEXT ("one"));
-  argv[1] = ACE_OS_String::strdup (ACE_TEXT ("two"));
-  argv[2] = ACE_OS_String::strdup (ACE_TEXT ("three"));
-  argv[3] = ACE_OS_String::strdup (ACE_TEXT ("four"));
+  argv[0] = ACE_OS::strdup (ACE_TEXT ("one"));
+  argv[1] = ACE_OS::strdup (ACE_TEXT ("two"));
+  argv[2] = ACE_OS::strdup (ACE_TEXT ("three"));
+  argv[3] = ACE_OS::strdup (ACE_TEXT ("four"));
   argv[4] = 0;
 
   ACE_TCHAR *save_argv[20];
-  ACE_OS_String::memcpy (save_argv, argv, sizeof (argv));
+  ACE_OS::memcpy (save_argv, argv, sizeof (argv));
 
   int argc = 4;