diff options
51 files changed, 104 insertions, 50 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d45c2b11624..c19ce0f2552 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,57 @@ +Sun Sep 28 11:31:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * performance-tests/Callback/client.cpp + * performance-tests/Callback/server.cpp + * performance-tests/Latency/AMH_Single_Threaded/client.cpp + * performance-tests/Latency/AMH_Single_Threaded/server.cpp + * performance-tests/Latency/AMI/client.cpp + * performance-tests/Latency/AMI/server.cpp + * performance-tests/Latency/Deferred/client.cpp + * performance-tests/Latency/Deferred/server.cpp + * performance-tests/Latency/DII/client.cpp + * performance-tests/Latency/DII/server.cpp + * performance-tests/Latency/DSI/client.cpp + * performance-tests/Latency/DSI/server.cpp + * performance-tests/Latency/Single_Threaded/client.cpp + * performance-tests/Latency/Single_Threaded/server.cpp + * performance-tests/Latency/Thread_Per_Connection/client.cpp + * performance-tests/Latency/Thread_Per_Connection/server.cpp + * performance-tests/Latency/Thread_Pool/client.cpp + * performance-tests/Latency/Thread_Pool/server.cpp + * performance-tests/Memory/IORsize/client.cpp + * performance-tests/Memory/IORsize/server.cpp + * performance-tests/Memory/Single_Threaded/client.cpp + * performance-tests/Memory/Single_Threaded/server.cpp + * performance-tests/POA/Implicit_Activation/client.cpp + * performance-tests/POA/Implicit_Activation/server.cpp + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp + * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp + * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp + * performance-tests/RTCorba/Oneways/Reliable/client.cpp + * performance-tests/RTCorba/Oneways/Reliable/server.cpp + * performance-tests/RTCorba/Thread_Pool/client.cpp + * performance-tests/RTCorba/Thread_Pool/server.cpp + * performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp + * performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp + * performance-tests/Sequence_Latency/AMI/client.cpp + * performance-tests/Sequence_Latency/AMI/server.cpp + * performance-tests/Sequence_Latency/Deferred/client.cpp + * performance-tests/Sequence_Latency/Deferred/server.cpp + * performance-tests/Sequence_Latency/DII/client.cpp + * performance-tests/Sequence_Latency/DII/server.cpp + * performance-tests/Sequence_Latency/DSI/client.cpp + * performance-tests/Sequence_Latency/DSI/server.cpp + * performance-tests/Sequence_Latency/Single_Threaded/client.cpp + * performance-tests/Sequence_Latency/Single_Threaded/server.cpp + * performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp + * performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp + * performance-tests/Sequence_Latency/Thread_Pool/client.cpp + * performance-tests/Sequence_Latency/Thread_Pool/server.cpp + * performance-tests/Throughput/client.cpp + * performance-tests/Throughput/server.cpp + ACE_TCHAR changes + Sun Sep 28 11:29:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * tests/File_IO/client.cpp diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp index 4805bfbf072..21995b94eb6 100644 --- a/TAO/performance-tests/Callback/client.cpp +++ b/TAO/performance-tests/Callback/client.cpp @@ -19,7 +19,7 @@ ACE_RCSID(Callback, client, "$Id$") int iterations = 1000; int do_dump_history = 0; -const char *ior = "file://server.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://server.ior"); /// Parse the arguments. static int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/performance-tests/Callback/server.cpp b/TAO/performance-tests/Callback/server.cpp index 71550d5a561..bd90e183963 100644 --- a/TAO/performance-tests/Callback/server.cpp +++ b/TAO/performance-tests/Callback/server.cpp @@ -11,7 +11,7 @@ ACE_RCSID(Callback, server, "$Id$") -const char *ior_file_name = "test.ior"; +const ACE_TCHAR *ior_file_name = ACE_TEXT("test.ior"); /// Parse the arguments. static int parse_args (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp index 980330ff75b..130c641e8d4 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp @@ -13,7 +13,7 @@ ACE_RCSID(Single_Threaded_Latency, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 100; int do_dump_history = 0; int do_shutdown = 1; diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp index 4ccd5902b60..0196426aab0 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Single_Threaded_Latency, 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/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp index 5be734b10f3..d7390e3d349 100644 --- a/TAO/performance-tests/Latency/AMI/client.cpp +++ b/TAO/performance-tests/Latency/AMI/client.cpp @@ -11,7 +11,7 @@ ACE_RCSID(AMI_Latency, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); ACE_hrtime_t throughput_base; diff --git a/TAO/performance-tests/Latency/AMI/server.cpp b/TAO/performance-tests/Latency/AMI/server.cpp index e3b6e18b89c..9fab151f83c 100644 --- a/TAO/performance-tests/Latency/AMI/server.cpp +++ b/TAO/performance-tests/Latency/AMI/server.cpp @@ -10,7 +10,7 @@ ACE_RCSID(AMI_Latency, 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/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp index d7a652e2f12..142a68ba6cc 100644 --- a/TAO/performance-tests/Latency/DII/client.cpp +++ b/TAO/performance-tests/Latency/DII/client.cpp @@ -17,7 +17,7 @@ ACE_RCSID (DII_Latency, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 100; int do_dump_history = 0; int do_shutdown = 1; diff --git a/TAO/performance-tests/Latency/DII/server.cpp b/TAO/performance-tests/Latency/DII/server.cpp index 4ccd5902b60..0196426aab0 100644 --- a/TAO/performance-tests/Latency/DII/server.cpp +++ b/TAO/performance-tests/Latency/DII/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Single_Threaded_Latency, 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/performance-tests/Latency/DSI/client.cpp b/TAO/performance-tests/Latency/DSI/client.cpp index b16a1bd330f..09468e95013 100644 --- a/TAO/performance-tests/Latency/DSI/client.cpp +++ b/TAO/performance-tests/Latency/DSI/client.cpp @@ -13,7 +13,7 @@ ACE_RCSID(DSI_Latency, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 100; int do_dump_history = 0; int do_shutdown = 1; diff --git a/TAO/performance-tests/Latency/DSI/server.cpp b/TAO/performance-tests/Latency/DSI/server.cpp index 10d65aeac09..98413d4fb7e 100644 --- a/TAO/performance-tests/Latency/DSI/server.cpp +++ b/TAO/performance-tests/Latency/DSI/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(DSI_Latency, 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/performance-tests/Latency/Deferred/client.cpp b/TAO/performance-tests/Latency/Deferred/client.cpp index ca350bdd960..85866410039 100644 --- a/TAO/performance-tests/Latency/Deferred/client.cpp +++ b/TAO/performance-tests/Latency/Deferred/client.cpp @@ -22,7 +22,7 @@ ACE_RCSID (Deferred_Latency, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 1000; int burst = 10; int do_shutdown = 1; diff --git a/TAO/performance-tests/Latency/Deferred/server.cpp b/TAO/performance-tests/Latency/Deferred/server.cpp index 4ccd5902b60..0196426aab0 100644 --- a/TAO/performance-tests/Latency/Deferred/server.cpp +++ b/TAO/performance-tests/Latency/Deferred/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Single_Threaded_Latency, 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/performance-tests/Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Latency/Single_Threaded/client.cpp index 980330ff75b..130c641e8d4 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/client.cpp +++ b/TAO/performance-tests/Latency/Single_Threaded/client.cpp @@ -13,7 +13,7 @@ ACE_RCSID(Single_Threaded_Latency, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 100; int do_dump_history = 0; int do_shutdown = 1; diff --git a/TAO/performance-tests/Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Latency/Single_Threaded/server.cpp index 6bbfc51c918..db5bab34d33 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Latency/Single_Threaded/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Single_Threaded_Latency, 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/performance-tests/Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp index 3c0113f176f..b47c632f2d7 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp @@ -12,7 +12,7 @@ ACE_RCSID(Thread_Per_Connection_Latency, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 1000; int do_shutdown = 1; diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp index 11d99a87a84..438afb2616f 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Thread_Per_Connection_Latency, 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/performance-tests/Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Latency/Thread_Pool/client.cpp index 7dbde20c78d..241ece25996 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/client.cpp +++ b/TAO/performance-tests/Latency/Thread_Pool/client.cpp @@ -12,7 +12,7 @@ ACE_RCSID(Thread_Pool_Latency, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 1000; int do_shutdown = 1; diff --git a/TAO/performance-tests/Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Latency/Thread_Pool/server.cpp index a562957489b..a5fb9a0f621 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/server.cpp +++ b/TAO/performance-tests/Latency/Thread_Pool/server.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Thread_Pool_Latency, 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/performance-tests/Memory/IORsize/client.cpp b/TAO/performance-tests/Memory/IORsize/client.cpp index 320cb4595a6..7c3b5876894 100644 --- a/TAO/performance-tests/Memory/IORsize/client.cpp +++ b/TAO/performance-tests/Memory/IORsize/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"); static int n = 10; int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/performance-tests/Memory/IORsize/server.cpp b/TAO/performance-tests/Memory/IORsize/server.cpp index 51471891b09..ebb7bb647c6 100644 --- a/TAO/performance-tests/Memory/IORsize/server.cpp +++ b/TAO/performance-tests/Memory/IORsize/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/performance-tests/Memory/Single_Threaded/client.cpp b/TAO/performance-tests/Memory/Single_Threaded/client.cpp index 90a844a4224..75fd6e55943 100644 --- a/TAO/performance-tests/Memory/Single_Threaded/client.cpp +++ b/TAO/performance-tests/Memory/Single_Threaded/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"); static int n = 100; int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/performance-tests/Memory/Single_Threaded/server.cpp b/TAO/performance-tests/Memory/Single_Threaded/server.cpp index 51471891b09..ebb7bb647c6 100644 --- a/TAO/performance-tests/Memory/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Memory/Single_Threaded/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/performance-tests/POA/Implicit_Activation/client.cpp b/TAO/performance-tests/POA/Implicit_Activation/client.cpp index cded8e0a68d..cc7305355aa 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/client.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/client.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Activation, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 100; int do_dump_history = 0; int do_shutdown = 1; diff --git a/TAO/performance-tests/POA/Implicit_Activation/server.cpp b/TAO/performance-tests/POA/Implicit_Activation/server.cpp index 92f253acdf6..57ed66d4756 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/server.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID(Activation, 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/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp index f5806540f76..c8b40ce5965 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp @@ -65,7 +65,7 @@ private: // **************************************************************** -const char *ior_base = "file://test.ior"; +const ACE_TCHAR *ior_base = ACE_TEXT("file://test.ior"); int nthreads = 0; int niterations = 1000; int period = -1; diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp index 6b39f46796d..6c27ccee682 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp @@ -47,7 +47,7 @@ int nthreads = 0; const int MAX_THREADS = 128; Server servers[MAX_THREADS]; int priorities[MAX_THREADS]; -const char *ior_output_file_base = "test.ior"; +const ACE_TCHAR *ior_output_file_base = ACE_TEXT("test.ior"); int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp index dc7756f8c37..323b89cd261 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp @@ -65,7 +65,7 @@ private: // **************************************************************** -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 0; int niterations = 1000; int period = -1; diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp index 61468fcd369..de2e357a786 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp @@ -6,7 +6,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_errno.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/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp index d2405d1d336..44500d2981b 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp @@ -53,7 +53,7 @@ inline int QuantifyStopRecordingData () #endif /* USING_QUANTIFY */ // Default IOR. -static const char *ior = "file://test.ior"; +static const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); // Levels at which syncscope policy can be set. enum LEVEL {ORB_LEVEL, THREAD_LEVEL, OBJECT_LEVEL}; diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp index 78c236d22fd..1d6e1649a8f 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Reliable, server, "$Id$") // IOR file name -static const char *ior_output_file = "test.ior"; +static const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); static int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp index b4e4d9414cd..36f6d982a81 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp @@ -26,7 +26,7 @@ enum Priority_Setting AFTER_THREAD_CREATION = 1 }; -static const char *ior = "file://ior"; +static const ACE_TCHAR *ior = ACE_TEXT("file://ior"); static const char *rates_file = "rates"; static const char *invocation_priorities_file = "empty-file"; static int shutdown_server = 0; diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp index 0ca347da806..238d93c5813 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp @@ -68,7 +68,7 @@ test_i::shutdown (void) this->orb_->shutdown (0); } -static const char *ior_output_file = "ior"; +static const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); static CORBA::ULong static_threads = 1; static CORBA::ULong dynamic_threads = 0; static CORBA::ULong number_of_lanes = 0; diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp index e1f3db1576d..947f9c7e5a4 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp @@ -13,7 +13,7 @@ ACE_RCSID(AMH_Single_Threaded_Latency, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 100; int do_dump_history = 0; int do_shutdown = 1; diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp index 4ccd5902b60..0196426aab0 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Single_Threaded_Latency, 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/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp index 78e20aaa282..eb4db1a4f99 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp @@ -16,7 +16,7 @@ ACE_RCSID (AMI, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); ACE_hrtime_t throughput_base; diff --git a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp index e3b6e18b89c..9fab151f83c 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp @@ -10,7 +10,7 @@ ACE_RCSID(AMI_Latency, 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/performance-tests/Sequence_Latency/DII/client.cpp b/TAO/performance-tests/Sequence_Latency/DII/client.cpp index c83839f8a1e..eb4f161b9a6 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/DII/client.cpp @@ -20,7 +20,7 @@ ACE_RCSID (DII, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 100; int do_dump_history = 0; int do_shutdown = 1; diff --git a/TAO/performance-tests/Sequence_Latency/DII/server.cpp b/TAO/performance-tests/Sequence_Latency/DII/server.cpp index 0be15aa462c..5028fe91caa 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/DII/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(DII_Latency, 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/performance-tests/Sequence_Latency/DSI/client.cpp b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp index b1ced26606e..023e685f0bf 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp @@ -15,7 +15,7 @@ ACE_RCSID(DSI_Latency, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 100; int do_dump_history = 0; int do_shutdown = 1; diff --git a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp index 10d65aeac09..98413d4fb7e 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(DSI_Latency, 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/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp index 12355fe7c79..cc2fe5bda7e 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp @@ -21,7 +21,7 @@ ACE_RCSID (Deferred, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 1000; int burst = 10; int do_shutdown = 1; diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp index af291b4f3da..344eaf2c5af 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Deferred_Latency, 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/performance-tests/Sequence_Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp index 71ea56df8f6..c3cc9762de9 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp @@ -13,7 +13,7 @@ ACE_RCSID(Single_Threaded_Latency, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 100; int sz = 512; int do_dump_history = 0; diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp index e9632f37297..8a98e49f0fb 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Single_Threaded_Latency, 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/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp index 21fe0aba4d7..5fff39fa76a 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp @@ -12,7 +12,7 @@ ACE_RCSID(Thread_Per_Connection_Latency, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 1000; int do_shutdown = 1; int sz = 512; diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp index 11d99a87a84..438afb2616f 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp @@ -9,7 +9,7 @@ ACE_RCSID(Thread_Per_Connection_Latency, 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/performance-tests/Sequence_Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp index b3ed31d711b..c571421ef28 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp @@ -12,7 +12,7 @@ ACE_RCSID(Thread_Pool_Latency, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 1000; int do_shutdown = 1; int sz = 512; diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp index 9a62b97c50b..390c1052ff0 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Thread_Pool_Latency, 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/performance-tests/Throughput/client.cpp b/TAO/performance-tests/Throughput/client.cpp index e76206696ce..2dde2b1e38b 100644 --- a/TAO/performance-tests/Throughput/client.cpp +++ b/TAO/performance-tests/Throughput/client.cpp @@ -7,7 +7,7 @@ ACE_RCSID(Throughput, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int message_size = 2048; int message_count = 10 * 1024; int test_runs = 6; diff --git a/TAO/performance-tests/Throughput/server.cpp b/TAO/performance-tests/Throughput/server.cpp index 5c80d2ce99b..e1e3bfc8c04 100644 --- a/TAO/performance-tests/Throughput/server.cpp +++ b/TAO/performance-tests/Throughput/server.cpp @@ -6,7 +6,7 @@ ACE_RCSID(Throughput, 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[]) |