diff options
Diffstat (limited to 'TAO/tests/POA/Loader')
| -rw-r--r-- | TAO/tests/POA/Loader/Server_Manager.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/TAO/tests/POA/Loader/Server_Manager.cpp b/TAO/tests/POA/Loader/Server_Manager.cpp index 5a7a5d04c05..6e2767aed5e 100644 --- a/TAO/tests/POA/Loader/Server_Manager.cpp +++ b/TAO/tests/POA/Loader/Server_Manager.cpp @@ -41,7 +41,7 @@ Server_i::parse_args (int argc, "usage: %s " "[-f ior_output_file] " "\n", - argv [0]), + ACE_TEXT_CHAR_TO_TCHAR (argv [0])), -1); } @@ -77,8 +77,8 @@ Server_i::write_iors_to_file (const char *first_ior, || output_file_2 == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IORs: %s, %s\n", - ior_output_file_1, - ior_output_file_2), + ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_1), + ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_2)), -1); int result = ACE_OS::fprintf (output_file_1, @@ -88,8 +88,8 @@ Server_i::write_iors_to_file (const char *first_ior, || static_cast<size_t> (result) != ACE_OS::strlen (first_ior)) ACE_ERROR_RETURN ((LM_ERROR, "ACE_OS::fprintf failed while writing %s to %s\n", - first_ior, - ior_output_file_1), + ACE_TEXT_CHAR_TO_TCHAR (first_ior), + ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_1)), -1); result = ACE_OS::fprintf (output_file_2, @@ -99,8 +99,8 @@ Server_i::write_iors_to_file (const char *first_ior, || static_cast<size_t> (result) != ACE_OS::strlen (second_ior)) ACE_ERROR_RETURN ((LM_ERROR, "ACE_OS::fprintf failed while writing %s to %s\n", - second_ior, - ior_output_file_2), + ACE_TEXT_CHAR_TO_TCHAR (second_ior), + ACE_TEXT_CHAR_TO_TCHAR (ior_output_file_2)), -1); ACE_OS::fclose (output_file_1); ACE_OS::fclose (output_file_2); @@ -115,9 +115,7 @@ Server_i::init (int argc, char **argv) try { // Initialize the ORB. - orb_ = CORBA::ORB_init (argc, - argv, - 0); + orb_ = CORBA::ORB_init (argc, argv); int result = parse_args (argc, argv); if (result != 0) @@ -333,8 +331,8 @@ Server_i::run (void) // Print the ior's of first_test and second_test. ACE_DEBUG ((LM_DEBUG,"%s\n%s\n", - first_test_ior.in (), - second_test_ior.in ())); + ACE_TEXT_CHAR_TO_TCHAR (first_test_ior.in ()), + ACE_TEXT_CHAR_TO_TCHAR (second_test_ior.in ()))); int write_result = this->write_iors_to_file (first_test_ior.in (), |