diff options
Diffstat (limited to 'TAO/orbsvcs/tests')
27 files changed, 60 insertions, 46 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h index 698d95b1180..88e6fc31b97 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h +++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h @@ -19,6 +19,7 @@ #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/Policy.h" #include "orbsvcs/AV/Flows_T.h" +#include "ace/OS_NS_time.h" class Ping_Recv_Callback : public TAO_AV_Callback { diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp index 04695ae8b56..e06135526c4 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp @@ -25,6 +25,7 @@ #include "ace/Read_Buffer.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" +#include "ace/os_include/os_ctype.h" ACE_RCSID(Concurrency, CC_client, "$Id$") diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp index 4de63e67cbe..b26b31e4c79 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp @@ -19,10 +19,9 @@ #include "CC_test_utils.h" #include "CC_naming_service.h" #include "ace/ACE.h" -#include "ace/OS.h" #include "ace/Process.h" #include "orbsvcs/CosConcurrencyControlC.h" -#include <stdio.h> +#include "ace/OS_NS_stdio.h" ACE_RCSID(Concurrency, CC_command, "$Id$") diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp index ec6ffd9effb..7d9019d5bba 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp @@ -4,6 +4,7 @@ #include "orbsvcs/CosEvent/CEC_EventChannel.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "ace/Arg_Shifter.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(CEC_Tests, Random, "$Id$") diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index c43b71cb4ca..ad32b062a54 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -20,6 +20,8 @@ #include "ace/Get_Opt.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" +#include "ace/OS_NS_errno.h" +#include "ace/OS_NS_strings.h" #if defined (sun) # include <sys/lwp.h> /* for _lwp_self */ diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index be3e75e7ed8..6de28a3c6d7 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -14,6 +14,7 @@ #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(EC_Throughput, ECT_Consumer_Driver, "$Id$") diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index 701da7d3d15..0bb6d9422af 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -14,6 +14,7 @@ #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(EC_Throughput, ECT_Supplier_Driver, "$Id$") diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index d6a03203c50..fd2ffe3273b 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -20,6 +20,8 @@ #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/High_Res_Timer.h" +#include "ace/OS_NS_strings.h" +#include "ace/OS_NS_errno.h" ACE_RCSID(EC_Throughput, ECT_Throughput, "$Id$") diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index 967f69b7edd..6217f46081e 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -6,6 +6,7 @@ #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Time_Utilities.h" #include "ace/Arg_Shifter.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(EC_Tests, Random, "$Id$") diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index bc3dc16a191..087bf7f3831 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -6,6 +6,7 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include "ace/Arg_Shifter.h" #include "ace/High_Res_Timer.h" +#include "ace/OS_NS_strings.h" ACE_RCSID(EC_Tests_Performance, Connect, "$Id$") diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp index 0c9d83d8fcb..838f3b35e7c 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp @@ -2,6 +2,7 @@ #include "Counting_Supplier.h" #include "orbsvcs/Event_Utilities.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(EC_Tests, EC_Count_Supplier, "$Id$") diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp index 0eb220e760a..8424216bd5c 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp @@ -5,6 +5,7 @@ #include "orbsvcs/Event_Utilities.h" #include "tao/debug.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(EC_Tests, EC_Supplier, "$Id$") 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" diff --git a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp index 83d4b3f516d..9b78e32dd27 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/Object1_i.cpp @@ -59,7 +59,7 @@ void Object1_impl::method1(const char* activity, - if (strcmp(activity,"Client1") == 0) + if (ACE_OS::strcmp(activity,"Client1") == 0) { ACE_OS::sleep(5); } @@ -77,7 +77,7 @@ void Object1_impl::method1(const char* activity, ACE::timestamp(date_and_time, time_size), activity); ACE_DEBUG((LM_DEBUG,"%s",buf2)); - ACE_OS_String::strcat(buf,buf2); - output = ACE_OS_String::strdup(buf); + ACE_OS::strcat(buf,buf2); + output = ACE_OS::strdup(buf); } diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp index 0f89c467e59..a75adb276d0 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp @@ -275,7 +275,7 @@ int svc(void) { ACE_DEBUG ((LM_DEBUG, "%s", buf)); - ACE_OS_String::strcat(client_output_, buf); + ACE_OS::strcat(client_output_, buf); do_work(before_); ACE_TRY_CHECK; @@ -289,11 +289,11 @@ int svc(void) { ACE_DEBUG ((LM_DEBUG, "%s", buf)); - ACE_OS_String::strcat(client_output_, buf); - serv_output_ = ACE_OS_String::strdup(""); + ACE_OS::strcat(client_output_, buf); + serv_output_ = ACE_OS::strdup(""); object1->method1 (activity_, remote_, serv_output_.inout()); - ACE_OS_String::strcat(client_output_, serv_output_.in()); + ACE_OS::strcat(client_output_, serv_output_.in()); ACE_OS::sprintf(buf, @@ -304,7 +304,7 @@ int svc(void) { ACE_DEBUG ((LM_DEBUG, "%s", buf)); - ACE_OS_String::strcat(client_output_, buf); + ACE_OS::strcat(client_output_, buf); do_work(after_); @@ -317,7 +317,7 @@ int svc(void) { ACE_DEBUG ((LM_DEBUG, "%s", buf)); - ACE_OS_String::strcat(client_output_, buf); + ACE_OS::strcat(client_output_, buf); } @@ -333,7 +333,7 @@ int svc(void) { activity_)); object1->method1 (activity_, remote_, serv_output_.inout()); - ACE_OS_String::strcat(client_output_,serv_output_.in()); + ACE_OS::strcat(client_output_,serv_output_.in()); /// Finished with remote call ACE_DEBUG ((LM_DEBUG, "%T\t%s\tClient\tDone with method1\n", diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp index 46bc4dd1d3e..97bef9c2b92 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.cpp +++ b/TAO/orbsvcs/tests/Time/Client_i.cpp @@ -6,7 +6,7 @@ #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" -#include "ace/OS.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(Time_Service, Client_i, "$Id$") @@ -346,8 +346,8 @@ Client_i::obtain_initial_references (void) CosNaming::Name clerk_name; clerk_name.length (2); clerk_name[0].id = CORBA::string_dup ("ClerkContext"); - strcpy (name, "Clerk:"); - strcat (name, host_name); + ACE_OS::strcpy (name, "Clerk:"); + ACE_OS::strcat (name, host_name); clerk_name[1].id = CORBA::string_dup (name); ACE_DEBUG ((LM_DEBUG, |