diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-25 20:52:21 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-25 20:52:21 +0000 |
| commit | fd0f9e4366ff5bb0b3d06a5797808c17da755a79 (patch) | |
| tree | 6ec2eb191ea1f18b2e65ea145e6ffeb7cbb69f83 /TAO | |
| parent | 60c97631ac9678ef2880a39acced51dbfd8e9d22 (diff) | |
| download | ATCD-fd0f9e4366ff5bb0b3d06a5797808c17da755a79.tar.gz | |
Thu Sep 25 20:46:39 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
262 files changed, 543 insertions, 278 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f70ee365ec5..f1dedeae18e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,268 @@ +Thu Sep 25 20:46:39 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Abstract_Interface/server.cpp + * tests/AMH_Exceptions/client.cpp + * tests/AMH_Oneway/client.cpp + * tests/AMI/client.cpp + * tests/AMI/simple_client.cpp + * tests/AMI_Buffering/admin.cpp + * tests/AMI_Buffering/server.cpp + * tests/AMI_Timeouts/client.cpp + * tests/Any/Recursive/server.cpp + * tests/BiDirectional/client.cpp + * tests/BiDirectional_DelayedUpcall/client.cpp + * tests/BiDirectional_NestedUpcall/client.cpp + * tests/Big_AMI/client.cpp + * tests/Big_Oneways/client.cpp + * tests/Big_Oneways/server.cpp + * tests/Big_Reply/server.cpp + * tests/Big_Request_Muxing/client.cpp + * tests/Big_Request_Muxing/server.cpp + * tests/Big_Twoways/client.cpp + * tests/Big_Twoways/server.cpp + * tests/Blocking_Sync_None/client.cpp + * tests/Blocking_Sync_None/server.cpp + * tests/Bug_1020_Basic_Regression/client.cpp + * tests/Bug_1020_Basic_Regression/server.cpp + * tests/Bug_1020_Regression/client.cpp + * tests/Bug_1020_Regression/server.cpp + * tests/Bug_1269_Regression/client.cpp + * tests/Bug_1269_Regression/server.cpp + * tests/Bug_1269_Regression/shutdown.cpp + * tests/Bug_1270_Regression/client.cpp + * tests/Bug_1270_Regression/server.cpp + * tests/Bug_1270_Regression/shutdown.cpp + * tests/Bug_1330_Regression/client.cpp + * tests/Bug_1361_Regression/client.cpp + * tests/Bug_1361_Regression/server.cpp + * tests/Bug_1361_Regression/shutdown.cpp + * tests/Bug_1476_Regression/client.cpp + * tests/Bug_1476_Regression/server.cpp + * tests/Bug_1476_Test/client.cpp + * tests/Bug_1482_Regression/client.cpp + * tests/Bug_1482_Regression/server.cpp + * tests/Bug_1495_Regression/Threaded_Client.cpp + * tests/Bug_1495_Regression/Threaded_Server.cpp + * tests/Bug_1551_Regression/client.cpp + * tests/Bug_1551_Regression/server.cpp + * tests/Bug_1568_Regression/client.cpp + * tests/Bug_1568_Regression/server.cpp + * tests/Bug_1627_Regression/client.cpp + * tests/Bug_1670_Regression/client.cpp + * tests/Bug_1670_Regression/server.cpp + * tests/Bug_1676_Regression/client.cpp + * tests/Bug_1676_Regression/server.cpp + * tests/Bug_2183_Regression/client.cpp + * tests/Bug_2183_Regression/server.cpp + * tests/Bug_2186_Regression/client.cpp + * tests/Bug_2186_Regression/server.cpp + * tests/Bug_2188_Regression/client.cpp + * tests/Bug_2188_Regression/server.cpp + * tests/Bug_2289_Regression/client.cpp + * tests/Bug_2289_Regression/server.cpp + * tests/Bug_2319_Regression/server.cpp + * tests/Bug_2328_Regression/client.cpp + * tests/Bug_2328_Regression/server.cpp + * tests/Bug_2356_Regression/client.cpp + * tests/Bug_2429_Regression/server.cpp + * tests/Bug_2494_Regression/client.cpp + * tests/Bug_2494_Regression/server.cpp + * tests/Bug_2503_Regression/client.cpp + * tests/Bug_2503_Regression/server.cpp + * tests/Bug_2593_Regression/client.cpp + * tests/Bug_2593_Regression/server.cpp + * tests/Bug_2595_Regression/client.cpp + * tests/Bug_2595_Regression/server.cpp + * tests/Bug_2654_Regression/client.cpp + * tests/Bug_2654_Regression/server.cpp + * tests/Bug_2678_Regression/client.cpp + * tests/Bug_2678_Regression/server.cpp + * tests/Bug_2683_Regression/server.cpp + * tests/Bug_2702_Regression/client.cpp + * tests/Bug_2768_Regression/server.cpp + * tests/Bug_2804_Regression/server.cpp + * tests/Bug_2805_Regression/client.cpp + * tests/Bug_2844_Regression/server.cpp + * tests/Bug_2869_Regression/client.cpp + * tests/Bug_2909_Regression/client.cpp + * tests/Bug_2918_Regression/server.cpp + * tests/Bug_2966_Regression/client.cpp + * tests/Bug_2966_Regression/server.cpp + * tests/Bug_3000_Regression/client.cpp + * tests/Bug_3000_Regression/server.cpp + * tests/Bug_3068_Regression/client.cpp + * tests/Bug_3108_Regression/client.cpp + * tests/Bug_3108_Regression/server.cpp + * tests/Bug_3163_Regression/client.cpp + * tests/Bug_3299_Regression/client.cpp + * tests/Bug_3299_Regression/server.cpp + * tests/Bug_933_Regression/MessengerServer.cpp + * tests/Cache_Growth_Test/client.cpp + * tests/Cache_Growth_Test/server.cpp + * tests/CallbackTest/client.cpp + * tests/CallbackTest/server.cpp + * tests/Client_Leaks/server.cpp + * tests/Connect_Strategy_Test/client.cpp + * tests/Connect_Strategy_Test/server.cpp + * tests/Connection_Purging/client.cpp + * tests/Connection_Purging/server.cpp + * tests/Crash_On_Write/client.cpp + * tests/Crash_On_Write/server.cpp + * tests/Crashed_Callback/client.cpp + * tests/Crashed_Callback/server.cpp + * tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp + * tests/DiffServ/client.cpp + * tests/DII_AMI_Forward/client.cpp + * tests/DII_AMI_Forward/server.cpp + * tests/DIOP/client.cpp + * tests/DIOP/server.cpp + * tests/DLL_ORB/Test_Client_Module.cpp + * tests/DLL_ORB/Test_Server_Module.cpp + * tests/DSI_AMH/client.cpp + * tests/DSI_AMH/server.cpp + * tests/DSI_AMI_Gateway/client.cpp + * tests/DSI_AMI_Gateway/gateway.cpp + * tests/DSI_AMI_Gateway/server.cpp + * tests/DSI_Gateway/client.cpp + * tests/DSI_Gateway/gateway.cpp + * tests/DSI_Gateway/server.cpp + * tests/Explicit_Event_Loop/server.cpp + * tests/Faults/client.cpp + * tests/Faults/middle.cpp + * tests/Faults/ping.cpp + * tests/File_IO/client.cpp + * tests/File_IO/server.cpp + * tests/Forwarding/client.cpp + * tests/Forwarding/server.cpp + * tests/GIOP_Fragments/Java_Big_Reply/client.cpp + * tests/GIOP_Fragments/Java_Big_Request/server.cpp + * tests/GIOP_Fragments/PMB_With_Fragments/server.cpp + * tests/Hang_Shutdown/client.cpp + * tests/Hang_Shutdown/server.cpp + * tests/ICMG_Any_Bug/client.cpp + * tests/ICMG_Any_Bug/server.cpp + * tests/IPV6/client.cpp + * tests/IPV6/server.cpp + * tests/Leader_Followers/server.cpp + * tests/LongDouble/client.cpp + * tests/LongDouble/server.cpp + * tests/LongUpcalls/ami_client.cpp + * tests/LongUpcalls/ami_server.cpp + * tests/LongUpcalls/blocking_client.cpp + * tests/LongUpcalls/blocking_server.cpp + * tests/Monitor/Marshal_Buffer/client.cpp + * tests/Monitor/Marshal_Buffer/server.cpp + * tests/MProfile/client.cpp + * tests/MProfile_Connection_Timeout/client.cpp + * tests/MT_BiDir/client.cpp + * tests/MT_Client/client.cpp + * tests/MT_Client/orb_creation.cpp + * tests/MT_Server/client.cpp + * tests/MT_Timeout/client.cpp + * tests/MT_Timeout/server.cpp + * tests/Multiple/server.cpp + * tests/Muxed_GIOP_Versions/client.cpp + * tests/Muxing/client.cpp + * tests/Muxing/server.cpp + * tests/Native_Exceptions/client.cpp + * tests/Nested_Event_Loop/server.cpp + * tests/Nested_Upcall_Crash/client.cpp + * tests/Nested_Upcall_Crash/scavenger.cpp + * tests/Nested_Upcall_Crash/server.cpp + * tests/No_Server_MT_Connect_Test/client.cpp + * tests/Objref_Sequence_Test/client.cpp + * tests/Objref_Sequence_Test/server.cpp + * tests/OBV/Any/client.cpp + * tests/OBV/Any/server.cpp + * tests/OBV/Factory/client.cpp + * tests/OBV/Factory/server.cpp + * tests/OBV/Forward/client.cpp + * tests/OBV/Forward/server.cpp + * tests/OBV/TC_Alignment/client.cpp + * tests/OBV/TC_Alignment/server.cpp + * tests/OBV/Truncatable/client.cpp + * tests/OBV/Truncatable/server.cpp + * tests/OBV/ValueBox/client.cpp + * tests/OBV/ValueBox/server.cpp + * tests/OctetSeq/client.cpp + * tests/OctetSeq/server.cpp + * tests/Ondemand_Write/client.cpp + * tests/Ondemand_Write/server.cpp + * tests/Oneway_Buffering/admin.cpp + * tests/Oneway_Buffering/server.cpp + * tests/Oneways_Invoking_Twoways/client.cpp + * tests/Oneways_Invoking_Twoways/server.cpp + * tests/Optimized_Connection/oc_client.cpp + * tests/ORT/client.cpp + * tests/Parallel_Connect_Strategy/client.cpp + * tests/Parallel_Connect_Strategy/server.cpp + * tests/Param_Test/server.cpp + * tests/POA/DSI/server.cpp + * tests/POA/On_Demand_Activation/server.cpp + * tests/Portable_Interceptors/Bug_2133/server.cpp + * tests/Portable_Interceptors/Bug_2510_Regression/client.cpp + * tests/Portable_Interceptors/Bug_2510_Regression/server.cpp + * tests/Portable_Interceptors/Dynamic/client.cpp + * tests/Portable_Interceptors/Dynamic/server.cpp + * tests/Portable_Interceptors/IORInterceptor/client.cpp + * tests/Portable_Interceptors/IORInterceptor/server.cpp + * tests/Portable_Interceptors/PICurrent/client.cpp + * tests/Portable_Interceptors/PICurrent/server.cpp + * tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp + * tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp + * tests/QtTests/client.cpp + * tests/Reliable_Oneways/client.cpp + * tests/Reliable_Oneways/server.cpp + * tests/RTCORBA/Banded_Connections/client.cpp + * tests/RTCORBA/Banded_Connections/server.cpp + * tests/RTCORBA/Bug_3382_Regression/client.cpp + * tests/RTCORBA/Bug_3382_Regression/server.cpp + * tests/RTCORBA/Client_Propagated/client.cpp + * tests/RTCORBA/Client_Propagated/server.cpp + * tests/RTCORBA/Client_Protocol/client.cpp + * tests/RTCORBA/Client_Protocol/server.cpp + * tests/RTCORBA/Diffserv/client.cpp + * tests/RTCORBA/Dynamic_Thread_Pool/client.cpp + * tests/RTCORBA/Dynamic_Thread_Pool/server.cpp + * tests/RTCORBA/Explicit_Binding/client.cpp + * tests/RTCORBA/Explicit_Binding/server.cpp + * tests/RTCORBA/Linear_Priority/server.cpp + * tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp + * tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp + * tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp + * tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp + * tests/RTCORBA/Private_Connection/client.cpp + * tests/RTCORBA/Private_Connection/server.cpp + * tests/RTCORBA/Server_Declared/client.cpp + * tests/RTCORBA/Server_Declared/server.cpp + * tests/RTCORBA/Server_Protocol/client.cpp + * tests/RTCORBA/Server_Protocol/server.cpp + * tests/RTCORBA/Thread_Pool/client.cpp + * tests/RTCORBA/Thread_Pool/server.cpp + * tests/Servant_To_Reference_Test/server.cpp + * tests/Server_Connection_Purging/server.cpp + * tests/Server_Leaks/client.cpp + * tests/Server_Leaks/server.cpp + * tests/Server_Port_Zero/server.cpp + * tests/Single_Read/server.cpp + * tests/Smart_Proxies/Benchmark/client.cpp + * tests/Smart_Proxies/client.cpp + * tests/Smart_Proxies/On_Demand/client.cpp + * tests/Smart_Proxies/Policy/client.cpp + * tests/Stack_Recursion/client.cpp + * tests/Stack_Recursion/server.cpp + * tests/Strategies/client.cpp + * tests/Timed_Buffered_Oneways/server.cpp + * tests/Two_Objects/client.cpp + * tests/Two_Objects/server.cpp + * tests/Typedef_String_Array/client.cpp + * tests/Typedef_String_Array/server.cpp + * tests/UNKNOWN_Exception/server.cpp + * tests/Xt_Stopwatch/client.cpp + * tests/ZIOP/client.cpp + * tests/ZIOP/server.cpp + ACE_TCHAR changes + Thu Sep 25 20:28:39 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Portable_Interceptors/AMI/server.cpp diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp index 72bf30c2804..1a21f25ebc1 100644 --- a/TAO/tests/AMH_Exceptions/client.cpp +++ b/TAO/tests/AMH_Exceptions/client.cpp @@ -2,7 +2,7 @@ #include "TestC.h" -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/AMH_Oneway/client.cpp b/TAO/tests/AMH_Oneway/client.cpp index 5160e21e0a4..a161b873df5 100644 --- a/TAO/tests/AMH_Oneway/client.cpp +++ b/TAO/tests/AMH_Oneway/client.cpp @@ -4,7 +4,7 @@ #include "TestC.h" #include "ace/OS_NS_unistd.h" -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int num_calls = 10; int diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp index ddd53c1d721..3cc278ceee2 100644 --- a/TAO/tests/AMI/client.cpp +++ b/TAO/tests/AMI/client.cpp @@ -22,7 +22,7 @@ ACE_RCSID (AMI, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 5; int niterations = 5; int debug = 0; diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp index fd87294b2fe..0bc0bcd299e 100644 --- a/TAO/tests/AMI/simple_client.cpp +++ b/TAO/tests/AMI/simple_client.cpp @@ -23,7 +23,7 @@ ACE_RCSID (AMI, simple_client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 5; int shutdown_flag = 0; int debug = 0; diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp index f7f1912ba20..ca116476ba1 100644 --- a/TAO/tests/AMI_Buffering/admin.cpp +++ b/TAO/tests/AMI_Buffering/admin.cpp @@ -6,7 +6,7 @@ ACE_RCSID(AMI_Buffering, admin, "$Id$") -const char *ior_output_file = "admin.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("admin.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/AMI_Buffering/server.cpp b/TAO/tests/AMI_Buffering/server.cpp index a65a50f6742..8c0968041f2 100644 --- a/TAO/tests/AMI_Buffering/server.cpp +++ b/TAO/tests/AMI_Buffering/server.cpp @@ -6,8 +6,8 @@ ACE_RCSID(AMI_Buffering, server, "$Id$") -const char *ior_output_file = "server.ior"; -const char *ior = "file://admin.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); +const ACE_TCHAR *ior = ACE_TEXT("file://admin.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp index 1293519147e..d5d603c56a3 100644 --- a/TAO/tests/AMI_Timeouts/client.cpp +++ b/TAO/tests/AMI_Timeouts/client.cpp @@ -23,7 +23,7 @@ ACE_RCSID (AMI, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); unsigned int msec = 50; int diff --git a/TAO/tests/Abstract_Interface/server.cpp b/TAO/tests/Abstract_Interface/server.cpp index ef9979248e2..8c9694c6e3d 100644 --- a/TAO/tests/Abstract_Interface/server.cpp +++ b/TAO/tests/Abstract_Interface/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Abstract_Interface, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Any/Recursive/server.cpp b/TAO/tests/Any/Recursive/server.cpp index 83f432d885f..c1d8bd1bb30 100644 --- a/TAO/tests/Any/Recursive/server.cpp +++ b/TAO/tests/Any/Recursive/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Hello, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp index 520a677b15c..5700be91119 100644 --- a/TAO/tests/BiDirectional/client.cpp +++ b/TAO/tests/BiDirectional/client.cpp @@ -7,7 +7,7 @@ ACE_RCSID(BiDirectional, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); void do_nothing (void) { diff --git a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp index 74d49a519b6..b4c5a02646f 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp @@ -8,7 +8,7 @@ ACE_RCSID(BiDirectional, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); void do_nothing (void) { diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp index b3736004ea4..0eddda7dce9 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp @@ -8,7 +8,7 @@ ACE_RCSID(BiDirectional, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); void do_nothing (void) { diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp index 22f55d52df9..118f15017ee 100644 --- a/TAO/tests/Big_AMI/client.cpp +++ b/TAO/tests/Big_AMI/client.cpp @@ -22,7 +22,7 @@ ACE_RCSID (AMI, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 5; int shutdown_flag = 0; int debug = 1; diff --git a/TAO/tests/Big_Oneways/client.cpp b/TAO/tests/Big_Oneways/client.cpp index 761c8e73401..144048ee7c8 100644 --- a/TAO/tests/Big_Oneways/client.cpp +++ b/TAO/tests/Big_Oneways/client.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Big_Oneways, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp index 1c3ae4b7b99..5930ef0261a 100644 --- a/TAO/tests/Big_Oneways/server.cpp +++ b/TAO/tests/Big_Oneways/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID(Big_Oneways, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); CORBA::ULong peer_count = 4; CORBA::ULong payload_size = 1024; CORBA::ULong message_count = 1000; diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp index 3326e04b347..9f622701950 100644 --- a/TAO/tests/Big_Reply/server.cpp +++ b/TAO/tests/Big_Reply/server.cpp @@ -7,7 +7,7 @@ ACE_RCSID(Big_Reply, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); // We can change this value if wanted.. const CORBA::ULong data_size = 4000000; diff --git a/TAO/tests/Big_Request_Muxing/client.cpp b/TAO/tests/Big_Request_Muxing/client.cpp index 80525298251..3056acf2311 100644 --- a/TAO/tests/Big_Request_Muxing/client.cpp +++ b/TAO/tests/Big_Request_Muxing/client.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Muxing, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); namespace { diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp index c3e3451bd46..1385daa30ad 100644 --- a/TAO/tests/Big_Request_Muxing/server.cpp +++ b/TAO/tests/Big_Request_Muxing/server.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Big_Request_Muxing, server, "$Id$") namespace { // defaults only - const char *ior_output_file = "test.ior"; + const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int expected = 200; int maybe_lost = 400; } diff --git a/TAO/tests/Big_Twoways/client.cpp b/TAO/tests/Big_Twoways/client.cpp index 761c8e73401..144048ee7c8 100644 --- a/TAO/tests/Big_Twoways/client.cpp +++ b/TAO/tests/Big_Twoways/client.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Big_Oneways, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp index 993199180c5..88fa53c56a0 100644 --- a/TAO/tests/Big_Twoways/server.cpp +++ b/TAO/tests/Big_Twoways/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID(Big_Oneways, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); CORBA::ULong peer_count = 4; CORBA::ULong payload_size = 1024; CORBA::ULong message_count = 1000; diff --git a/TAO/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp index d962228de9c..1074d45fd53 100644 --- a/TAO/tests/Blocking_Sync_None/client.cpp +++ b/TAO/tests/Blocking_Sync_None/client.cpp @@ -8,7 +8,7 @@ ACE_RCSID(Blocking_Sync_None, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int iterations = 1000; int diff --git a/TAO/tests/Blocking_Sync_None/server.cpp b/TAO/tests/Blocking_Sync_None/server.cpp index 3e4e368a590..0ecb13b82fa 100644 --- a/TAO/tests/Blocking_Sync_None/server.cpp +++ b/TAO/tests/Blocking_Sync_None/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Blocking_Sync_None, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_1020_Basic_Regression/client.cpp b/TAO/tests/Bug_1020_Basic_Regression/client.cpp index 7787efcad58..0aa79ea4446 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/client.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/client.cpp @@ -11,7 +11,7 @@ ACE_RCSID (Bug_1020_Basic_Regression, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_1020_Basic_Regression/server.cpp b/TAO/tests/Bug_1020_Basic_Regression/server.cpp index a8bae61f07f..393cc836e81 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/server.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Bug_1020_Basic_Regression, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_1020_Regression/client.cpp b/TAO/tests/Bug_1020_Regression/client.cpp index d73faa86f22..e3096eb4c3b 100644 --- a/TAO/tests/Bug_1020_Regression/client.cpp +++ b/TAO/tests/Bug_1020_Regression/client.cpp @@ -11,7 +11,7 @@ ACE_RCSID(Bug_1230_Regression, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/Bug_1020_Regression/server.cpp b/TAO/tests/Bug_1020_Regression/server.cpp index bfcaef3fa2b..c668c137df4 100644 --- a/TAO/tests/Bug_1020_Regression/server.cpp +++ b/TAO/tests/Bug_1020_Regression/server.cpp @@ -11,7 +11,7 @@ ACE_RCSID (Bug_1230_Regression, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); #if defined (ACE_OPENVMS) // need this to circumvent link error on OpenVMS diff --git a/TAO/tests/Bug_1269_Regression/client.cpp b/TAO/tests/Bug_1269_Regression/client.cpp index f5260939a9a..5e0fa18b87c 100644 --- a/TAO/tests/Bug_1269_Regression/client.cpp +++ b/TAO/tests/Bug_1269_Regression/client.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Bug_1269_Regression, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/Bug_1269_Regression/server.cpp b/TAO/tests/Bug_1269_Regression/server.cpp index b0f809eff14..f1b41aeb66f 100644 --- a/TAO/tests/Bug_1269_Regression/server.cpp +++ b/TAO/tests/Bug_1269_Regression/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID(Bug_1269_Regression, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/Bug_1269_Regression/shutdown.cpp b/TAO/tests/Bug_1269_Regression/shutdown.cpp index 3d6e2635c8e..7c1a549bec8 100644 --- a/TAO/tests/Bug_1269_Regression/shutdown.cpp +++ b/TAO/tests/Bug_1269_Regression/shutdown.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Bug_1269_Regression, shutdown, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/Bug_1270_Regression/client.cpp b/TAO/tests/Bug_1270_Regression/client.cpp index b0b819e28fb..e58db268837 100644 --- a/TAO/tests/Bug_1270_Regression/client.cpp +++ b/TAO/tests/Bug_1270_Regression/client.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Bug_1270_Regression, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/Bug_1270_Regression/server.cpp b/TAO/tests/Bug_1270_Regression/server.cpp index af86410f7b6..fdacca6ce3d 100644 --- a/TAO/tests/Bug_1270_Regression/server.cpp +++ b/TAO/tests/Bug_1270_Regression/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID(Bug_1270_Regression, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/Bug_1270_Regression/shutdown.cpp b/TAO/tests/Bug_1270_Regression/shutdown.cpp index 44d96b0e8f1..893d0e85ba4 100644 --- a/TAO/tests/Bug_1270_Regression/shutdown.cpp +++ b/TAO/tests/Bug_1270_Regression/shutdown.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Bug_1270_Regression, shutdown, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/Bug_1330_Regression/client.cpp b/TAO/tests/Bug_1330_Regression/client.cpp index 53102d0d5d6..d29f072a754 100644 --- a/TAO/tests/Bug_1330_Regression/client.cpp +++ b/TAO/tests/Bug_1330_Regression/client.cpp @@ -4,7 +4,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" -const char *ior = "corbaloc:iiop:localhost:12345/Name\\2dwith\\2dhyphens"; +const ACE_TCHAR *ior = ACE_TEXT("corbaloc:iiop:localhost:12345/Name\\2dwith\\2dhyphens"); int shutdown_server = 0; int diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp index 874c4da1cb8..d98e338af63 100644 --- a/TAO/tests/Bug_1361_Regression/client.cpp +++ b/TAO/tests/Bug_1361_Regression/client.cpp @@ -11,7 +11,7 @@ ACE_RCSID(Bug_1270_Regression, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int serverthreads = 4; int diff --git a/TAO/tests/Bug_1361_Regression/server.cpp b/TAO/tests/Bug_1361_Regression/server.cpp index 02d7193664f..9f4a08a877d 100644 --- a/TAO/tests/Bug_1361_Regression/server.cpp +++ b/TAO/tests/Bug_1361_Regression/server.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Bug_1270_Regression, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp index 32484211b0c..d4c8e2320bb 100644 --- a/TAO/tests/Bug_1361_Regression/shutdown.cpp +++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp @@ -16,7 +16,7 @@ ACE_RCSID(Bug_1361_Regression, shutdown, "$Id$") ACE_Time_Value dum = ACE_Time_Value::zero; #endif -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/Bug_1476_Regression/client.cpp b/TAO/tests/Bug_1476_Regression/client.cpp index a4e722edb4c..e285a9b0ebf 100644 --- a/TAO/tests/Bug_1476_Regression/client.cpp +++ b/TAO/tests/Bug_1476_Regression/client.cpp @@ -13,7 +13,7 @@ ACE_RCSID(Bug_1476_Regression, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int number_of_oneways = 10; int number_of_client_tasks = 2; diff --git a/TAO/tests/Bug_1476_Regression/server.cpp b/TAO/tests/Bug_1476_Regression/server.cpp index 1f9f5e92cb3..5045536c573 100644 --- a/TAO/tests/Bug_1476_Regression/server.cpp +++ b/TAO/tests/Bug_1476_Regression/server.cpp @@ -7,7 +7,7 @@ ACE_RCSID(Oneways_Invoking_Twoways, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int number_of_oneways = 10; int diff --git a/TAO/tests/Bug_1476_Test/client.cpp b/TAO/tests/Bug_1476_Test/client.cpp index f3efc66bb08..d5569867bcf 100644 --- a/TAO/tests/Bug_1476_Test/client.cpp +++ b/TAO/tests/Bug_1476_Test/client.cpp @@ -16,7 +16,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); bool level_obj = false; bool level_thread = false; bool level_orb = false; diff --git a/TAO/tests/Bug_1482_Regression/client.cpp b/TAO/tests/Bug_1482_Regression/client.cpp index 420f208cea3..bfec4f1e8e9 100644 --- a/TAO/tests/Bug_1482_Regression/client.cpp +++ b/TAO/tests/Bug_1482_Regression/client.cpp @@ -7,7 +7,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_1482_Regression/server.cpp b/TAO/tests/Bug_1482_Regression/server.cpp index e4dc6e90079..ab25832e277 100644 --- a/TAO/tests/Bug_1482_Regression/server.cpp +++ b/TAO/tests/Bug_1482_Regression/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (LongUpcall_Crash_Test, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp index b38d443fccb..95c31b415ec 100644 --- a/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp +++ b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp @@ -23,8 +23,8 @@ #include "ace/Argv_Type_Converter.h" #include "ace/Manual_Event.h" -const char *ior_input_file = "file://test.ior"; -const char *ior_output_file = "thr_server.ior"; +const ACE_TCHAR *ior_input_file = ACE_TEXT("file://test.ior"); +const ACE_TCHAR *ior_output_file = ACE_TEXT("thr_server.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp index 3c396c9d58b..fcc8fc7449b 100644 --- a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp +++ b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp @@ -11,8 +11,8 @@ ACE_RCSID (Service_Context_Manipulation, server, "$Id$" ) -const char *ior_output_file = "test.ior"; -const char *ior_input_file = "file://thr_server.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); +const ACE_TCHAR *ior_input_file = ACE_TEXT("file://thr_server.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_1551_Regression/client.cpp b/TAO/tests/Bug_1551_Regression/client.cpp index a15d8fe5c12..d604a62dd60 100644 --- a/TAO/tests/Bug_1551_Regression/client.cpp +++ b/TAO/tests/Bug_1551_Regression/client.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 1; diff --git a/TAO/tests/Bug_1551_Regression/server.cpp b/TAO/tests/Bug_1551_Regression/server.cpp index acb5647ebdd..1c0df51aaf9 100644 --- a/TAO/tests/Bug_1551_Regression/server.cpp +++ b/TAO/tests/Bug_1551_Regression/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Bug_1XXX_Regression, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); bool simulate_crashes = true; diff --git a/TAO/tests/Bug_1568_Regression/client.cpp b/TAO/tests/Bug_1568_Regression/client.cpp index f79a16a2879..7aa1287510a 100644 --- a/TAO/tests/Bug_1568_Regression/client.cpp +++ b/TAO/tests/Bug_1568_Regression/client.cpp @@ -12,7 +12,7 @@ ACE_RCSID(Bug_1568_Regression, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_1568_Regression/server.cpp b/TAO/tests/Bug_1568_Regression/server.cpp index 5d08df9020b..03c2ad349f6 100644 --- a/TAO/tests/Bug_1568_Regression/server.cpp +++ b/TAO/tests/Bug_1568_Regression/server.cpp @@ -77,7 +77,7 @@ Simple_C::shutdown (Baz::AMH_CResponseHandler_ptr) // **************************************************************** -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_1627_Regression/client.cpp b/TAO/tests/Bug_1627_Regression/client.cpp index 53102d0d5d6..d29f072a754 100644 --- a/TAO/tests/Bug_1627_Regression/client.cpp +++ b/TAO/tests/Bug_1627_Regression/client.cpp @@ -4,7 +4,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" -const char *ior = "corbaloc:iiop:localhost:12345/Name\\2dwith\\2dhyphens"; +const ACE_TCHAR *ior = ACE_TEXT("corbaloc:iiop:localhost:12345/Name\\2dwith\\2dhyphens"); int shutdown_server = 0; int diff --git a/TAO/tests/Bug_1670_Regression/client.cpp b/TAO/tests/Bug_1670_Regression/client.cpp index 6bb67176f8e..d4e7029ae21 100644 --- a/TAO/tests/Bug_1670_Regression/client.cpp +++ b/TAO/tests/Bug_1670_Regression/client.cpp @@ -12,7 +12,7 @@ ACE_RCSID(Bug_1670_Regression, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_1670_Regression/server.cpp b/TAO/tests/Bug_1670_Regression/server.cpp index 32127285a58..6062d01fc6f 100644 --- a/TAO/tests/Bug_1670_Regression/server.cpp +++ b/TAO/tests/Bug_1670_Regression/server.cpp @@ -79,7 +79,7 @@ Simple_C::op4( // **************************************************************** -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_1676_Regression/client.cpp b/TAO/tests/Bug_1676_Regression/client.cpp index e531b3e17c5..f5878bdff9a 100644 --- a/TAO/tests/Bug_1676_Regression/client.cpp +++ b/TAO/tests/Bug_1676_Regression/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_1676_Regression/server.cpp b/TAO/tests/Bug_1676_Regression/server.cpp index 83f432d885f..c1d8bd1bb30 100644 --- a/TAO/tests/Bug_1676_Regression/server.cpp +++ b/TAO/tests/Bug_1676_Regression/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Hello, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2183_Regression/client.cpp b/TAO/tests/Bug_2183_Regression/client.cpp index a752d409d73..53a030e4803 100644 --- a/TAO/tests/Bug_2183_Regression/client.cpp +++ b/TAO/tests/Bug_2183_Regression/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Hello, client, "client.cpp,v 1.5 2002/01/29 20:21:07 okellogg Exp") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2183_Regression/server.cpp b/TAO/tests/Bug_2183_Regression/server.cpp index c467265216c..a2c3e497ce9 100644 --- a/TAO/tests/Bug_2183_Regression/server.cpp +++ b/TAO/tests/Bug_2183_Regression/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID (Hello, server, "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2186_Regression/client.cpp b/TAO/tests/Bug_2186_Regression/client.cpp index fd8edd2d987..0a7bf2c3a8f 100644 --- a/TAO/tests/Bug_2186_Regression/client.cpp +++ b/TAO/tests/Bug_2186_Regression/client.cpp @@ -7,7 +7,7 @@ ACE_RCSID(Hello, client, "$Id$") const char *server_ior = "file://server.ior"; -const char *ior_output_file = "client.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("client.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2186_Regression/server.cpp b/TAO/tests/Bug_2186_Regression/server.cpp index 2f14cc443c9..8d8913374e1 100644 --- a/TAO/tests/Bug_2186_Regression/server.cpp +++ b/TAO/tests/Bug_2186_Regression/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Hello, server, "$Id$") -const char *ior_output_file = "server.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2188_Regression/client.cpp b/TAO/tests/Bug_2188_Regression/client.cpp index 03bd557cadb..5ecfb0bd592 100644 --- a/TAO/tests/Bug_2188_Regression/client.cpp +++ b/TAO/tests/Bug_2188_Regression/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://broken.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://broken.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2188_Regression/server.cpp b/TAO/tests/Bug_2188_Regression/server.cpp index 30a08b6efe2..28f7154e1d8 100644 --- a/TAO/tests/Bug_2188_Regression/server.cpp +++ b/TAO/tests/Bug_2188_Regression/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Hello, server, "$Id$") -const char *ior_output_file = "broken.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("broken.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2289_Regression/client.cpp b/TAO/tests/Bug_2289_Regression/client.cpp index b00d20d4e7e..71ea24a05d9 100644 --- a/TAO/tests/Bug_2289_Regression/client.cpp +++ b/TAO/tests/Bug_2289_Regression/client.cpp @@ -8,7 +8,7 @@ const char *server_ior = ""; -const char *ior_output_file = "client.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("client.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2289_Regression/server.cpp b/TAO/tests/Bug_2289_Regression/server.cpp index 59d5348a534..4f4aa96224a 100644 --- a/TAO/tests/Bug_2289_Regression/server.cpp +++ b/TAO/tests/Bug_2289_Regression/server.cpp @@ -12,7 +12,7 @@ ACE_RCSID (Hello, server, "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp") -const char *ior_output_file = "server.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); const char *client_ior = "file://client.ior"; diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp index 537b653afd3..099158acbad 100644 --- a/TAO/tests/Bug_2319_Regression/server.cpp +++ b/TAO/tests/Bug_2319_Regression/server.cpp @@ -15,8 +15,8 @@ const int sleep_time = 1; // sleep for 1 sec on each call // This should equal num_calls within 'sleep * num_calls' seconds int calls_received = 0; -const char *ior = "file://test.ior"; -const char *ior_file = "test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); +const ACE_TCHAR *ior_file = ACE_TEXT("test.ior"); diff --git a/TAO/tests/Bug_2328_Regression/client.cpp b/TAO/tests/Bug_2328_Regression/client.cpp index 5c838dfa3fa..9c2a7cf6359 100644 --- a/TAO/tests/Bug_2328_Regression/client.cpp +++ b/TAO/tests/Bug_2328_Regression/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2328_Regression/server.cpp b/TAO/tests/Bug_2328_Regression/server.cpp index f8d0dac5136..aa9d398a0f0 100644 --- a/TAO/tests/Bug_2328_Regression/server.cpp +++ b/TAO/tests/Bug_2328_Regression/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID (Hello, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2356_Regression/client.cpp b/TAO/tests/Bug_2356_Regression/client.cpp index 9af3bf2d94f..fa9cba5e72b 100644 --- a/TAO/tests/Bug_2356_Regression/client.cpp +++ b/TAO/tests/Bug_2356_Regression/client.cpp @@ -23,7 +23,7 @@ ACE_RCSID (AMI, simple_client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 5; int shutdown_flag = 1; int debug = 0; diff --git a/TAO/tests/Bug_2429_Regression/server.cpp b/TAO/tests/Bug_2429_Regression/server.cpp index af1a67b06ea..ee2d5584aa3 100644 --- a/TAO/tests/Bug_2429_Regression/server.cpp +++ b/TAO/tests/Bug_2429_Regression/server.cpp @@ -3,7 +3,7 @@ #include "ace/OS_NS_stdio.h" #include "ChildServant.h" -const char *ior_output_file = "server.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2494_Regression/client.cpp b/TAO/tests/Bug_2494_Regression/client.cpp index 572cfaea6ea..2dd48c135ec 100644 --- a/TAO/tests/Bug_2494_Regression/client.cpp +++ b/TAO/tests/Bug_2494_Regression/client.cpp @@ -7,7 +7,7 @@ ACE_RCSID(Bug_2494_Regression, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 5; int do_shutdown = 0; diff --git a/TAO/tests/Bug_2494_Regression/server.cpp b/TAO/tests/Bug_2494_Regression/server.cpp index b986bab2685..6b3493f5177 100644 --- a/TAO/tests/Bug_2494_Regression/server.cpp +++ b/TAO/tests/Bug_2494_Regression/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Bug_2494_Regression, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int nthreads = 4; int diff --git a/TAO/tests/Bug_2503_Regression/client.cpp b/TAO/tests/Bug_2503_Regression/client.cpp index a0d140552cc..1d0919e9488 100644 --- a/TAO/tests/Bug_2503_Regression/client.cpp +++ b/TAO/tests/Bug_2503_Regression/client.cpp @@ -35,7 +35,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 0; } -const char *ior_argument = "file://test.ior"; +const ACE_TCHAR *ior_argument = ACE_TEXT("file://test.ior"); int niterations = 100; void diff --git a/TAO/tests/Bug_2503_Regression/server.cpp b/TAO/tests/Bug_2503_Regression/server.cpp index fcbbe6bd1c3..a21f2e493e3 100644 --- a/TAO/tests/Bug_2503_Regression/server.cpp +++ b/TAO/tests/Bug_2503_Regression/server.cpp @@ -44,7 +44,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) namespace { -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); } void diff --git a/TAO/tests/Bug_2593_Regression/client.cpp b/TAO/tests/Bug_2593_Regression/client.cpp index d03dd808d55..eda230d142e 100644 --- a/TAO/tests/Bug_2593_Regression/client.cpp +++ b/TAO/tests/Bug_2593_Regression/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2593_Regression/server.cpp b/TAO/tests/Bug_2593_Regression/server.cpp index dc276c410d1..70d1438f4d3 100644 --- a/TAO/tests/Bug_2593_Regression/server.cpp +++ b/TAO/tests/Bug_2593_Regression/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Hello, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2595_Regression/client.cpp b/TAO/tests/Bug_2595_Regression/client.cpp index 24598c1feae..f75ce5ac238 100644 --- a/TAO/tests/Bug_2595_Regression/client.cpp +++ b/TAO/tests/Bug_2595_Regression/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2595_Regression/server.cpp b/TAO/tests/Bug_2595_Regression/server.cpp index 83f432d885f..c1d8bd1bb30 100644 --- a/TAO/tests/Bug_2595_Regression/server.cpp +++ b/TAO/tests/Bug_2595_Regression/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Hello, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp index 5d90a1da724..2657001e5b4 100644 --- a/TAO/tests/Bug_2654_Regression/client.cpp +++ b/TAO/tests/Bug_2654_Regression/client.cpp @@ -22,7 +22,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); class Callback_i : public POA_Test::CallBack { diff --git a/TAO/tests/Bug_2654_Regression/server.cpp b/TAO/tests/Bug_2654_Regression/server.cpp index e4de324bab9..c53dd9b14f0 100644 --- a/TAO/tests/Bug_2654_Regression/server.cpp +++ b/TAO/tests/Bug_2654_Regression/server.cpp @@ -10,7 +10,7 @@ ACE_RCSID (Hello, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2678_Regression/client.cpp b/TAO/tests/Bug_2678_Regression/client.cpp index 6d5adb37acb..c0cc27d346e 100644 --- a/TAO/tests/Bug_2678_Regression/client.cpp +++ b/TAO/tests/Bug_2678_Regression/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2678_Regression/server.cpp b/TAO/tests/Bug_2678_Regression/server.cpp index 91d4c7be68a..8557723d402 100644 --- a/TAO/tests/Bug_2678_Regression/server.cpp +++ b/TAO/tests/Bug_2678_Regression/server.cpp @@ -2,7 +2,7 @@ #include "testS.h" -const char *ior_output_file = "server.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); class Test_impl : public virtual POA_Test { diff --git a/TAO/tests/Bug_2683_Regression/server.cpp b/TAO/tests/Bug_2683_Regression/server.cpp index 2edb3107881..cb81306c4c1 100644 --- a/TAO/tests/Bug_2683_Regression/server.cpp +++ b/TAO/tests/Bug_2683_Regression/server.cpp @@ -40,7 +40,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) try { int nthreads = 10; - const char *ior_file = "test.ior"; + const ACE_TCHAR *ior_file = ACE_TEXT("test.ior"); bool endpoint_found = false; for (int i = 0; i < argc; i++) { diff --git a/TAO/tests/Bug_2702_Regression/client.cpp b/TAO/tests/Bug_2702_Regression/client.cpp index 5d787ede8f2..a874800e5a5 100644 --- a/TAO/tests/Bug_2702_Regression/client.cpp +++ b/TAO/tests/Bug_2702_Regression/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2768_Regression/server.cpp b/TAO/tests/Bug_2768_Regression/server.cpp index 8342e8f3dfe..043795d9b7f 100644 --- a/TAO/tests/Bug_2768_Regression/server.cpp +++ b/TAO/tests/Bug_2768_Regression/server.cpp @@ -3,7 +3,7 @@ #include "tao/IORTable/IORTable.h" #include "Messenger_i.h" -const char *ior_output_file = "server.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/TAO/tests/Bug_2804_Regression/server.cpp b/TAO/tests/Bug_2804_Regression/server.cpp index 83f432d885f..c1d8bd1bb30 100644 --- a/TAO/tests/Bug_2804_Regression/server.cpp +++ b/TAO/tests/Bug_2804_Regression/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Hello, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2805_Regression/client.cpp b/TAO/tests/Bug_2805_Regression/client.cpp index 807effbe3a1..d3ac82d9198 100644 --- a/TAO/tests/Bug_2805_Regression/client.cpp +++ b/TAO/tests/Bug_2805_Regression/client.cpp @@ -24,7 +24,7 @@ ACE_RCSID (AMI, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 5; int niterations = 5; int debug = 0; diff --git a/TAO/tests/Bug_2844_Regression/server.cpp b/TAO/tests/Bug_2844_Regression/server.cpp index 83f432d885f..c1d8bd1bb30 100644 --- a/TAO/tests/Bug_2844_Regression/server.cpp +++ b/TAO/tests/Bug_2844_Regression/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Hello, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2869_Regression/client.cpp b/TAO/tests/Bug_2869_Regression/client.cpp index 1ad99ae9e39..7df9240478f 100644 --- a/TAO/tests/Bug_2869_Regression/client.cpp +++ b/TAO/tests/Bug_2869_Regression/client.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Bug_2869_Regression, client, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2909_Regression/client.cpp b/TAO/tests/Bug_2909_Regression/client.cpp index e88ca78250e..9cabdb20896 100644 --- a/TAO/tests/Bug_2909_Regression/client.cpp +++ b/TAO/tests/Bug_2909_Regression/client.cpp @@ -23,7 +23,7 @@ ACE_RCSID (AMI, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 1; int niterations = 2; int debug = 0; diff --git a/TAO/tests/Bug_2918_Regression/server.cpp b/TAO/tests/Bug_2918_Regression/server.cpp index 83f432d885f..c1d8bd1bb30 100644 --- a/TAO/tests/Bug_2918_Regression/server.cpp +++ b/TAO/tests/Bug_2918_Regression/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Hello, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2966_Regression/client.cpp b/TAO/tests/Bug_2966_Regression/client.cpp index 0602f36cd21..73c63baa4cb 100644 --- a/TAO/tests/Bug_2966_Regression/client.cpp +++ b/TAO/tests/Bug_2966_Regression/client.cpp @@ -8,7 +8,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_2966_Regression/server.cpp b/TAO/tests/Bug_2966_Regression/server.cpp index d7400656de7..8dc401a83ab 100644 --- a/TAO/tests/Bug_2966_Regression/server.cpp +++ b/TAO/tests/Bug_2966_Regression/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Hello, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_3000_Regression/client.cpp b/TAO/tests/Bug_3000_Regression/client.cpp index 500e0a4dbc9..66df617c9e5 100644 --- a/TAO/tests/Bug_3000_Regression/client.cpp +++ b/TAO/tests/Bug_3000_Regression/client.cpp @@ -8,7 +8,7 @@ ACE_RCSID(Crashed_Callback, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); bool shutdown_server = false; int diff --git a/TAO/tests/Bug_3000_Regression/server.cpp b/TAO/tests/Bug_3000_Regression/server.cpp index 35d41fc3e9f..45342dcb539 100644 --- a/TAO/tests/Bug_3000_Regression/server.cpp +++ b/TAO/tests/Bug_3000_Regression/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Crashed_Callback, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_3068_Regression/client.cpp b/TAO/tests/Bug_3068_Regression/client.cpp index 36ce6d9645e..0b687c60f86 100644 --- a/TAO/tests/Bug_3068_Regression/client.cpp +++ b/TAO/tests/Bug_3068_Regression/client.cpp @@ -10,7 +10,7 @@ ACE_RCSID (Bug_3068_Regression, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_3108_Regression/client.cpp b/TAO/tests/Bug_3108_Regression/client.cpp index 5b9bc415219..d1ef852bb60 100644 --- a/TAO/tests/Bug_3108_Regression/client.cpp +++ b/TAO/tests/Bug_3108_Regression/client.cpp @@ -4,7 +4,7 @@ #include "ace/Task.h" #include "ace/Get_Opt.h" -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); test_var global_client; int iterations = 100; diff --git a/TAO/tests/Bug_3108_Regression/server.cpp b/TAO/tests/Bug_3108_Regression/server.cpp index df530c08c40..dd6f368ff78 100644 --- a/TAO/tests/Bug_3108_Regression/server.cpp +++ b/TAO/tests/Bug_3108_Regression/server.cpp @@ -4,7 +4,7 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_3163_Regression/client.cpp b/TAO/tests/Bug_3163_Regression/client.cpp index 65e9608c820..1517d590490 100644 --- a/TAO/tests/Bug_3163_Regression/client.cpp +++ b/TAO/tests/Bug_3163_Regression/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int message_size = 0; int diff --git a/TAO/tests/Bug_3299_Regression/client.cpp b/TAO/tests/Bug_3299_Regression/client.cpp index cabfc8f57de..8bdd038f303 100644 --- a/TAO/tests/Bug_3299_Regression/client.cpp +++ b/TAO/tests/Bug_3299_Regression/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_3299_Regression/server.cpp b/TAO/tests/Bug_3299_Regression/server.cpp index 867c98f6a88..de1fb401895 100644 --- a/TAO/tests/Bug_3299_Regression/server.cpp +++ b/TAO/tests/Bug_3299_Regression/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID (Hello, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Bug_933_Regression/MessengerServer.cpp b/TAO/tests/Bug_933_Regression/MessengerServer.cpp index 617777404c5..9ef94725a04 100644 --- a/TAO/tests/Bug_933_Regression/MessengerServer.cpp +++ b/TAO/tests/Bug_933_Regression/MessengerServer.cpp @@ -2,7 +2,7 @@ #include "Messenger_i.h" -const char *ior_output_file = "Messenger.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("Messenger.ior"); int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp index d03dd808d55..eda230d142e 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Cache_Growth_Test/client.cpp b/TAO/tests/Cache_Growth_Test/client.cpp index 3a2bdc34779..4db989585ac 100644 --- a/TAO/tests/Cache_Growth_Test/client.cpp +++ b/TAO/tests/Cache_Growth_Test/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int do_shutdown = 0; int diff --git a/TAO/tests/Cache_Growth_Test/server.cpp b/TAO/tests/Cache_Growth_Test/server.cpp index 3a9f078488c..ae19465711c 100644 --- a/TAO/tests/Cache_Growth_Test/server.cpp +++ b/TAO/tests/Cache_Growth_Test/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Hello, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/CallbackTest/client.cpp b/TAO/tests/CallbackTest/client.cpp index e6a2b200c17..c04ed420cfc 100644 --- a/TAO/tests/CallbackTest/client.cpp +++ b/TAO/tests/CallbackTest/client.cpp @@ -8,7 +8,7 @@ ACE_RCSID(Crashed_Callback, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/CallbackTest/server.cpp b/TAO/tests/CallbackTest/server.cpp index a6508c99c24..c96cf1c553c 100644 --- a/TAO/tests/CallbackTest/server.cpp +++ b/TAO/tests/CallbackTest/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Crashed_Callback, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Client_Leaks/server.cpp b/TAO/tests/Client_Leaks/server.cpp index d90aeb7e376..d2bd06b7e79 100644 --- a/TAO/tests/Client_Leaks/server.cpp +++ b/TAO/tests/Client_Leaks/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Client_Leaks, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Connect_Strategy_Test/client.cpp b/TAO/tests/Connect_Strategy_Test/client.cpp index d2ee7e0fa87..7ac6e513711 100644 --- a/TAO/tests/Connect_Strategy_Test/client.cpp +++ b/TAO/tests/Connect_Strategy_Test/client.cpp @@ -7,7 +7,7 @@ ACE_RCSID(Connect_Strategy_Test, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int do_shutdown = 0; int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Connect_Strategy_Test/server.cpp b/TAO/tests/Connect_Strategy_Test/server.cpp index 1e9ad50ed1f..701f036d466 100644 --- a/TAO/tests/Connect_Strategy_Test/server.cpp +++ b/TAO/tests/Connect_Strategy_Test/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Connect_Strategy_Test, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Connection_Purging/client.cpp b/TAO/tests/Connection_Purging/client.cpp index d9715fa60a4..95331c7b583 100644 --- a/TAO/tests/Connection_Purging/client.cpp +++ b/TAO/tests/Connection_Purging/client.cpp @@ -5,7 +5,7 @@ #include "ace/OS_NS_unistd.h" #include "tao/Strategies/advanced_resource.h" -const char *ior = "server.ior"; +const ACE_TCHAR *ior = ACE_TEXT("server.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Connection_Purging/server.cpp b/TAO/tests/Connection_Purging/server.cpp index 7e818d46bd6..37e1db87cb3 100644 --- a/TAO/tests/Connection_Purging/server.cpp +++ b/TAO/tests/Connection_Purging/server.cpp @@ -4,7 +4,7 @@ #include "ace/Get_Opt.h" #include "tao/Strategies/advanced_resource.h" -const char *ior_output_file = "server.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Crash_On_Write/client.cpp b/TAO/tests/Crash_On_Write/client.cpp index 9ffdaab8162..3e8c2690e68 100644 --- a/TAO/tests/Crash_On_Write/client.cpp +++ b/TAO/tests/Crash_On_Write/client.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Crash_On_Write, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int iterations = 2000; int diff --git a/TAO/tests/Crash_On_Write/server.cpp b/TAO/tests/Crash_On_Write/server.cpp index f3015b102a1..5aa34a88ae3 100644 --- a/TAO/tests/Crash_On_Write/server.cpp +++ b/TAO/tests/Crash_On_Write/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Crash_On_Write, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp index 38a10dba55b..3530be3caba 100644 --- a/TAO/tests/Crashed_Callback/client.cpp +++ b/TAO/tests/Crashed_Callback/client.cpp @@ -8,7 +8,7 @@ ACE_RCSID(Crashed_Callback, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp index 92453165d1b..107e83b1b12 100644 --- a/TAO/tests/Crashed_Callback/server.cpp +++ b/TAO/tests/Crashed_Callback/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Crashed_Callback, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/DII_AMI_Forward/client.cpp b/TAO/tests/DII_AMI_Forward/client.cpp index d88158e631d..8dd98375a18 100644 --- a/TAO/tests/DII_AMI_Forward/client.cpp +++ b/TAO/tests/DII_AMI_Forward/client.cpp @@ -15,7 +15,7 @@ #include "tao/PortableServer/POAC.h" #include "tao/PortableServer/POAManagerC.h" -const char *ior = "file://server.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://server.ior"); int do_shutdown = 0; diff --git a/TAO/tests/DII_AMI_Forward/server.cpp b/TAO/tests/DII_AMI_Forward/server.cpp index ef713d53824..dbdb20255ad 100644 --- a/TAO/tests/DII_AMI_Forward/server.cpp +++ b/TAO/tests/DII_AMI_Forward/server.cpp @@ -12,7 +12,7 @@ #include "orb_initializer.h" #include "tao/ORBInitializer_Registry.h" -const char *ior_filename = "server.ior"; +const ACE_TCHAR *ior_filename = ACE_TEXT("server.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/DIOP/client.cpp b/TAO/tests/DIOP/client.cpp index ce855e435f8..84cb42d671d 100644 --- a/TAO/tests/DIOP/client.cpp +++ b/TAO/tests/DIOP/client.cpp @@ -32,7 +32,7 @@ ACE_RCSID(AMI, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); unsigned int msec = 500; unsigned int iterations = 1; diff --git a/TAO/tests/DIOP/server.cpp b/TAO/tests/DIOP/server.cpp index a3cd7295325..b25e1823539 100644 --- a/TAO/tests/DIOP/server.cpp +++ b/TAO/tests/DIOP/server.cpp @@ -29,7 +29,7 @@ ACE_RCSID(AMI, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp index 72c11c6867a..6ad4387702b 100644 --- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp @@ -11,7 +11,7 @@ ACE_RCSID (DLL_ORB, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp index 303943ba7e4..2840db80254 100644 --- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp @@ -13,7 +13,7 @@ ACE_RCSID (DLL_ORB, #include "ace/Get_Opt.h" -const char *ior_file = "test.ior"; +const ACE_TCHAR *ior_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/DSI_AMH/client.cpp b/TAO/tests/DSI_AMH/client.cpp index 3bd40bcdf73..77a0d4f54cd 100644 --- a/TAO/tests/DSI_AMH/client.cpp +++ b/TAO/tests/DSI_AMH/client.cpp @@ -5,7 +5,7 @@ #include "ace/High_Res_Timer.h" #include "tao/debug.h" -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 100; int do_shutdown = 1; diff --git a/TAO/tests/DSI_AMH/server.cpp b/TAO/tests/DSI_AMH/server.cpp index c880dcf310b..562fb7485b6 100644 --- a/TAO/tests/DSI_AMH/server.cpp +++ b/TAO/tests/DSI_AMH/server.cpp @@ -3,7 +3,7 @@ #include "Roundtrip.h" #include "ace/Get_Opt.h" -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/DSI_AMI_Gateway/client.cpp b/TAO/tests/DSI_AMI_Gateway/client.cpp index d978402437f..527f8ae33d9 100644 --- a/TAO/tests/DSI_AMI_Gateway/client.cpp +++ b/TAO/tests/DSI_AMI_Gateway/client.cpp @@ -7,7 +7,7 @@ ACE_RCSID(DSI_Gateway, client, "$Id$") -const char *ior = "file://gateway.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://gateway.ior"); int niterations = 5; int do_shutdown = 0; int test_user_exception = 0; diff --git a/TAO/tests/DSI_AMI_Gateway/gateway.cpp b/TAO/tests/DSI_AMI_Gateway/gateway.cpp index e329b209e95..ea8ec7a6418 100644 --- a/TAO/tests/DSI_AMI_Gateway/gateway.cpp +++ b/TAO/tests/DSI_AMI_Gateway/gateway.cpp @@ -6,10 +6,10 @@ ACE_RCSID(DSI_Gateway, server, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 5; int do_shutdown = 0; -const char *ior_output_file = "gateway.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("gateway.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/DSI_AMI_Gateway/server.cpp b/TAO/tests/DSI_AMI_Gateway/server.cpp index d63431eedb8..ec6d0e90db0 100644 --- a/TAO/tests/DSI_AMI_Gateway/server.cpp +++ b/TAO/tests/DSI_AMI_Gateway/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(DSI_Gateway, server, "$Id$") -const char *ior_output_file = "server.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int nthreads = 4; diff --git a/TAO/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp index 6b5d648d9d1..7c5b9c88637 100644 --- a/TAO/tests/DSI_Gateway/client.cpp +++ b/TAO/tests/DSI_Gateway/client.cpp @@ -7,7 +7,7 @@ ACE_RCSID(DSI_Gateway, client, "$Id$") -const char *ior = "file://gateway.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://gateway.ior"); int niterations = 5; int do_shutdown = 0; int test_user_exception = 0; diff --git a/TAO/tests/DSI_Gateway/gateway.cpp b/TAO/tests/DSI_Gateway/gateway.cpp index abd2147f5ee..dbc0ff0185a 100644 --- a/TAO/tests/DSI_Gateway/gateway.cpp +++ b/TAO/tests/DSI_Gateway/gateway.cpp @@ -6,10 +6,10 @@ ACE_RCSID(DSI_Gateway, server, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 5; int do_shutdown = 0; -const char *ior_output_file = "gateway.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("gateway.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/DSI_Gateway/server.cpp b/TAO/tests/DSI_Gateway/server.cpp index d63431eedb8..ec6d0e90db0 100644 --- a/TAO/tests/DSI_Gateway/server.cpp +++ b/TAO/tests/DSI_Gateway/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(DSI_Gateway, server, "$Id$") -const char *ior_output_file = "server.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int nthreads = 4; diff --git a/TAO/tests/DiffServ/client.cpp b/TAO/tests/DiffServ/client.cpp index ee0c627f41f..a27b0eca8d8 100644 --- a/TAO/tests/DiffServ/client.cpp +++ b/TAO/tests/DiffServ/client.cpp @@ -7,7 +7,7 @@ #include "tao/DiffServPolicy/Client_Network_Priority_Policy.h" #include "tao/DiffServPolicy/Server_Network_Priority_Policy.h" -static const char *ior = "file://simple_servant.ior"; +static const ACE_TCHAR *ior = ACE_TEXT("file://simple_servant.ior"); static int iterations = 1; #define IPDSFIELD_DSCP_DEFAULT 0x00 diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp index cf13bf9ccf0..01184bdb811 100644 --- a/TAO/tests/Explicit_Event_Loop/server.cpp +++ b/TAO/tests/Explicit_Event_Loop/server.cpp @@ -26,7 +26,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_time.h" -const char *ior_output_file = "server.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int done = 0; int diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp index 0721d2a63b7..8872fbc741b 100644 --- a/TAO/tests/Faults/client.cpp +++ b/TAO/tests/Faults/client.cpp @@ -7,7 +7,7 @@ ACE_RCSID(Failure, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 10; int do_shutdown = 0; int do_suicide = 0; diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp index 6bbf9b62c13..34c24a4ef5e 100644 --- a/TAO/tests/Faults/middle.cpp +++ b/TAO/tests/Faults/middle.cpp @@ -6,8 +6,8 @@ ACE_RCSID(Failure, middle, "$Id$") -const char *ior_output_file = "middle.ior"; -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("middle.ior"); +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 10; int diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp index 69756d989ce..65517b6aa3b 100644 --- a/TAO/tests/Faults/ping.cpp +++ b/TAO/tests/Faults/ping.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Faults, server, "$Id$") -const char *ior_output_file = "ping.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("ping.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp index 229d5218417..59b4779df66 100644 --- a/TAO/tests/File_IO/client.cpp +++ b/TAO/tests/File_IO/client.cpp @@ -25,7 +25,7 @@ ACE_RCSID(Default_Servant, client, "client.cpp,v 1.8 2001/03/26 21:16:52 coryan Exp") - static const char *iorfile = "ior"; + static const ACE_TCHAR *iorfile = ACE_TEXT("ior"); static const char *filename = "big.txt"; static int NUM_THREADS = 4; diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp index 75e39d9432f..4d73bb03214 100644 --- a/TAO/tests/File_IO/server.cpp +++ b/TAO/tests/File_IO/server.cpp @@ -12,7 +12,7 @@ ACE_RCSID (File_IO, server, "$Id$") -static const char *ior_output_file = "ior"; +static const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); static const int nthreads = 2; diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp index 2487ac67027..2cdade2b1a9 100644 --- a/TAO/tests/Forwarding/client.cpp +++ b/TAO/tests/Forwarding/client.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Forwarding, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 10; int nthreads = 1; int do_shutdown = 0; diff --git a/TAO/tests/Forwarding/server.cpp b/TAO/tests/Forwarding/server.cpp index ff28c23dc6a..d7dff2e0c76 100644 --- a/TAO/tests/Forwarding/server.cpp +++ b/TAO/tests/Forwarding/server.cpp @@ -7,7 +7,7 @@ ACE_RCSID(Forwarding, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp index b8149cf5ca7..a8c008992f5 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp +++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Muxing, client, "$Id$") -static const char *ior = "file://server.ior"; +static const ACE_TCHAR *ior = ACE_TEXT("file://server.ior"); static size_t nthreads = 1; int diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp index 1264f49c764..8be5ca51ce4 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Big_Request_Muxing, server, "$Id$") -const char *ior_output_file = "server.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp index 84fb95c9fd4..b3a64237d4a 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Big_Request_Muxing, server, "$Id$") -const char *ior_output_file = "server.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp index 74eb7870727..209be069022 100644 --- a/TAO/tests/Hang_Shutdown/client.cpp +++ b/TAO/tests/Hang_Shutdown/client.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Hello, client, "$Id$") namespace Test { - const char *ior = "file://server.ior"; + const ACE_TCHAR *ior = ACE_TEXT("file://server.ior"); ACE_Profile_Timer profile_timer; bool blocked = false; diff --git a/TAO/tests/Hang_Shutdown/server.cpp b/TAO/tests/Hang_Shutdown/server.cpp index e759c6c7ea5..07bd8d4c300 100644 --- a/TAO/tests/Hang_Shutdown/server.cpp +++ b/TAO/tests/Hang_Shutdown/server.cpp @@ -6,7 +6,7 @@ namespace Test { - const char *ior_output_file = "server.ior"; + const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); static int try_main (int argc, diff --git a/TAO/tests/ICMG_Any_Bug/client.cpp b/TAO/tests/ICMG_Any_Bug/client.cpp index b5d8bb44977..e5ead085a28 100644 --- a/TAO/tests/ICMG_Any_Bug/client.cpp +++ b/TAO/tests/ICMG_Any_Bug/client.cpp @@ -10,7 +10,7 @@ ACE_RCSID (ICMG_Any_Bug, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/ICMG_Any_Bug/server.cpp b/TAO/tests/ICMG_Any_Bug/server.cpp index b92925dfef9..f0e69cd322c 100644 --- a/TAO/tests/ICMG_Any_Bug/server.cpp +++ b/TAO/tests/ICMG_Any_Bug/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (ICMG_Any_Bug, server, "$Id$ ") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/IPV6/client.cpp b/TAO/tests/IPV6/client.cpp index e6df3961d13..0c6ebd9ccfd 100644 --- a/TAO/tests/IPV6/client.cpp +++ b/TAO/tests/IPV6/client.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); bool expect_error = false; diff --git a/TAO/tests/IPV6/server.cpp b/TAO/tests/IPV6/server.cpp index 83f432d885f..c1d8bd1bb30 100644 --- a/TAO/tests/IPV6/server.cpp +++ b/TAO/tests/IPV6/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Hello, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp index ae3518282db..391fd8361b2 100644 --- a/TAO/tests/Leader_Followers/server.cpp +++ b/TAO/tests/Leader_Followers/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID(Leader_Followers, server, "$Id$") -const char *ior_output_file = "ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); int number_of_event_loop_threads = 1; diff --git a/TAO/tests/LongDouble/client.cpp b/TAO/tests/LongDouble/client.cpp index ef1c2305c8b..c29a84d6511 100644 --- a/TAO/tests/LongDouble/client.cpp +++ b/TAO/tests/LongDouble/client.cpp @@ -8,7 +8,7 @@ ACE_RCSID (LongDoubleTest, client, "$Id$") -const char *ior = "file://server.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://server.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/LongDouble/server.cpp b/TAO/tests/LongDouble/server.cpp index 9a4ac66a181..fd1680bd140 100644 --- a/TAO/tests/LongDouble/server.cpp +++ b/TAO/tests/LongDouble/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (LongDoubleTest, server, "$Id$") -const char *ior_output_file = "server.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp index c6e4457ba63..6a0b42b598a 100644 --- a/TAO/tests/LongUpcalls/ami_client.cpp +++ b/TAO/tests/LongUpcalls/ami_client.cpp @@ -6,7 +6,7 @@ ACE_RCSID(LongUpcalls, ami_client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp index 3cdb52c0983..3f0db7273cf 100644 --- a/TAO/tests/LongUpcalls/ami_server.cpp +++ b/TAO/tests/LongUpcalls/ami_server.cpp @@ -5,7 +5,7 @@ ACE_RCSID(LongUpcalls, ami_server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp index a33f429322a..aab93fa66ab 100644 --- a/TAO/tests/LongUpcalls/blocking_client.cpp +++ b/TAO/tests/LongUpcalls/blocking_client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(LongUpcalls, blocking_client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp index e3209deed97..142d7fef6a3 100644 --- a/TAO/tests/LongUpcalls/blocking_server.cpp +++ b/TAO/tests/LongUpcalls/blocking_server.cpp @@ -5,7 +5,7 @@ ACE_RCSID(LongUpcalls, blocking_server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp index bdfae03aa17..8c8d8f329f5 100644 --- a/TAO/tests/MProfile/client.cpp +++ b/TAO/tests/MProfile/client.cpp @@ -8,7 +8,7 @@ ACE_RCSID(MT_Server, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int do_shutdown = 0; const char *name = "file://amba.ior"; diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp index 8d8c47925cb..e82270c71cf 100644 --- a/TAO/tests/MProfile_Connection_Timeout/client.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp @@ -12,7 +12,7 @@ ACE_RCSID(MProfile_Connection_Timeout, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int do_shutdown = 0; const char *name = "file://amba.ior"; diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp index 7de0f96250b..7008ce77e8c 100644 --- a/TAO/tests/MT_BiDir/client.cpp +++ b/TAO/tests/MT_BiDir/client.cpp @@ -9,7 +9,7 @@ ACE_RCSID(BiDirectional, client, "client.cpp,v 1.6 2001/03/30 20:11:05 bala Exp") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp index a611b70f935..c72c483dad9 100644 --- a/TAO/tests/MT_Client/client.cpp +++ b/TAO/tests/MT_Client/client.cpp @@ -7,7 +7,7 @@ ACE_RCSID(MT_Client, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 5; int niterations = 5; bool server_shutdown = false; diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp index f6d459451c4..be5a9ddf16a 100644 --- a/TAO/tests/MT_Client/orb_creation.cpp +++ b/TAO/tests/MT_Client/orb_creation.cpp @@ -7,7 +7,7 @@ ACE_RCSID(MT_Client, orb_creation, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 5; int niterations = 5; diff --git a/TAO/tests/MT_Server/client.cpp b/TAO/tests/MT_Server/client.cpp index 4174eed0020..2a5a954824e 100644 --- a/TAO/tests/MT_Server/client.cpp +++ b/TAO/tests/MT_Server/client.cpp @@ -6,7 +6,7 @@ ACE_RCSID(MT_Server, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 5; int do_shutdown = 0; diff --git a/TAO/tests/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp index bad07487aab..846b887b646 100644 --- a/TAO/tests/MT_Timeout/client.cpp +++ b/TAO/tests/MT_Timeout/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Client_Leaks, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int iterations = 500; int threads = 4; diff --git a/TAO/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp index 49e8dadbcf1..da675d78db1 100644 --- a/TAO/tests/MT_Timeout/server.cpp +++ b/TAO/tests/MT_Timeout/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(MT_Timeout, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Monitor/Marshal_Buffer/client.cpp b/TAO/tests/Monitor/Marshal_Buffer/client.cpp index af2c28b7edb..2af35b91f05 100644 --- a/TAO/tests/Monitor/Marshal_Buffer/client.cpp +++ b/TAO/tests/Monitor/Marshal_Buffer/client.cpp @@ -16,7 +16,7 @@ using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control; -const char *ior_input_file = "file://test.ior"; +const ACE_TCHAR *ior_input_file = ACE_TEXT("file://test.ior"); const char *monitor_output_file = "monitor.ior"; /// Runs the ORB in a separate thread so we can listen diff --git a/TAO/tests/Monitor/Marshal_Buffer/server.cpp b/TAO/tests/Monitor/Marshal_Buffer/server.cpp index d85aa131ec4..1f0ee493f83 100644 --- a/TAO/tests/Monitor/Marshal_Buffer/server.cpp +++ b/TAO/tests/Monitor/Marshal_Buffer/server.cpp @@ -4,7 +4,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/CORBA_macros.h" -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp index 4418bf09b00..0ad92d40135 100644 --- a/TAO/tests/Multiple/server.cpp +++ b/TAO/tests/Multiple/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID (tests, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp index 9daa5948461..5b0055a6c5a 100644 --- a/TAO/tests/Muxed_GIOP_Versions/client.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp @@ -7,7 +7,7 @@ ACE_RCSID(MT_Client, client, "client.cpp,v 1.16 2002/01/29 20:21:08 okellogg Exp") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); const char *corbaloc_arg = "corbaloc:iiop:1.0@localhost:12000/ObjectName"; int nthreads = 5; int niterations = 5; diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp index e5b44ad35ae..b839fca5b4c 100644 --- a/TAO/tests/Muxing/client.cpp +++ b/TAO/tests/Muxing/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Muxing, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); bool shutdown_srv = false; int diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp index 38e48cb2c11..185470abca0 100644 --- a/TAO/tests/Muxing/server.cpp +++ b/TAO/tests/Muxing/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Muxing, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Native_Exceptions/client.cpp b/TAO/tests/Native_Exceptions/client.cpp index 1a330447b88..7aeeb0ab0a3 100644 --- a/TAO/tests/Native_Exceptions/client.cpp +++ b/TAO/tests/Native_Exceptions/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Native_Exceptions, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 100; int diff --git a/TAO/tests/Nested_Event_Loop/server.cpp b/TAO/tests/Nested_Event_Loop/server.cpp index 0266337acb9..49f69c860e2 100644 --- a/TAO/tests/Nested_Event_Loop/server.cpp +++ b/TAO/tests/Nested_Event_Loop/server.cpp @@ -7,7 +7,7 @@ ACE_RCSID(Nested_Event_Loop, server, "$Id$") -const char *ior_output_file = "ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Nested_Upcall_Crash/client.cpp b/TAO/tests/Nested_Upcall_Crash/client.cpp index 867bc31d66f..6dfa76d62de 100644 --- a/TAO/tests/Nested_Upcall_Crash/client.cpp +++ b/TAO/tests/Nested_Upcall_Crash/client.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Nested_Upcall_Crash, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp index 52b20c965df..5636a204d2e 100644 --- a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp +++ b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp @@ -8,7 +8,7 @@ ACE_RCSID(Nested_Upcall_Crash, scavenger, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); #if defined (ACE_OPENVMS) // need this to circumvent link error on OpenVMS diff --git a/TAO/tests/Nested_Upcall_Crash/server.cpp b/TAO/tests/Nested_Upcall_Crash/server.cpp index 4f872ad7ca8..87c06081f53 100644 --- a/TAO/tests/Nested_Upcall_Crash/server.cpp +++ b/TAO/tests/Nested_Upcall_Crash/server.cpp @@ -13,7 +13,7 @@ ACE_RCSID (Nested_Upcall_Crash, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); ACE_RANDR_TYPE seed; int payload_size = 4; diff --git a/TAO/tests/No_Server_MT_Connect_Test/client.cpp b/TAO/tests/No_Server_MT_Connect_Test/client.cpp index a08c3ddeba1..f028dc058a0 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/client.cpp +++ b/TAO/tests/No_Server_MT_Connect_Test/client.cpp @@ -7,7 +7,7 @@ ACE_RCSID(MT_Client, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 5; int niterations = 5; int server_shutdown = 0; diff --git a/TAO/tests/OBV/Any/client.cpp b/TAO/tests/OBV/Any/client.cpp index b834889fea5..d92d9d97899 100644 --- a/TAO/tests/OBV/Any/client.cpp +++ b/TAO/tests/OBV/Any/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Any, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/OBV/Any/server.cpp b/TAO/tests/OBV/Any/server.cpp index 166a7df2673..0dec3a4796d 100644 --- a/TAO/tests/OBV/Any/server.cpp +++ b/TAO/tests/OBV/Any/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Any, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/OBV/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp index f912a413d30..b8e19d18d56 100644 --- a/TAO/tests/OBV/Factory/client.cpp +++ b/TAO/tests/OBV/Factory/client.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Factory, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/OBV/Factory/server.cpp b/TAO/tests/OBV/Factory/server.cpp index 03efa0eb129..0cae1904804 100644 --- a/TAO/tests/OBV/Factory/server.cpp +++ b/TAO/tests/OBV/Factory/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Factory, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp index 5975fb62315..1bc806f728e 100644 --- a/TAO/tests/OBV/Forward/client.cpp +++ b/TAO/tests/OBV/Forward/client.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Forward, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/OBV/Forward/server.cpp b/TAO/tests/OBV/Forward/server.cpp index 39b2a04ac37..178555e3dd2 100644 --- a/TAO/tests/OBV/Forward/server.cpp +++ b/TAO/tests/OBV/Forward/server.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Forward, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/OBV/TC_Alignment/client.cpp b/TAO/tests/OBV/TC_Alignment/client.cpp index 3a979a8b0a3..f88a5eb5392 100644 --- a/TAO/tests/OBV/TC_Alignment/client.cpp +++ b/TAO/tests/OBV/TC_Alignment/client.cpp @@ -7,7 +7,7 @@ ACE_RCSID (TC_Alignment, client, "$Id$") -static const char *ior_input_file = "file://test.ior"; +static const ACE_TCHAR *ior_input_file = ACE_TEXT("file://test.ior"); static obvmod::tcOffset1 *vt1 = 0; static obvmod::tcOffset003 *vt3 = 0; diff --git a/TAO/tests/OBV/TC_Alignment/server.cpp b/TAO/tests/OBV/TC_Alignment/server.cpp index 5843801ec41..5bca9994a74 100644 --- a/TAO/tests/OBV/TC_Alignment/server.cpp +++ b/TAO/tests/OBV/TC_Alignment/server.cpp @@ -7,7 +7,7 @@ ACE_RCSID (TC_Alignment, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/OBV/Truncatable/client.cpp b/TAO/tests/OBV/Truncatable/client.cpp index 29db2c81e05..aed77f06b8d 100644 --- a/TAO/tests/OBV/Truncatable/client.cpp +++ b/TAO/tests/OBV/Truncatable/client.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Truncatable, client, "$Id$") - const char *ior = "file://test.ior"; + const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int fail = 0; int pretest = 0; diff --git a/TAO/tests/OBV/Truncatable/server.cpp b/TAO/tests/OBV/Truncatable/server.cpp index 33f0b3e8e21..4e45ad361ec 100644 --- a/TAO/tests/OBV/Truncatable/server.cpp +++ b/TAO/tests/OBV/Truncatable/server.cpp @@ -7,7 +7,7 @@ ACE_RCSID(Truncatable, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp index 9704da7340f..2223c5efa18 100644 --- a/TAO/tests/OBV/ValueBox/client.cpp +++ b/TAO/tests/OBV/ValueBox/client.cpp @@ -8,7 +8,7 @@ ACE_RCSID(ValueBox, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/OBV/ValueBox/server.cpp b/TAO/tests/OBV/ValueBox/server.cpp index aa5756037b3..773833fa73e 100644 --- a/TAO/tests/OBV/ValueBox/server.cpp +++ b/TAO/tests/OBV/ValueBox/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(ValueBox, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/ORT/client.cpp b/TAO/tests/ORT/client.cpp index e9549fa381e..9d0945ebd74 100644 --- a/TAO/tests/ORT/client.cpp +++ b/TAO/tests/ORT/client.cpp @@ -8,7 +8,7 @@ ACE_RCSID (ORT, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp index 0fe9fd95c2b..6f28879687e 100644 --- a/TAO/tests/Objref_Sequence_Test/client.cpp +++ b/TAO/tests/Objref_Sequence_Test/client.cpp @@ -2,7 +2,7 @@ #include "TestC.h" #include "ace/Get_Opt.h" -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp index 669ea270dfb..0aa16faf2fd 100644 --- a/TAO/tests/Objref_Sequence_Test/server.cpp +++ b/TAO/tests/Objref_Sequence_Test/server.cpp @@ -108,7 +108,7 @@ ServerServant::shutdown (void) } /******************************************************/ -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp index 34f6604f2d6..2738fbec553 100644 --- a/TAO/tests/OctetSeq/client.cpp +++ b/TAO/tests/OctetSeq/client.cpp @@ -9,7 +9,7 @@ ACE_RCSID(OctetSeq, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 5; ACE_RANDR_TYPE seed = 0; int verbose = 0; diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp index d787da8cb3d..acd56bf88df 100644 --- a/TAO/tests/OctetSeq/server.cpp +++ b/TAO/tests/OctetSeq/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID (OctetSeq, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Ondemand_Write/client.cpp b/TAO/tests/Ondemand_Write/client.cpp index 177994318b0..c6bbbee8d81 100644 --- a/TAO/tests/Ondemand_Write/client.cpp +++ b/TAO/tests/Ondemand_Write/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Ondemand_Write/server.cpp b/TAO/tests/Ondemand_Write/server.cpp index 83f432d885f..c1d8bd1bb30 100644 --- a/TAO/tests/Ondemand_Write/server.cpp +++ b/TAO/tests/Ondemand_Write/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Hello, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Oneway_Buffering/admin.cpp b/TAO/tests/Oneway_Buffering/admin.cpp index d760c73b0bb..73b72c533a0 100644 --- a/TAO/tests/Oneway_Buffering/admin.cpp +++ b/TAO/tests/Oneway_Buffering/admin.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Oneway_Buffering, admin, "$Id$") -const char *ior_output_file = "admin.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("admin.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Oneway_Buffering/server.cpp b/TAO/tests/Oneway_Buffering/server.cpp index 3085b479ca5..7b8934d39b7 100644 --- a/TAO/tests/Oneway_Buffering/server.cpp +++ b/TAO/tests/Oneway_Buffering/server.cpp @@ -6,8 +6,8 @@ ACE_RCSID(Oneway_Buffering, server, "$Id$") -const char *ior_output_file = "server.ior"; -const char *ior = "file://admin.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); +const ACE_TCHAR *ior = ACE_TEXT("file://admin.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.cpp b/TAO/tests/Oneways_Invoking_Twoways/client.cpp index 12740f63397..c8f5a79fac9 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/client.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/client.cpp @@ -7,7 +7,7 @@ ACE_RCSID(Muxing, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.cpp b/TAO/tests/Oneways_Invoking_Twoways/server.cpp index 78d170c9352..09b14bef701 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/server.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Oneways_Invoking_Twoways, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Optimized_Connection/oc_client.cpp b/TAO/tests/Optimized_Connection/oc_client.cpp index 4b7de2a4b2e..49e25f21a7b 100644 --- a/TAO/tests/Optimized_Connection/oc_client.cpp +++ b/TAO/tests/Optimized_Connection/oc_client.cpp @@ -8,7 +8,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/POA/DSI/server.cpp b/TAO/tests/POA/DSI/server.cpp index 991d3f17342..d4916be2bf9 100644 --- a/TAO/tests/POA/DSI/server.cpp +++ b/TAO/tests/POA/DSI/server.cpp @@ -21,7 +21,7 @@ ACE_RCSID(DSI, server, "$Id$") -static const char *ior_output_file = "ior"; +static const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); static int parse_args (int argc, ACE_TCHAR **argv) diff --git a/TAO/tests/POA/On_Demand_Activation/server.cpp b/TAO/tests/POA/On_Demand_Activation/server.cpp index 017c1b0e581..02eafbef725 100644 --- a/TAO/tests/POA/On_Demand_Activation/server.cpp +++ b/TAO/tests/POA/On_Demand_Activation/server.cpp @@ -22,7 +22,7 @@ ACE_RCSID(On_Demand_Activation, server, "$Id$") -static const char *ior_output_file = "ior"; +static const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); static int parse_args (int argc, ACE_TCHAR **argv) diff --git a/TAO/tests/Parallel_Connect_Strategy/client.cpp b/TAO/tests/Parallel_Connect_Strategy/client.cpp index 9abc86da017..4d9e11a5c5a 100644 --- a/TAO/tests/Parallel_Connect_Strategy/client.cpp +++ b/TAO/tests/Parallel_Connect_Strategy/client.cpp @@ -7,7 +7,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int kill_server = 0; bool sanity_timeout = false; diff --git a/TAO/tests/Parallel_Connect_Strategy/server.cpp b/TAO/tests/Parallel_Connect_Strategy/server.cpp index cd819826bd5..048f78895a2 100644 --- a/TAO/tests/Parallel_Connect_Strategy/server.cpp +++ b/TAO/tests/Parallel_Connect_Strategy/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID (Hello, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp index 4d079b9af2f..69208f2f2f3 100644 --- a/TAO/tests/Param_Test/server.cpp +++ b/TAO/tests/Param_Test/server.cpp @@ -26,7 +26,7 @@ ACE_RCSID (Param_Test, // Parses the command line arguments and returns an error status. static FILE *ior_output_file = 0; -static const char *ior_output_filename = "test.ior"; +static const ACE_TCHAR *ior_output_filename = ACE_TEXT("test.ior"); static int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp index c0b367d5db6..852fed8bb80 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2133/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID (Hello, server, "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp index 1ed8737ded8..bfc4553b549 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Bug_2510_Regression, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp index 06422073baa..6f8c5122a39 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp @@ -10,7 +10,7 @@ ACE_RCSID (Bug_2510_Regression, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp index c85c66f7f66..e0e3a08c437 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp @@ -11,7 +11,7 @@ ACE_RCSID (Dynamic, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp index ec3b04283b3..fe1285c5162 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp @@ -11,7 +11,7 @@ ACE_RCSID (Dynamic, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp index b01ebe7ab11..e662312423c 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp @@ -11,7 +11,7 @@ ACE_RCSID (IORInterceptor, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp index bc35156c60c..2d8df448e48 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp @@ -12,7 +12,7 @@ ACE_RCSID (IORInterceptor, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp index 53ad5a05278..61f0ab9281e 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp @@ -13,7 +13,7 @@ ACE_RCSID (PICurrent, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp index 6a79ed00f4e..bd5d07eb44b 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp @@ -15,7 +15,7 @@ ACE_RCSID (PICurrent, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); extern PortableInterceptor::SlotId slot_id; diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp index d431b023582..eb2baf8e663 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp @@ -8,7 +8,7 @@ ACE_RCSID(Interceptors, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp index 11c2c2fb8ba..740bc45061a 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp @@ -11,7 +11,7 @@ ACE_RCSID (Service_Context_Manipulation, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp index 2c5b48f1abf..388fa11c3a9 100644 --- a/TAO/tests/QtTests/client.cpp +++ b/TAO/tests/QtTests/client.cpp @@ -61,7 +61,7 @@ void Client::parse_args (int argc, char *argv[]) { - const char *ior = "file://test.ior"; + const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp index 12ae5b47709..77b7ba0bb6f 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp @@ -8,8 +8,8 @@ #include "../check_supported_priorities.cpp" // Default IOR files. -const char *ior1 = "file://test1.ior"; -const char *ior2 = "file://test2.ior"; +const ACE_TCHAR *ior1 = ACE_TEXT("file://test1.ior"); +const ACE_TCHAR *ior2 = ACE_TEXT("file://test2.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp index 17e98742b1e..55eeedec72d 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp @@ -114,8 +114,8 @@ Test_i::shutdown (void) //************************************************************************* const char *bands_file = "bands"; -const char *ior_output_file1 = "test1.ior"; -const char *ior_output_file2 = "test2.ior"; +const ACE_TCHAR *ior_output_file1 = ACE_TEXT("test1.ior"); +const ACE_TCHAR *ior_output_file2 = ACE_TEXT("test2.ior"); // Parse command-line arguments. int diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp index 4cb6dfbf44c..29de7988a24 100644 --- a/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp +++ b/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp @@ -10,7 +10,7 @@ #include "ace/Get_Opt.h" #include "../check_supported_priorities.cpp" -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, char *argv[]) diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp index 0c3969a497e..68217fcb7ba 100644 --- a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp +++ b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp @@ -70,7 +70,7 @@ Test_i::shutdown () //************************************************************************* -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); // Parse command-line arguments. int diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp index d3a4730843e..3e4bbdc8a2d 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp @@ -10,7 +10,7 @@ #include "ace/Get_Opt.h" #include "../check_supported_priorities.cpp" -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp index f7858a0c858..c969befaecb 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp @@ -72,7 +72,7 @@ Test_i::shutdown (void) //************************************************************************* -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); // Parse command-line arguments. int diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp index 15d0e428312..3622d45f120 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp @@ -9,8 +9,8 @@ #include "tao/Strategies/advanced_resource.h" -const char *ior1 = "file://test1.ior"; -const char *ior2 = "file://test2.ior"; +const ACE_TCHAR *ior1 = ACE_TEXT("file://test1.ior"); +const ACE_TCHAR *ior2 = ACE_TEXT("file://test2.ior"); CORBA::ULong protocol_type = 0; int diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp index f953a7f9c6c..0a44766c647 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp @@ -49,8 +49,8 @@ Test_i::shutdown (void) //************************************************************************* -const char *ior_output_file1 = "test1.ior"; -const char *ior_output_file2 = "test2.ior"; +const ACE_TCHAR *ior_output_file1 = ACE_TEXT("test1.ior"); +const ACE_TCHAR *ior_output_file2 = ACE_TEXT("test2.ior"); CORBA::ULong protocol_type = 0; // Parse command-line arguments. diff --git a/TAO/tests/RTCORBA/Diffserv/client.cpp b/TAO/tests/RTCORBA/Diffserv/client.cpp index 9d025beeff4..8ff12669c25 100644 --- a/TAO/tests/RTCORBA/Diffserv/client.cpp +++ b/TAO/tests/RTCORBA/Diffserv/client.cpp @@ -9,7 +9,7 @@ #include "tao/Policy_ManagerC.h" #include "tao/Policy_CurrentC.h" -static const char *ior = "file://simple_servant.ior"; +static const ACE_TCHAR *ior = ACE_TEXT("file://simple_servant.ior"); static int iterations = 1; static int corba_priority = RTCORBA::minPriority; static int shutdown_server = 0; diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp index 8af4432a836..eebb1d299ba 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Thread_Pool, client, "$Id$") -const char *ior = "file://ior_1"; +const ACE_TCHAR *ior = ACE_TEXT("file://ior_1"); int iterations = 6; int shutdown_server = 0; bool decreased = false; diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp index 67e76616f4d..7fd86895259 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Thread_Pool, server, "$Id$") -const char *ior_output_file = "ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); int ior_count = 1; CORBA::ULong static_threads = 1; CORBA::ULong dynamic_threads = 25; diff --git a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp index f7207723ab7..b3238a971bd 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp +++ b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp @@ -8,7 +8,7 @@ #include "tao/Policy_ManagerC.h" #include "tao/Policy_CurrentC.h" -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp index dd6d5e6f3aa..78e6b0a0891 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp +++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp @@ -48,7 +48,7 @@ Test_i::shutdown (void) //************************************************************************* -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); // Parse command-line arguments. int diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp index cb929152f6f..a43c578d83b 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp @@ -66,7 +66,7 @@ static CORBA::ULong max_buffered_requests = 0; static CORBA::ULong max_request_buffer_size = 0; static CORBA::Boolean allow_borrowing = 0; -static const char *ior = "ior"; +static const ACE_TCHAR *ior = ACE_TEXT("ior"); static int debug = 1; static const ACE_TCHAR *bands_file = ACE_TEXT ("bands"); diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp index 8cb2eb0635a..5103b479518 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp @@ -48,7 +48,7 @@ private: }; // **************************************************************** -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int iterations = 100; CORBA::Short priority1 = -1; CORBA::Short priority2 = -1; diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp index 99124bd672b..3a7c5da07e5 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp @@ -48,7 +48,7 @@ Test_i::shutdown (void) //************************************************************************* -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); // Parse command-line arguments. int diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp index 8f3e96012f8..1be484f6684 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Priority_Inversion_With_Bands, client, "$Id$") -static const char *ior = "file://ior_1"; +static const ACE_TCHAR *ior = ACE_TEXT("file://ior_1"); static int iterations = 12; static CORBA::ULong work = 2; static int make_banded_invocations = 0; diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp index 94cb7cc326b..d32f0d268f9 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Priority_Inversion_With_Bands, server, "$Id$") -static const char *ior_output_file = "ior"; +static const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); static int ior_count = 1; static CORBA::ULong static_threads = 1; static CORBA::ULong dynamic_threads = 0; diff --git a/TAO/tests/RTCORBA/Private_Connection/client.cpp b/TAO/tests/RTCORBA/Private_Connection/client.cpp index dfa676f288d..dbf9a40ba32 100644 --- a/TAO/tests/RTCORBA/Private_Connection/client.cpp +++ b/TAO/tests/RTCORBA/Private_Connection/client.cpp @@ -6,8 +6,8 @@ #include "tao/Policy_CurrentC.h" #include "ace/Get_Opt.h" -const char *ior1 = "file://test1.ior"; -const char *ior2 = "file://test2.ior"; +const ACE_TCHAR *ior1 = ACE_TEXT("file://test1.ior"); +const ACE_TCHAR *ior2 = ACE_TEXT("file://test2.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp index 44fcdb2c937..bef966bd31c 100644 --- a/TAO/tests/RTCORBA/Private_Connection/server.cpp +++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp @@ -47,8 +47,8 @@ Test_i::shutdown (void) //************************************************************************* -const char *ior_output_file1 = "test1.ior"; -const char *ior_output_file2 = "test2.ior"; +const ACE_TCHAR *ior_output_file1 = ACE_TEXT("test1.ior"); +const ACE_TCHAR *ior_output_file2 = ACE_TEXT("test2.ior"); // Parse command-line arguments. int diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp index bc30865942b..a975b84341d 100644 --- a/TAO/tests/RTCORBA/Server_Declared/client.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp @@ -4,8 +4,8 @@ #include "ace/Get_Opt.h" #include "tao/RTCORBA/RTCORBA.h" -const char *ior1 = "file://test1.ior"; -const char *ior2 = "file://test2.ior"; +const ACE_TCHAR *ior1 = ACE_TEXT("file://test1.ior"); +const ACE_TCHAR *ior2 = ACE_TEXT("file://test2.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp index 823bd74be60..3c60139fbf1 100644 --- a/TAO/tests/RTCORBA/Server_Declared/server.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp @@ -71,8 +71,8 @@ Test_i::shutdown (void) //************************************************************************* -const char *ior_output_file1 = "test1.ior"; -const char *ior_output_file2 = "test2.ior"; +const ACE_TCHAR *ior_output_file1 = ACE_TEXT("test1.ior"); +const ACE_TCHAR *ior_output_file2 = ACE_TEXT("test2.ior"); CORBA::Short poa_priority = -1; CORBA::Short object_priority = -1; diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.cpp b/TAO/tests/RTCORBA/Server_Protocol/client.cpp index 3d14c53da2e..67b9ef0aa23 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/client.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/client.cpp @@ -5,7 +5,7 @@ #include "tao/RTCORBA/RTCORBA.h" #include "tao/Strategies/advanced_resource.h" -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp index ab84dcf6075..d4b425be86a 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp @@ -42,7 +42,7 @@ Test_i::shutdown (void) //************************************************************************* -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int protocol_chosen = 0; CORBA::ULong protocol_type = 0; diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp index d1beb306066..f4514bf5024 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Thread_Pool, client, "$Id$") -const char *ior = "file://ior_1"; +const ACE_TCHAR *ior = ACE_TEXT("file://ior_1"); int iterations = 6; int shutdown_server = 0; diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp index 5bc4b20c7d5..5b85660d041 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Thread_Pool, server, "$Id$") -const char *ior_output_file = "ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); int ior_count = 1; CORBA::ULong static_threads = 2; CORBA::ULong dynamic_threads = 2; diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp index be77121e1a4..52a6c6d8531 100644 --- a/TAO/tests/Reliable_Oneways/client.cpp +++ b/TAO/tests/Reliable_Oneways/client.cpp @@ -8,7 +8,7 @@ ACE_RCSID(Reliable_Oneways, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int test_sync_with_target = 0; int test_sync_with_server = 0; int test_sync_with_transport = 0; diff --git a/TAO/tests/Reliable_Oneways/server.cpp b/TAO/tests/Reliable_Oneways/server.cpp index 05b14d06daf..c6a9dbc93d3 100644 --- a/TAO/tests/Reliable_Oneways/server.cpp +++ b/TAO/tests/Reliable_Oneways/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Reliable_Oneways, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Servant_To_Reference_Test/server.cpp b/TAO/tests/Servant_To_Reference_Test/server.cpp index bd23cd0000a..6c44275753c 100644 --- a/TAO/tests/Servant_To_Reference_Test/server.cpp +++ b/TAO/tests/Servant_To_Reference_Test/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID (Hello, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); class MT_Task : public ACE_Task_Base { diff --git a/TAO/tests/Server_Connection_Purging/server.cpp b/TAO/tests/Server_Connection_Purging/server.cpp index b7a799ceab9..0fa5a5a9815 100644 --- a/TAO/tests/Server_Connection_Purging/server.cpp +++ b/TAO/tests/Server_Connection_Purging/server.cpp @@ -4,7 +4,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -const char *ior_output_file = "server.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Server_Leaks/client.cpp b/TAO/tests/Server_Leaks/client.cpp index 130a863f7c0..14ac97af38b 100644 --- a/TAO/tests/Server_Leaks/client.cpp +++ b/TAO/tests/Server_Leaks/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Server_Leaks, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int do_shutdown = 0; int diff --git a/TAO/tests/Server_Leaks/server.cpp b/TAO/tests/Server_Leaks/server.cpp index bb52d2b4ab3..e26806e215c 100644 --- a/TAO/tests/Server_Leaks/server.cpp +++ b/TAO/tests/Server_Leaks/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Server_Leaks, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Server_Port_Zero/server.cpp b/TAO/tests/Server_Port_Zero/server.cpp index 7bf4b7d6ced..c5eb379eb84 100644 --- a/TAO/tests/Server_Port_Zero/server.cpp +++ b/TAO/tests/Server_Port_Zero/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Server_Port_Zero, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp index 880ea06ca15..2752b09ed10 100644 --- a/TAO/tests/Single_Read/server.cpp +++ b/TAO/tests/Single_Read/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Timed_Buffered_Oneways, server, "$Id$") -const char *ior_output_file = "ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp index 40d2fe0f78b..3ffd9235b35 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp @@ -31,7 +31,7 @@ ACE_RCSID (Benchmark, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 5; int register_smart_proxy = 1; diff --git a/TAO/tests/Smart_Proxies/On_Demand/client.cpp b/TAO/tests/Smart_Proxies/On_Demand/client.cpp index 8722576f69c..ad44ebe8a30 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/client.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/client.cpp @@ -23,7 +23,7 @@ ACE_RCSID(Smart_Proxy, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Smart_Proxies/Policy/client.cpp b/TAO/tests/Smart_Proxies/Policy/client.cpp index 5bae9897b80..9bbf62c6333 100644 --- a/TAO/tests/Smart_Proxies/Policy/client.cpp +++ b/TAO/tests/Smart_Proxies/Policy/client.cpp @@ -23,8 +23,8 @@ ACE_RCSID(Smart_Proxy, client, "$Id$") -const char *ior1 = "file://test1.ior"; -const char *ior2 = "file://test2.ior"; +const ACE_TCHAR *ior1 = ACE_TEXT("file://test1.ior"); +const ACE_TCHAR *ior2 = ACE_TEXT("file://test2.ior"); int one_shot_factory = 1; int diff --git a/TAO/tests/Smart_Proxies/client.cpp b/TAO/tests/Smart_Proxies/client.cpp index c99f4f1e645..aed4d299198 100644 --- a/TAO/tests/Smart_Proxies/client.cpp +++ b/TAO/tests/Smart_Proxies/client.cpp @@ -24,7 +24,7 @@ ACE_RCSID(Smart_Proxy, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Stack_Recursion/client.cpp b/TAO/tests/Stack_Recursion/client.cpp index 4d15013bad6..975cd259671 100644 --- a/TAO/tests/Stack_Recursion/client.cpp +++ b/TAO/tests/Stack_Recursion/client.cpp @@ -7,7 +7,7 @@ ACE_RCSID(Stack_Recursion, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); static int iterations = 1000; int diff --git a/TAO/tests/Stack_Recursion/server.cpp b/TAO/tests/Stack_Recursion/server.cpp index f604d7f2cc7..4e0a0cafe83 100644 --- a/TAO/tests/Stack_Recursion/server.cpp +++ b/TAO/tests/Stack_Recursion/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID(Stack_Recursion, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Strategies/client.cpp b/TAO/tests/Strategies/client.cpp index 6337425dc30..b97b482542b 100644 --- a/TAO/tests/Strategies/client.cpp +++ b/TAO/tests/Strategies/client.cpp @@ -6,7 +6,7 @@ ACE_RCSID(tests, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int server_shutdown = 0; int diff --git a/TAO/tests/Timed_Buffered_Oneways/server.cpp b/TAO/tests/Timed_Buffered_Oneways/server.cpp index b147d5cc4d4..00b810667d7 100644 --- a/TAO/tests/Timed_Buffered_Oneways/server.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Timed_Buffered_Oneways, server, "$Id$") -const char *ior_output_file = "ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Two_Objects/client.cpp b/TAO/tests/Two_Objects/client.cpp index 581b2c69811..df4b10ff103 100644 --- a/TAO/tests/Two_Objects/client.cpp +++ b/TAO/tests/Two_Objects/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(Test, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp index e8d7a98ede4..d50f6c745d3 100644 --- a/TAO/tests/Two_Objects/server.cpp +++ b/TAO/tests/Two_Objects/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Test, server, "$Id$") int msglen = 100; //default length of reply message is 100 bytes int nthreads = 2; -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Typedef_String_Array/client.cpp b/TAO/tests/Typedef_String_Array/client.cpp index e8dec383c3f..f30702df821 100644 --- a/TAO/tests/Typedef_String_Array/client.cpp +++ b/TAO/tests/Typedef_String_Array/client.cpp @@ -5,7 +5,7 @@ ACE_RCSID(StringArray, client, "$Id$") -const char *ior = "file://server.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://server.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Typedef_String_Array/server.cpp b/TAO/tests/Typedef_String_Array/server.cpp index 6973de74060..6d1a51f3d2b 100644 --- a/TAO/tests/Typedef_String_Array/server.cpp +++ b/TAO/tests/Typedef_String_Array/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(MT_Client, server, "$Id$") -const char *ior_output_file = "server.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp index 9e810376ca7..ff5a00599cd 100644 --- a/TAO/tests/UNKNOWN_Exception/server.cpp +++ b/TAO/tests/UNKNOWN_Exception/server.cpp @@ -7,7 +7,7 @@ ACE_RCSID (UNKNOWN_Exception, server, "$Id$") -const char *ior_output_file = "ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); static int done = 0; void diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp index fd814fd7097..a94d8a98bec 100644 --- a/TAO/tests/Xt_Stopwatch/client.cpp +++ b/TAO/tests/Xt_Stopwatch/client.cpp @@ -65,7 +65,7 @@ void Client::parse_args (int argc, char *argv[]) { - const char *ior = "file://test.ior"; + const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); int c; diff --git a/TAO/tests/ZIOP/client.cpp b/TAO/tests/ZIOP/client.cpp index cd731cc4241..368cf4736d9 100644 --- a/TAO/tests/ZIOP/client.cpp +++ b/TAO/tests/ZIOP/client.cpp @@ -7,7 +7,7 @@ ACE_RCSID(Hello, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/ZIOP/server.cpp b/TAO/tests/ZIOP/server.cpp index b0d8b37dc80..4d8e1a7353e 100644 --- a/TAO/tests/ZIOP/server.cpp +++ b/TAO/tests/ZIOP/server.cpp @@ -12,7 +12,7 @@ ACE_RCSID (Hello, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); Compression::CompressionLevel level = 9; int |