From 70fbbf3dbc740e932936c9ec7711b496b0a45ca8 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 30 Sep 2008 18:27:08 +0000 Subject: Tue Sep 30 18:25:45 UTC 2008 Johnny Willemsen --- TAO/ChangeLog | 25 ++++++++++++++ TAO/tests/Exposed_Policies/Policy_Verifier.cpp | 8 ++--- TAO/tests/InterOp-Naming/INS_test_client.cpp | 2 +- TAO/tests/Monitor/Marshal_Buffer/client.cpp | 2 +- TAO/tests/Monitor/Marshal_Buffer/server.cpp | 2 +- TAO/tests/NestedUpcall/MT_Client_Test/client.cpp | 2 +- .../NestedUpcall/MT_Client_Test/local_server.cpp | 2 +- .../NestedUpcall/MT_Client_Test/local_server.h | 2 +- TAO/tests/NestedUpcall/MT_Client_Test/server.cpp | 3 +- TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp | 2 +- TAO/tests/NestedUpcall/Triangle_Test/initiator.h | 2 +- TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp | 2 +- TAO/tests/Oneway_Send_Timeouts/Client.cpp | 6 ++-- TAO/tests/Oneway_Send_Timeouts/Server.cpp | 4 +-- TAO/tests/Oneway_Send_Timeouts/main.cpp | 6 ++-- TAO/tests/Oneway_Timeouts/client.cpp | 40 +++++++++++----------- .../Portable_Interceptors/Bug_3079/server.cpp | 2 +- .../Portable_Interceptors/Bug_3080/client.cpp | 2 +- .../Portable_Interceptors/Bug_3080/server.cpp | 2 +- .../Portable_Interceptors/ORB_Shutdown/server.cpp | 2 +- .../Portable_Interceptors/Redirection/server.cpp | 2 +- .../Request_Interceptor_Flow/server.cpp | 2 +- 22 files changed, 73 insertions(+), 49 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 77e4178f179..2c11acd3142 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,28 @@ +Tue Sep 30 18:25:45 UTC 2008 Johnny Willemsen + + * tests/Exposed_Policies/Policy_Verifier.cpp + * tests/InterOp-Naming/INS_test_client.cpp + * tests/Monitor/Marshal_Buffer/client.cpp + * tests/Monitor/Marshal_Buffer/server.cpp + * tests/NestedUpcall/MT_Client_Test/client.cpp + * tests/NestedUpcall/MT_Client_Test/local_server.cpp + * tests/NestedUpcall/MT_Client_Test/local_server.h + * tests/NestedUpcall/MT_Client_Test/server.cpp + * tests/NestedUpcall/Triangle_Test/initiator.cpp + * tests/NestedUpcall/Triangle_Test/initiator.h + * tests/NestedUpcall/Triangle_Test/server_A.cpp + * tests/Oneway_Send_Timeouts/Client.cpp + * tests/Oneway_Send_Timeouts/main.cpp + * tests/Oneway_Send_Timeouts/Server.cpp + * tests/Oneway_Timeouts/client.cpp + * tests/Portable_Interceptors/Bug_3079/server.cpp + * tests/Portable_Interceptors/Bug_3080/client.cpp + * tests/Portable_Interceptors/Bug_3080/server.cpp + * tests/Portable_Interceptors/ORB_Shutdown/server.cpp + * tests/Portable_Interceptors/Redirection/server.cpp + * tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp + ACE_TCHAR fixes + Tue Sep 30 18:24:45 UTC 2008 Johnny Willemsen * orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp index 0d0270e23f1..7714834eb84 100644 --- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp +++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp @@ -29,19 +29,19 @@ Policy_Verifier::init (int argc, ACE_TCHAR *argv[]) { const char *arg = 0; // IOR File Name Option. - if (0 != (arg = arg_shifter.get_the_parameter ("-POAConfigFile"))) + if (0 != (arg = arg_shifter.get_the_parameter (ACE_TEXT("-POAConfigFile")))) { this->rt_poa_properties_ = RT_Properties::read_from (arg); this->priority_bands_ = this->rt_poa_properties_->priority_bands ().length (); } - else if (0 != (arg = arg_shifter.get_the_parameter ("-ObjectConfigFile"))) + else if (0 != (arg = arg_shifter.get_the_parameter (ACE_TEXT("-ObjectConfigFile")))) { this->rt_object_properties_ = RT_Properties::read_from (arg); } - else if (0 != (arg = arg_shifter.get_the_parameter ("-BaseObjectIOR"))) + else if (0 != (arg = arg_shifter.get_the_parameter (ACE_TEXT("-BaseObjectIOR")))) { if (this->rt_poa_properties_ == 0) { @@ -55,7 +55,7 @@ Policy_Verifier::init (int argc, ACE_TCHAR *argv[]) ACE_OS::strcat (this->base_object_ref_, this->rt_poa_properties_->ior_source ()); } - else if (0 != (arg = arg_shifter.get_the_parameter ("-OverriddenIOR"))) + else if (0 != (arg = arg_shifter.get_the_parameter (ACE_TEXT("-OverriddenIOR")))) { if (this->rt_object_properties_ == 0) { diff --git a/TAO/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp index e3aacfb8476..6b0180440b3 100644 --- a/TAO/tests/InterOp-Naming/INS_test_client.cpp +++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp @@ -29,7 +29,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) for (i = 1; i < argc; ++i) { - if (ACE_OS::strcmp (argv[i], "-l") == 0) + if (ACE_OS::strcmp (argv[i], ACE_TEXT("-l")) == 0) { // List initial services CORBA::ORB::ObjectIdList_var list = diff --git a/TAO/tests/Monitor/Marshal_Buffer/client.cpp b/TAO/tests/Monitor/Marshal_Buffer/client.cpp index 03d905b2290..610ac702929 100644 --- a/TAO/tests/Monitor/Marshal_Buffer/client.cpp +++ b/TAO/tests/Monitor/Marshal_Buffer/client.cpp @@ -77,7 +77,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_ERROR_RETURN ((LM_ERROR, "Can't open output file for writing IOR: %s", - ACE_TEXT_CHAR_TO_TCHAR (monitor_output_file)), + monitor_output_file), 1); } diff --git a/TAO/tests/Monitor/Marshal_Buffer/server.cpp b/TAO/tests/Monitor/Marshal_Buffer/server.cpp index 1f0ee493f83..e73b5750d94 100644 --- a/TAO/tests/Monitor/Marshal_Buffer/server.cpp +++ b/TAO/tests/Monitor/Marshal_Buffer/server.cpp @@ -41,7 +41,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_ERROR_RETURN ((LM_ERROR, "Can't open output file for writing IOR: %s", - ACE_TEXT_CHAR_TO_TCHAR (ior_output_file)), + ior_output_file), 1); } diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp index d6e6eb958f6..e8278de8dd5 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp @@ -288,7 +288,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int threads = 1; for (i = 0; i < argc; i++) - if (ACE_OS::strcmp (argv[i], "-n") == 0) + if (ACE_OS::strcmp (argv[i], ACE_TEXT("-n")) == 0) threads = ACE_OS::atoi(argv[i + 1]); // create a separate server thread diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp index 417852da351..8c248eba672 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp @@ -59,7 +59,7 @@ MT_Server::MT_Server () // Reads the MT Object IOR from a file int -MT_Server::read_ior (char *filename) +MT_Server::read_ior (ACE_TCHAR *filename) { // Open the file for reading. ACE_HANDLE f_handle = ACE_OS::open (filename,0); diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h index e653a49d3a8..b486c2f443e 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h @@ -63,7 +63,7 @@ public: // Just run it briefly private: - int read_ior (char *filename); + int read_ior (ACE_TCHAR *filename); // reading the IOR of mt object in int parse_args (void); diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp index 001bc0231be..3c3acc77d85 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp @@ -63,8 +63,7 @@ MT_Object_Server::parse_args (void) } int -MT_Object_Server::init (int argc, - char** argv) +MT_Object_Server::init (int argc, ACE_TCHAR** argv) { // Call the init of TAO_ORB_Manager to create a child POA // under the root POA. diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp index c24e1e37cdb..803fd4da740 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp @@ -39,7 +39,7 @@ Initiator_Server::Initiator_Server (void) // A_B == 1, means read Object B's IOR int -Initiator_Server::read_ior (char *filename, unsigned int A_B) +Initiator_Server::read_ior (ACE_TCHAR *filename, unsigned int A_B) { // Open the file for reading. ACE_HANDLE f_handle = ACE_OS::open (filename,0); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h index 318ee6ca75e..36be7ab5da6 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h @@ -47,7 +47,7 @@ public: ~Initiator_Server (void); // Destructor - int read_ior (char *filename, unsigned int A_B); + int read_ior (ACE_TCHAR *filename, unsigned int A_B); // read in the IOR's for the two objects A and B int init (int argc, diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp index d9e9480590f..fa1a29d8ddb 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp @@ -64,7 +64,7 @@ Object_A_Server::parse_args (void) int Object_A_Server::init (int argc, - char** argv) + ACE_TCHAR** argv) { // Call the init of TAO_ORB_Manager to create a child POA // under the root POA. diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.cpp b/TAO/tests/Oneway_Send_Timeouts/Client.cpp index a848f2227bb..1865e09694f 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Client.cpp +++ b/TAO/tests/Oneway_Send_Timeouts/Client.cpp @@ -180,13 +180,13 @@ Client::parse_args (int argc, ACE_TCHAR* argv[]) obj = orb_->string_to_object (back_ior.c_str()); management_ = Test::_narrow (obj.in ()); - if (ACE_OS::strcasecmp ("lf", flush_strategy.c_str()) == 0) { + if (ACE_OS::strcasecmp (ACE_TEXT("lf"), flush_strategy.c_str()) == 0) { flush_strategy_ = LF; } - else if (ACE_OS::strcasecmp ("blocking", flush_strategy.c_str()) == 0) { + else if (ACE_OS::strcasecmp (ACE_TEXT("blocking"), flush_strategy.c_str()) == 0) { flush_strategy_ = BLOCKING; } - else if (ACE_OS::strcasecmp ("reactive", flush_strategy.c_str()) == 0) { + else if (ACE_OS::strcasecmp (ACE_TEXT("reactive"), flush_strategy.c_str()) == 0) { flush_strategy_ = REACTIVE; } diff --git a/TAO/tests/Oneway_Send_Timeouts/Server.cpp b/TAO/tests/Oneway_Send_Timeouts/Server.cpp index cd76aa7796d..a0122a45d7b 100644 --- a/TAO/tests/Oneway_Send_Timeouts/Server.cpp +++ b/TAO/tests/Oneway_Send_Timeouts/Server.cpp @@ -32,7 +32,7 @@ Server::Server (int , ACE_TCHAR* argv[]) int my_argc = args_1.argc (); int count = 0; for (count = my_argc-1; count > -1; count--) { - if (ACE_OS::strcasecmp ("-ORBEndpoint", my_argv[count]) == 0) { + if (ACE_OS::strcasecmp (ACE_TEXT("-ORBEndpoint"), my_argv[count]) == 0) { break; } } @@ -53,7 +53,7 @@ Server::Server (int , ACE_TCHAR* argv[]) my_argv = args_2.argv(); my_argc = args_2.argc(); for (count = 0; count < my_argc; count++) { - if (ACE_OS::strcasecmp ("-ORBEndpoint", my_argv[count]) == 0) { + if (ACE_OS::strcasecmp (ACE_TEXT("-ORBEndpoint"), my_argv[count]) == 0) { break; } } diff --git a/TAO/tests/Oneway_Send_Timeouts/main.cpp b/TAO/tests/Oneway_Send_Timeouts/main.cpp index a7cf7d3a138..7db7cb03175 100644 --- a/TAO/tests/Oneway_Send_Timeouts/main.cpp +++ b/TAO/tests/Oneway_Send_Timeouts/main.cpp @@ -92,17 +92,17 @@ MyMain::MyMain (int argc, ACE_TCHAR* argv[]) argc--; for (int p = 1; p <= argc; p++) { - if (ACE_OS::strcmp (argv[p], "-?") == 0) { + if (ACE_OS::strcmp (argv[p], ACE_TEXT("-?")) == 0) { print_usage (); return; } - if (ACE_OS::strcasecmp (argv[p], "-s") == 0) { + if (ACE_OS::strcasecmp (argv[p], ACE_TEXT("-s")) == 0) { const ACE_TCHAR* s_args = (((p+1) <= argc) ? argv[p+1] : 0); s_init_ = this->init_server (s_args); p++; } - else if (ACE_OS::strcasecmp (argv[p], "-c") == 0) { + else if (ACE_OS::strcasecmp (argv[p], ACE_TEXT("-c")) == 0) { const ACE_TCHAR* s_args = (((p+1) <= argc) ? argv[p+1] : 0); if (s_init_) { this->init_client (s_args); diff --git a/TAO/tests/Oneway_Timeouts/client.cpp b/TAO/tests/Oneway_Timeouts/client.cpp index 3268fef183e..4ebbbf5b1cf 100644 --- a/TAO/tests/Oneway_Timeouts/client.cpp +++ b/TAO/tests/Oneway_Timeouts/client.cpp @@ -75,108 +75,108 @@ namespace while (args.is_anything_left ()) { - if (args.cur_arg_strncasecmp ("-request_timeout") == 0) + if (args.cur_arg_strncasecmp (ACE_TEXT("-request_timeout")) == 0) { args.consume_arg (); request_timeout = ACE_OS::atoi (args.get_current ()); args.consume_arg (); } - else if (args.cur_arg_strncasecmp ("-connect_timeout") == 0) + else if (args.cur_arg_strncasecmp (ACE_TEXT("-connect_timeout")) == 0) { args.consume_arg (); connect_timeout = ACE_OS::atoi (args.get_current ()); args.consume_arg (); } - else if (args.cur_arg_strncasecmp ("-request_interval") == 0) + else if (args.cur_arg_strncasecmp (ACE_TEXT("-request_interval")) == 0) { args.consume_arg (); request_interval = ACE_OS::atoi (args.get_current ()); args.consume_arg (); } - else if (args.cur_arg_strncasecmp ("-run_orb_delay") == 0) + else if (args.cur_arg_strncasecmp (ACE_TEXT("-run_orb_delay")) == 0) { args.consume_arg (); run_orb_delay = ACE_OS::atoi (args.get_current ()); args.consume_arg (); } - else if (args.cur_arg_strncasecmp ("-run_orb_time") == 0) + else if (args.cur_arg_strncasecmp (ACE_TEXT("-run_orb_time")) == 0) { args.consume_arg (); run_orb_time = ACE_OS::atoi(args.get_current ()); args.consume_arg (); } - else if (args.cur_arg_strncasecmp ("-max_request_time") == 0) + else if (args.cur_arg_strncasecmp (ACE_TEXT("-max_request_time")) == 0) { args.consume_arg (); max_request_time = ACE_OS::atoi (args.get_current ()); args.consume_arg (); } - else if (args.cur_arg_strncasecmp ("-num_requests") == 0) + else if (args.cur_arg_strncasecmp (ACE_TEXT("-num_requests")) == 0) { args.consume_arg (); num_requests = ACE_OS::atoi (args.get_current ()); args.consume_arg (); } - else if (args.cur_arg_strncasecmp ("-use_twoway") == 0) + else if (args.cur_arg_strncasecmp (ACE_TEXT("-use_twoway")) == 0) { use_twoway = true; args.consume_arg (); } - else if (args.cur_arg_strncasecmp ("-retry_transients") == 0) + else if (args.cur_arg_strncasecmp (ACE_TEXT("-retry_transients")) == 0) { retry_transients = true; args.consume_arg (); } - else if (args.cur_arg_strncasecmp ("-retry_timeouts") == 0) + else if (args.cur_arg_strncasecmp (ACE_TEXT("-retry_timeouts")) == 0) { retry_timeouts = true; args.consume_arg (); } - else if (args.cur_arg_strncasecmp ("-use_sleep") == 0) + else if (args.cur_arg_strncasecmp (ACE_TEXT("-use_sleep")) == 0) { use_sleep = true; args.consume_arg (); } - else if (args.cur_arg_strncasecmp ("-force_timeout") == 0) + else if (args.cur_arg_strncasecmp (ACE_TEXT("-force_timeout")) == 0) { force_timeout = true; args.consume_arg (); } - else if (args.cur_arg_strncasecmp ("-force_connect") == 0) + else if (args.cur_arg_strncasecmp (ACE_TEXT("-force_connect")) == 0) { force_connect = true; args.consume_arg (); } - else if (args.cur_arg_strncasecmp ("-buffer_count") == 0) + else if (args.cur_arg_strncasecmp (ACE_TEXT("-buffer_count")) == 0) { args.consume_arg (); use_buf_constraints = true; bc_count = ACE_OS::atoi (args.get_current ()); args.consume_arg (); } - else if (args.cur_arg_strncasecmp ("-buffer_bytes") == 0) + else if (args.cur_arg_strncasecmp (ACE_TEXT("-buffer_bytes")) == 0) { args.consume_arg (); use_buf_constraints = true; bc_bytes = ACE_OS::atoi (args.get_current ()); args.consume_arg (); } - else if (args.cur_arg_strncasecmp ("-buffer_timeout") == 0) + else if (args.cur_arg_strncasecmp (ACE_TEXT("-buffer_timeout")) == 0) { args.consume_arg (); use_buf_constraints = true; bc_timeout = ACE_OS::atoi (args.get_current ()); args.consume_arg (); } - else if (args.cur_arg_strncasecmp ("-sync") == 0) + else if (args.cur_arg_strncasecmp (ACE_TEXT("-sync")) == 0) { args.consume_arg (); - if (args.cur_arg_strncasecmp ("delayed") == 0) + if (args.cur_arg_strncasecmp (ACE_TEXT("delayed")) == 0) { sync_scope = TAO::SYNC_DELAYED_BUFFERING; use_sync_scope = true; } - else if (args.cur_arg_strncasecmp ("none") == 0) + else if (args.cur_arg_strncasecmp (ACE_TEXT("none")) == 0) { sync_scope = Messaging::SYNC_NONE; use_sync_scope = true; @@ -189,7 +189,7 @@ namespace args.consume_arg (); } - else if (args.cur_arg_strncasecmp ("-make_request_queued") == 0) + else if (args.cur_arg_strncasecmp (ACE_TEXT("-make_request_queued")) == 0) { make_request_queued = true; args.consume_arg (); diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp index 33f90cce2ef..ecf8f39d04c 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3079/server.cpp @@ -12,7 +12,7 @@ ACE_RCSID (Redirection, server, "$Id$") -const char *ior_file = 0; +const ACE_TCHAR *ior_file = 0; int number = 0; int server_number = 0; diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/client.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/client.cpp index df359ad04b6..b9ebcb01185 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3080/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3080/client.cpp @@ -10,7 +10,7 @@ ACE_RCSID (Redirection, client, "$Id$") -const char *ior1 = 0; +const ACE_TCHAR *ior1 = 0; int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/server.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/server.cpp index a22dc724e80..733e167e137 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3080/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3080/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID (Redirection, server, "$Id$") -const char *ior_file = 0; +const ACE_TCHAR *ior_file = 0; int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp index 8a005b82a1f..619a4d7eeb7 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp @@ -13,7 +13,7 @@ ACE_RCSID (ORB_Shutdown, "$Id$") -const char *ior_file = 0; +const ACE_TCHAR *ior_file = 0; int parse_args (int argc, ACE_TCHAR *argv[]) diff --git a/TAO/tests/Portable_Interceptors/Redirection/server.cpp b/TAO/tests/Portable_Interceptors/Redirection/server.cpp index b0adf511cc7..43ab48e2f2a 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/server.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/server.cpp @@ -12,7 +12,7 @@ ACE_RCSID (Redirection, server, "$Id$") -const char *ior_file = 0; +const ACE_TCHAR *ior_file = 0; int number = 0; int diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp index 6c5954beca5..7f8b7336e5e 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp @@ -11,7 +11,7 @@ ACE_RCSID (Request_Interceptor_Flow, server, "$Id$") -const char *ior_file = 0; +const ACE_TCHAR *ior_file = 0; int parse_args (int argc, ACE_TCHAR *argv[]) -- cgit v1.2.1