diff options
Diffstat (limited to 'TAO/orbsvcs/Time_Service')
-rw-r--r-- | TAO/orbsvcs/Time_Service/Clerk_i.cpp | 8 | ||||
-rw-r--r-- | TAO/orbsvcs/Time_Service/Server_i.cpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp index ab42e2787f7..8a5da97ccaa 100644 --- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp +++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp @@ -68,7 +68,7 @@ Clerk_i::read_ior (const ACE_TCHAR* filename) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("iors -> |%s|\n"), - ACE_TEXT_CHAR_TO_TCHAR(str))); + ACE_TEXT_TO_TCHAR_IN(str))); CORBA::Object_var objref = this->orb_->string_to_object (str @@ -110,7 +110,7 @@ int Clerk_i::parse_args (int argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("dt:u:f:o:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("dt:u:f:o:")); int c, result; @@ -278,7 +278,7 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter, ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Getting IOR of the server: %s\n\n"), - ACE_TEXT_CHAR_TO_TCHAR(binding->binding_name[0].id.in ()))); + ACE_TEXT_TO_TCHAR_IN(binding->binding_name[0].id.in ()))); CosNaming::Name server_name; server_name.length (1); @@ -352,7 +352,7 @@ Clerk_i::create_clerk (void) // Print the clerk IOR on the console. ACE_DEBUG ((LM_DEBUG, ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) The Time Service CLERK IOR is: <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR(objref_clerk.in ()))); + ACE_TEXT_TO_TCHAR_IN(objref_clerk.in ()))); // Print the Time Service clerk IOR to a file. if (this->ior_output_file_) diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp index b1c846e398f..9fc1acb43e3 100644 --- a/TAO/orbsvcs/Time_Service/Server_i.cpp +++ b/TAO/orbsvcs/Time_Service/Server_i.cpp @@ -31,7 +31,7 @@ int Server_i::parse_args (int argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("do:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("do:")); int c; while ((c = get_opts ()) != -1) @@ -123,7 +123,7 @@ Server_i::create_server (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) The Time Service ") ACE_TEXT("SERVER IOR: <%s>\n"), - ACE_TEXT_CHAR_TO_TCHAR(objref_server.in ()))); + ACE_TEXT_TO_TCHAR_IN(objref_server.in ()))); // Print the IOR to a file. @@ -194,7 +194,7 @@ Server_i::register_server (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Binding ServerContext -> %s\n"), - ACE_TEXT_CHAR_TO_TCHAR(server_name[1].id.in ()))); + ACE_TEXT_TO_TCHAR_IN(server_name[1].id.in ()))); } ACE_CATCHANY { |