ChangeLogTag:Tue Nov 4 04:55:40 UTC 2003 Don Hinton <dhinton@dresystems.com>

12 files changed, 33 insertions, 31 deletions

diff --git a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
index 1caccdbb3df..c88d7dc082d 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
@@ -5,6 +5,7 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
 
 
 const char*
@@ -36,12 +37,12 @@ Any_String (const CORBA::Any& any)
     }
   else if (any >>= str)
     {
-      ACE_OS_String::strcpy (out, str);
+      ACE_OS::strcpy (out, str);
     }
   else if (any >>= ull)
     {
 #if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS_String::strcpy (out, ull.as_string (out));
+      ACE_OS::strcpy (out, ull.as_string (out));
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
@@ -55,7 +56,7 @@ Any_String (const CORBA::Any& any)
     }
   else
     {
-      ACE_OS_String::strcpy (out, "Unsupported Any Type");
+      ACE_OS::strcpy (out, "Unsupported Any Type");
     }
 
   return out;
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
index 1caccdbb3df..c88d7dc082d 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
@@ -5,6 +5,7 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
 
 
 const char*
@@ -36,12 +37,12 @@ Any_String (const CORBA::Any& any)
     }
   else if (any >>= str)
     {
-      ACE_OS_String::strcpy (out, str);
+      ACE_OS::strcpy (out, str);
     }
   else if (any >>= ull)
     {
 #if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS_String::strcpy (out, ull.as_string (out));
+      ACE_OS::strcpy (out, ull.as_string (out));
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
@@ -55,7 +56,7 @@ Any_String (const CORBA::Any& any)
     }
   else
     {
-      ACE_OS_String::strcpy (out, "Unsupported Any Type");
+      ACE_OS::strcpy (out, "Unsupported Any Type");
     }
 
   return out;
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
index aff5df0cad2..495f48ce04f 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
@@ -196,10 +196,10 @@ int main (int argc, char* argv[])
               // before we start receiving events.
               ACE_stat buf;
               char ior_file[PATH_MAX];
-              const char* filepart = ACE_OS_String::strstr (ior, "file://");
+              const char* filepart = ACE_OS::strstr (ior, "file://");
               if (filepart != 0)
                 {
-                  ACE_OS_String::strcpy (ior_file, filepart + 7);
+                  ACE_OS::strcpy (ior_file, filepart + 7);
                   while (ACE_OS::stat (ior_file, &buf) == 0)
                     {
                       ACE_OS::sleep (1);
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
index 0ab02f6757a..2942fc5ed3f 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
@@ -189,10 +189,10 @@ int main (int argc, char* argv[])
               // before we start receiving events.
               ACE_stat buf;
               char ior_file[PATH_MAX];
-              const char* filepart = ACE_OS_String::strstr (ior, "file://");
+              const char* filepart = ACE_OS::strstr (ior, "file://");
               if (filepart != 0)
                 {
-                  ACE_OS_String::strcpy (ior_file, filepart + 7);
+                  ACE_OS::strcpy (ior_file, filepart + 7);
                   while (ACE_OS::stat (ior_file, &buf) == 0)
                     {
                       ACE_OS::sleep (1);
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
index 1caccdbb3df..27cb6382507 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
@@ -36,12 +36,12 @@ Any_String (const CORBA::Any& any)
     }
   else if (any >>= str)
     {
-      ACE_OS_String::strcpy (out, str);
+      ACE_OS::strcpy (out, str);
     }
   else if (any >>= ull)
     {
 #if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS_String::strcpy (out, ull.as_string (out));
+      ACE_OS::strcpy (out, ull.as_string (out));
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
@@ -55,7 +55,7 @@ Any_String (const CORBA::Any& any)
     }
   else
     {
-      ACE_OS_String::strcpy (out, "Unsupported Any Type");
+      ACE_OS::strcpy (out, "Unsupported Any Type");
     }
 
   return out;
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
index 1caccdbb3df..27cb6382507 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
@@ -36,12 +36,12 @@ Any_String (const CORBA::Any& any)
     }
   else if (any >>= str)
     {
-      ACE_OS_String::strcpy (out, str);
+      ACE_OS::strcpy (out, str);
     }
   else if (any >>= ull)
     {
 #if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS_String::strcpy (out, ull.as_string (out));
+      ACE_OS::strcpy (out, ull.as_string (out));
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
@@ -55,7 +55,7 @@ Any_String (const CORBA::Any& any)
     }
   else
     {
-      ACE_OS_String::strcpy (out, "Unsupported Any Type");
+      ACE_OS::strcpy (out, "Unsupported Any Type");
     }
 
   return out;
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
index 1caccdbb3df..27cb6382507 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
@@ -36,12 +36,12 @@ Any_String (const CORBA::Any& any)
     }
   else if (any >>= str)
     {
-      ACE_OS_String::strcpy (out, str);
+      ACE_OS::strcpy (out, str);
     }
   else if (any >>= ull)
     {
 #if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS_String::strcpy (out, ull.as_string (out));
+      ACE_OS::strcpy (out, ull.as_string (out));
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
@@ -55,7 +55,7 @@ Any_String (const CORBA::Any& any)
     }
   else
     {
-      ACE_OS_String::strcpy (out, "Unsupported Any Type");
+      ACE_OS::strcpy (out, "Unsupported Any Type");
     }
 
   return out;
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
index 61d82d51eff..e018c1114ab 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
@@ -49,12 +49,12 @@ Any_String (const CORBA::Any& any)
     }
   else if (any >>= str)
     {
-      ACE_OS_String::strcpy (out, str);
+      ACE_OS::strcpy (out, str);
     }
   else if (any >>= ull)
     {
 #if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS_String::strcpy (out, ull.as_string (out));
+      ACE_OS::strcpy (out, ull.as_string (out));
 #else
       // @@@@ (JP) Need to cast to signed int64 to cast to
       // double on Win32, but this hack may not fly on
@@ -65,7 +65,7 @@ Any_String (const CORBA::Any& any)
     }
   else
     {
-      ACE_OS_String::strcpy (out, "Unsupported Any Type");
+      ACE_OS::strcpy (out, "Unsupported Any Type");
     }
 
   return out;
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
index b25876d1f83..d2706a70453 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
@@ -113,12 +113,12 @@ Any_String (const CORBA::Any& any)
     }
   else if (any >>= str)
     {
-      ACE_OS_String::strcpy (out, str);
+      ACE_OS::strcpy (out, str);
     }
   else if (any >>= ull)
     {
 #if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS_String::strcpy (out, ull.as_string (out));
+      ACE_OS::strcpy (out, ull.as_string (out));
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
@@ -132,7 +132,7 @@ Any_String (const CORBA::Any& any)
     }
   else
     {
-      ACE_OS_String::strcpy (out, "Unsupported Any Type");
+      ACE_OS::strcpy (out, "Unsupported Any Type");
     }
 
   return out;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
index c0a92bbdabd..cc4d7190887 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
@@ -13,7 +13,7 @@
 #ifndef TASK_STATS_H
 #define TASK_STATS_H
 
-#include "ace/OS.h"
+#include "ace/OS_NS_time.h"
 #include "ace/Singleton.h"
 #include "tao/orbconf.h"
 #include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
index 1caccdbb3df..c88d7dc082d 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
@@ -5,6 +5,7 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_string.h"
 
 
 const char*
@@ -36,12 +37,12 @@ Any_String (const CORBA::Any& any)
     }
   else if (any >>= str)
     {
-      ACE_OS_String::strcpy (out, str);
+      ACE_OS::strcpy (out, str);
     }
   else if (any >>= ull)
     {
 #if defined (ACE_LACKS_LONGLONG_T)
-      ACE_OS_String::strcpy (out, ull.as_string (out));
+      ACE_OS::strcpy (out, ull.as_string (out));
 #else
       double temp =
 # if defined (ACE_CONFIG_WIN32_H)
@@ -55,7 +56,7 @@ Any_String (const CORBA::Any& any)
     }
   else
     {
-      ACE_OS_String::strcpy (out, "Unsupported Any Type");
+      ACE_OS::strcpy (out, "Unsupported Any Type");
     }
 
   return out;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index 6d2869f0609..6b9ee00d231 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -3,8 +3,7 @@
 #include "RedGreen_Test.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
-#include "ace/Synch.h"
-#include "ace/OS.h"
+#include "ace/OS_NS_unistd.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "tao/debug.h"