diff options
Diffstat (limited to 'tests')
77 files changed, 188 insertions, 201 deletions
diff --git a/tests/ACE_Init_Test.cpp b/tests/ACE_Init_Test.cpp index 64d77320e07..ee783ca7704 100644 --- a/tests/ACE_Init_Test.cpp +++ b/tests/ACE_Init_Test.cpp @@ -79,7 +79,7 @@ CACE_Init_TestApp theApp; BOOL CACE_Init_TestApp::InitInstance() { - // This is needed because there's no overridden main(int, char *[]) + // This is needed because there's no overridden ACE_TMAIN(int, ACE_TCHAR *[]) // which would normally handle the initialization. Also see the // corresponding ACE::fini, below. ACE::init(); diff --git a/tests/ARGV_Test.cpp b/tests/ARGV_Test.cpp index bb06c6b8d31..a2eb057d5d4 100644 --- a/tests/ARGV_Test.cpp +++ b/tests/ARGV_Test.cpp @@ -70,7 +70,7 @@ test_argv_type_converter (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%d) %s\n"), i, - ACE_TEXT_CHAR_TO_TCHAR (argv[i]))); + ACE_TEXT_TO_TCHAR_IN (argv[i]))); } for (size_t i = 0; save_argv[i]; ++i) diff --git a/tests/Aio_Platform_Test.cpp b/tests/Aio_Platform_Test.cpp index 22c13223e06..2c75f7d6022 100644 --- a/tests/Aio_Platform_Test.cpp +++ b/tests/Aio_Platform_Test.cpp @@ -189,8 +189,9 @@ run_main (int, ACE_TCHAR *[]) "ACE_HAS_AIO_CALLS can be defined for this platform\n" "Further tests at $ACE_ROOT/examples/Reactor/Proactor\n")); else - ACE_ERROR ((LM_INFO, - "AIO not supported on this platform\n")); + ACE_ERROR_RETURN ((LM_ERROR, + "AIO not found.Test failed\n"), + -1); ACE_END_TEST; diff --git a/tests/Auto_Event_Test.cpp b/tests/Auto_Event_Test.cpp index a31b8a9f6a1..b507e70f259 100644 --- a/tests/Auto_Event_Test.cpp +++ b/tests/Auto_Event_Test.cpp @@ -114,7 +114,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("w:n:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("w:n:")); int c; diff --git a/tests/Basic_Types_Test.cpp b/tests/Basic_Types_Test.cpp index 90fbf04a991..7602eb1a8c9 100644 --- a/tests/Basic_Types_Test.cpp +++ b/tests/Basic_Types_Test.cpp @@ -74,10 +74,8 @@ run_main (int, ACE_TCHAR *[]) errors += check (ACE_TEXT ("ACE_SIZEOF_CHAR: %u%s"), sizeof (char), ACE_SIZEOF_CHAR); -#if defined (ACE_HAS_WCHAR) errors += check (ACE_TEXT ("ACE_SIZEOF_WCHAR: %u%s"), sizeof (wchar_t), ACE_SIZEOF_WCHAR); -#endif /* ACE_HAS_WCHAR */ errors += check (ACE_TEXT ("ACE_SIZEOF_SHORT: %u%s"), sizeof (short), ACE_SIZEOF_SHORT); errors += check (ACE_TEXT ("ACE_SIZEOF_INT: %u%s"), diff --git a/tests/Bound_Ptr_Test.cpp b/tests/Bound_Ptr_Test.cpp index e2d85c27d31..03bc61a79e1 100644 --- a/tests/Bound_Ptr_Test.cpp +++ b/tests/Bound_Ptr_Test.cpp @@ -167,7 +167,7 @@ Printer::print (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %s\n"), - ACE_TEXT_CHAR_TO_TCHAR(this->message_))); + ACE_TEXT_TO_TCHAR_IN(this->message_))); } #if defined (ACE_HAS_THREADS) diff --git a/tests/CDR_Array_Test.cpp b/tests/CDR_Array_Test.cpp index 5bb5a01c3eb..006fb038e0a 100644 --- a/tests/CDR_Array_Test.cpp +++ b/tests/CDR_Array_Test.cpp @@ -897,7 +897,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE::minor_version(), ACE::beta_version())); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("d:f:q:w:h:c:t:n:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("d:f:q:w:h:c:t:n:")); int dtotal = 0; int ftotal = 0; int qtotal = 0; @@ -1001,4 +1001,3 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_END_TEST; return 0; } - diff --git a/tests/CDR_File_Test.cpp b/tests/CDR_File_Test.cpp index 9397574eabd..3f55e1bdc34 100644 --- a/tests/CDR_File_Test.cpp +++ b/tests/CDR_File_Test.cpp @@ -330,7 +330,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE::minor_version (), ACE::beta_version ())); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:rw")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("f:rw")); int opt; int reading = 1; int writing = 1; diff --git a/tests/CDR_Test.cpp b/tests/CDR_Test.cpp index ca61076c4ed..d99dea44bf4 100644 --- a/tests/CDR_Test.cpp +++ b/tests/CDR_Test.cpp @@ -228,7 +228,7 @@ short_stream (void) ACE_TEXT ("string transfer error")), 1); - if (ACE_OS::wscmp (wstr1, wstr)) + if (ACE_OS::strcmp (wstr1, wstr)) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("wide string transfer error")), @@ -430,7 +430,7 @@ CDR_Test_Types::test_get (ACE_InputCDR &cdr) const 1); // zero length ACE_Auto_Basic_Array_Ptr<ACE_CDR::WChar> auto_xwstr (wstr1); - if (ACE_OS::wslen(auto_xwstr.get () )) + if (ACE_OS::strlen(auto_xwstr.get () )) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("wstring[%d] differs\n"), i), @@ -450,7 +450,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE::minor_version(), ACE::beta_version())); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("dn:l:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("dn:l:")); int opt; int debug = 0; @@ -481,7 +481,7 @@ run_main (int argc, ACE_TCHAR *argv[]) } // Sanity checks. - ACE_ASSERT (sizeof (ACE_CDR::Boolean) >= 1); + ACE_ASSERT (sizeof (ACE_CDR::Boolean) == 1); ACE_ASSERT (sizeof (ACE_CDR::Octet) == 1); ACE_ASSERT (sizeof (ACE_CDR::WChar) >= 2); ACE_ASSERT (sizeof (ACE_CDR::Short) == 2); @@ -565,4 +565,3 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_END_TEST; return 0; } - diff --git a/tests/Cache_Map_Manager_Test.cpp b/tests/Cache_Map_Manager_Test.cpp index 400235216e0..bf470ce3bd4 100644 --- a/tests/Cache_Map_Manager_Test.cpp +++ b/tests/Cache_Map_Manager_Test.cpp @@ -475,7 +475,7 @@ test_caching_strategy_type (void) static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("c:i:r:f:p:d")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("c:i:r:f:p:d")); int cc; while ((cc = get_opt ()) != -1) @@ -595,4 +595,3 @@ run_main (int argc, ACE_TCHAR *argv[]) return 0; } - diff --git a/tests/Cached_Accept_Conn_Test.cpp b/tests/Cached_Accept_Conn_Test.cpp index 64717629458..0b99b19f30d 100644 --- a/tests/Cached_Accept_Conn_Test.cpp +++ b/tests/Cached_Accept_Conn_Test.cpp @@ -381,7 +381,7 @@ test_caching_strategy_type (void) int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("l:i:p:c:a:d")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("l:i:p:c:a:d")); int cc; diff --git a/tests/Cached_Conn_Test.cpp b/tests/Cached_Conn_Test.cpp index d67d84a5988..c5149f84701 100644 --- a/tests/Cached_Conn_Test.cpp +++ b/tests/Cached_Conn_Test.cpp @@ -358,7 +358,7 @@ test_caching_strategy_type (void) int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("l:i:p:c:a:d")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("l:i:p:c:a:d")); int cc; diff --git a/tests/Config_Test.cpp b/tests/Config_Test.cpp index 4cf08965fcb..110091b67af 100644 --- a/tests/Config_Test.cpp +++ b/tests/Config_Test.cpp @@ -979,7 +979,7 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original) // we're not equal if we cannot get rhs int rc = false; - ACE_OS::sprintf (int_value, ACE_LIB_TEXT ("%08x"), intValue); + ACE_OS::sprintf (int_value, ACE_TEXT ("%08x"), intValue); originalString = int_value; } else if (originalType == ACE_Configuration::BINARY) @@ -1001,10 +1001,10 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original) while (binary_length) { if (ptr != binary_data) - originalString += ACE_LIB_TEXT (","); + originalString += ACE_TEXT (","); ACE_OS::sprintf (bin_value, - ACE_LIB_TEXT ("%02x"), + ACE_TEXT ("%02x"), *ptr); originalString += bin_value; --binary_length; diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp index 2e808d4497b..a9bc906fb18 100644 --- a/tests/Conn_Test.cpp +++ b/tests/Conn_Test.cpp @@ -726,7 +726,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_START_TEST (ACE_TEXT ("Conn_Test")); int status = 0; - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("c:i:s:")); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("c:i:s:")); for (int c; (c = getopt ()) != -1; ) switch (c) { diff --git a/tests/Dirent_Test.cpp b/tests/Dirent_Test.cpp index 19c6e554b41..d8353bc3bae 100644 --- a/tests/Dirent_Test.cpp +++ b/tests/Dirent_Test.cpp @@ -202,7 +202,7 @@ dirent_count (const ACE_TCHAR *dir_path, #if !defined (ACE_LACKS_STRUCT_DIR) && !defined (__BORLANDC__) ACE_OS::strncpy (tname, - ACE_TEXT_CHAR_TO_TCHAR (directory->d_name), + ACE_TEXT_TO_TCHAR_IN (directory->d_name), maxnamlen); #else ACE_OS::strncpy (tname, directory->d_name, maxnamlen); diff --git a/tests/Enum_Interfaces_Test.cpp b/tests/Enum_Interfaces_Test.cpp index b9bd438c6c0..0ef53a9942c 100644 --- a/tests/Enum_Interfaces_Test.cpp +++ b/tests/Enum_Interfaces_Test.cpp @@ -63,7 +63,7 @@ run_main (int, ACE_TCHAR *[]) for (size_t i = 0; i < how_many; i++) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\t%s\n"), - ACE_TEXT_CHAR_TO_TCHAR (the_addr_array[i].get_host_addr ()))); + ACE_TEXT_TO_TCHAR_IN (the_addr_array[i].get_host_addr ()))); delete [] the_addr_array; } diff --git a/tests/Env_Value_Test.cpp b/tests/Env_Value_Test.cpp index c7a81909aa9..63d6063957d 100644 --- a/tests/Env_Value_Test.cpp +++ b/tests/Env_Value_Test.cpp @@ -110,9 +110,8 @@ run_main (int argc, ACE_TCHAR * [], ACE_TCHAR *envp[]) const ACE_TCHAR *defstr = ACE_TEXT ("Sarah Cleeland is Two!"); ACE_Env_Value<const ACE_TCHAR *> sval (ACE_TEXT ("This_Shouldnt_Be_Set_Hopefully"), defstr); - ACE_ASSERT (ACE_OS::strcmp (sval, defstr) == 0); + ACE_ASSERT (ACE_OS::strcmp (static_cast<const ACE_TCHAR *>(sval), defstr) == 0); ACE_END_TEST; } return 0; } - diff --git a/tests/Get_Opt_Test.cpp b/tests/Get_Opt_Test.cpp index b34c9e64f2f..cba53d53e40 100644 --- a/tests/Get_Opt_Test.cpp +++ b/tests/Get_Opt_Test.cpp @@ -7,7 +7,7 @@ // // = DESCRIPTION // This program tests both the short and long option support in -// <ACE_Get_Opt>, and demonstrates how to use it. +// <ACE_Get_Arg_Opt<ACE_TCHAR> >, and demonstrates how to use it. // // = AUTHOR // Don Hinton <dhinton@dresystems.com> @@ -25,7 +25,7 @@ ACE_RCSID(tests, Get_Opt_Test, "$Id$") /* * This is the heart of the test. It sets up the optstring, instantiates - * ACE_Get_Opt, add long options, processes them in a loop, and prints out + * ACE_Get_Arg_Opt<ACE_TCHAR> , add long options, processes them in a loop, and prints out * the results to the log. * * It returns 0 for success and 1 for error so we can keep track of the @@ -65,7 +65,7 @@ parse_args (int test_number, ACE_ARGV args (test.c_str ()); - ACE_Get_Opt get_opt (args.argc (), + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (args.argc (), args.argv (), optstring.c_str (), skip_argv, @@ -75,31 +75,31 @@ parse_args (int test_number, // Now add the default long args. if (get_opt.long_option (ACE_TEXT ("flag"), 'f', - ACE_Get_Opt::NO_ARG) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::NO_ARG) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add long option 'f' \n")), 1); if (get_opt.long_option (ACE_TEXT ("requires_arg"), 'r', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add long option 'r' \n")), 1); if (get_opt.long_option (ACE_TEXT ("optional_arg"), 'o', - ACE_Get_Opt::ARG_OPTIONAL) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_OPTIONAL) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add long option 'o' \n")), 1); if (get_opt.long_option (ACE_TEXT ("long_option"), 'l', - ACE_Get_Opt::ARG_OPTIONAL) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_OPTIONAL) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add long option 'l' \n")), 1); if (get_opt.long_option (ACE_TEXT ("long_only"), -11, - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add long option ") ACE_TEXT ("\"long_only\" \n")), 1); @@ -115,7 +115,7 @@ parse_args (int test_number, // (afterall, there are only so many alpha numeric characters available). if (get_opt.long_option (ACE_TEXT ("non_alpha-num_short"), -10, - ACE_Get_Opt::ARG_OPTIONAL) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_OPTIONAL) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add long option ") ACE_TEXT ("\"non_alpha_short\" \n")), 1); @@ -337,9 +337,9 @@ run_main (int, ACE_TCHAR *argv[]) int test_number = 0; // Run the tests for each type of ordering. - retval = run_test (test_number, ACE_Get_Opt::PERMUTE_ARGS); - retval += run_test (test_number, ACE_Get_Opt::REQUIRE_ORDER); - retval += run_test (test_number, ACE_Get_Opt::RETURN_IN_ORDER); + retval = run_test (test_number, ACE_Get_Arg_Opt<ACE_TCHAR> ::PERMUTE_ARGS); + retval += run_test (test_number, ACE_Get_Arg_Opt<ACE_TCHAR> ::REQUIRE_ORDER); + retval += run_test (test_number, ACE_Get_Arg_Opt<ACE_TCHAR> ::RETURN_IN_ORDER); ACE_END_TEST; return retval; diff --git a/tests/HTBP/Reactor_Tests/client.cpp b/tests/HTBP/Reactor_Tests/client.cpp index 2813d9116f3..a3cafc76e49 100644 --- a/tests/HTBP/Reactor_Tests/client.cpp +++ b/tests/HTBP/Reactor_Tests/client.cpp @@ -29,7 +29,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) #endif /* 0 */ ACE::HTBP::ID_Requestor req (&env); - ACE::HTBP::Addr local = ACE_TEXT_ALWAYS_CHAR(req.get_HTID()); + ACE::HTBP::Addr local = ACE_TEXT_TO_CHAR_IN(req.get_HTID()); unsigned remote_port = 8088; const ACE_TCHAR * remote_host = argv[1]; @@ -48,7 +48,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } ACE_INET_Addr proxy(proxy_port,proxy_host.c_str()); - ACE::HTBP::Addr remote (remote_port,ACE_TEXT_ALWAYS_CHAR(remote_host)); + ACE::HTBP::Addr remote (remote_port,ACE_TEXT_TO_CHAR_IN(remote_host)); ACE::HTBP::Session session(remote,local,ACE::HTBP::Session::next_session_id(),&proxy); ACE::HTBP::Stream stream (&session); diff --git a/tests/HTBP/Reactor_Tests/test_config.h b/tests/HTBP/Reactor_Tests/test_config.h index efd4eb7bcc6..218399854f3 100644 --- a/tests/HTBP/Reactor_Tests/test_config.h +++ b/tests/HTBP/Reactor_Tests/test_config.h @@ -43,7 +43,7 @@ #undef ACE_NDEBUG #undef ACE_TEXT -#define ACE_TEXT ACE_LIB_TEXT +#define ACE_TEXT ACE_TEXT #if defined (ACE_HAS_WINCE) // Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'. @@ -251,7 +251,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - this->output_file_->open (ACE_TEXT_ALWAYS_CHAR (temp), + this->output_file_->open (ACE_TEXT_TO_CHAR_IN (temp), ios::out | (append ? ios::app : ios::trunc)); if (this->output_file_->bad ()) return -1; diff --git a/tests/HTBP/Send_Large_Msg/client.cpp b/tests/HTBP/Send_Large_Msg/client.cpp index 62cd9140da8..4f1fafd8618 100644 --- a/tests/HTBP/Send_Large_Msg/client.cpp +++ b/tests/HTBP/Send_Large_Msg/client.cpp @@ -32,7 +32,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE::HTBP::ID_Requestor req (&env); - ACE::HTBP::Addr local(ACE_TEXT_ALWAYS_CHAR(req.get_HTID())); + ACE::HTBP::Addr local(ACE_TEXT_TO_CHAR_IN(req.get_HTID())); unsigned remote_port = 8088; const ACE_TCHAR * remote_host = argv[1]; @@ -51,7 +51,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } ACE_INET_Addr proxy(proxy_port,proxy_host.c_str()); - ACE::HTBP::Addr remote (remote_port,ACE_TEXT_ALWAYS_CHAR(remote_host)); + ACE::HTBP::Addr remote (remote_port,ACE_TEXT_TO_CHAR_IN(remote_host)); ACE::HTBP::Session session(remote, local, diff --git a/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp b/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp index d462a11c3d3..d670dfab39e 100644 --- a/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp +++ b/tests/HTBP/Send_Recv_Tests/SendRecv_Test.cpp @@ -69,7 +69,7 @@ client (void *arg) #endif /* 0 */ ACE::HTBP::ID_Requestor req (&ht_env); - ACE::HTBP::Addr local(ACE_TEXT_ALWAYS_CHAR(req.get_HTID())); + ACE::HTBP::Addr local(ACE_TEXT_TO_CHAR_IN(req.get_HTID())); char hostname [128]; @@ -94,7 +94,7 @@ client (void *arg) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) connected to %s\n"), - ACE_TEXT_CHAR_TO_TCHAR(remote.get_host_name ()))); + ACE_TEXT_TO_TCHAR_IN(remote.get_host_name ()))); //******************* TEST 1 ****************************** // @@ -230,7 +230,7 @@ server (void *arg) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) client %s connected from %d\n"), - ACE_TEXT_CHAR_TO_TCHAR(cli_addr.get_host_name ()), + ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()), cli_addr.get_port_number ())); //******************* TEST 1 ****************************** diff --git a/tests/HTBP/ping/client.cpp b/tests/HTBP/ping/client.cpp index e7753faab6d..e50fbd9a207 100644 --- a/tests/HTBP/ping/client.cpp +++ b/tests/HTBP/ping/client.cpp @@ -30,7 +30,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE::HTBP::ID_Requestor req (&env); - ACE::HTBP::Addr local(ACE_TEXT_ALWAYS_CHAR(req.get_HTID())); + ACE::HTBP::Addr local(ACE_TEXT_TO_CHAR_IN(req.get_HTID())); unsigned remote_port = 8088; const ACE_TCHAR * remote_host = argv[1]; @@ -49,7 +49,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } ACE_INET_Addr proxy(proxy_port,proxy_host.c_str()); - ACE::HTBP::Addr remote (remote_port,ACE_TEXT_ALWAYS_CHAR(remote_host)); + ACE::HTBP::Addr remote (remote_port,ACE_TEXT_TO_CHAR_IN(remote_host)); ACE::HTBP::Session session(remote, local, diff --git a/tests/Hash_Map_Bucket_Iterator_Test.cpp b/tests/Hash_Map_Bucket_Iterator_Test.cpp index ab1cae561df..caf7d0c4acb 100644 --- a/tests/Hash_Map_Bucket_Iterator_Test.cpp +++ b/tests/Hash_Map_Bucket_Iterator_Test.cpp @@ -32,7 +32,7 @@ static ACE_UINT32 table_size = ACE_MAX_ITERATIONS; int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("t:i:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("t:i:")); int cc; @@ -119,4 +119,3 @@ run_main (int argc, ACE_TCHAR *argv[]) return 0; } - diff --git a/tests/High_Res_Timer_Test.cpp b/tests/High_Res_Timer_Test.cpp index 5398157d8d3..c0ab6b4352e 100644 --- a/tests/High_Res_Timer_Test.cpp +++ b/tests/High_Res_Timer_Test.cpp @@ -114,7 +114,7 @@ run_main (int argc, ACE_TCHAR *argv[]) u_int iterations = 1; - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("i:")); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("i:")); for (int c; (c = getopt ()) != -1; ) switch (c) { diff --git a/tests/INET_Addr_Test_IPV6.cpp b/tests/INET_Addr_Test_IPV6.cpp index 134119ae7b9..b8694c208b8 100644 --- a/tests/INET_Addr_Test_IPV6.cpp +++ b/tests/INET_Addr_Test_IPV6.cpp @@ -139,7 +139,7 @@ int run_main (int argc, ACE_TCHAR *argv[]) #if defined (__linux__) // test a link local address to make sure the set_interface method works ACE_INET_Addr link_local_addr (80, LINK_LOCAL_ADDR); - if (0 != ACE_OS::strcmp (ACE_TEXT_CHAR_TO_TCHAR(link_local_addr.get_host_addr ()), + if (0 != ACE_OS::strcmp (ACE_TEXT_TO_TCHAR_IN(link_local_addr.get_host_addr ()), LINK_LOCAL_ADDR)) { ACE_ERROR ((LM_ERROR, diff --git a/tests/IOStream_Test.cpp b/tests/IOStream_Test.cpp index cd3c42a46a0..7966f9e4082 100644 --- a/tests/IOStream_Test.cpp +++ b/tests/IOStream_Test.cpp @@ -189,7 +189,7 @@ client (void *arg = 0) // Send a string to the server which it can interpret as a qchar[] const char *str = "\"This is a test string.\""; ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%P|%t) Client Sending: (%s)\n"), - ACE_TEXT_CHAR_TO_TCHAR (str))); + ACE_TEXT_TO_TCHAR_IN (str))); server << str << endl; // Allow the server to get the string and echo it to the user. (The @@ -324,7 +324,7 @@ server (void *arg = 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%P|%t) Server Received: (\"%s\")\n"), - ACE_TEXT_CHAR_TO_TCHAR ((char *) qbuf))); + ACE_TEXT_TO_TCHAR_IN ((char *) qbuf))); // Give the client time to announce the next test to the user. ACE_OS::sleep (2); @@ -365,7 +365,7 @@ server (void *arg = 0) break; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s "), - ACE_TEXT_CHAR_TO_TCHAR (buf))); + ACE_TEXT_TO_TCHAR_IN (buf))); } ACE_DEBUG ((LM_DEBUG, @@ -499,4 +499,3 @@ run_main (int, ACE_TCHAR *[]) ACE_END_TEST; return 0; } - diff --git a/tests/Log_Msg_Test.cpp b/tests/Log_Msg_Test.cpp index 3dac88cf9f0..75545831db8 100644 --- a/tests/Log_Msg_Test.cpp +++ b/tests/Log_Msg_Test.cpp @@ -373,7 +373,7 @@ test_ostream (void) #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) // Create a persistent store. const ACE_TCHAR *filename = ACE_TEXT ("output"); - ofstream myostream (ACE_TEXT_ALWAYS_CHAR (filename), ios::out | ios::trunc); + ofstream myostream (ACE_TEXT_TO_CHAR_IN (filename), ios::out | ios::trunc); // Check for errors. if (myostream.bad ()) @@ -604,4 +604,3 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_END_TEST; return status; } - diff --git a/tests/Logging_Strategy_Test.cpp b/tests/Logging_Strategy_Test.cpp index 2a53c83606f..132c335e826 100644 --- a/tests/Logging_Strategy_Test.cpp +++ b/tests/Logging_Strategy_Test.cpp @@ -338,7 +338,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Specifications:\n"))); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("s:i:m:f:N:ow")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("s:i:m:f:N:ow")); int c; while ((c = get_opt ()) != EOF) diff --git a/tests/MEM_Stream_Test.cpp b/tests/MEM_Stream_Test.cpp index d581fd46180..34a853b61a0 100644 --- a/tests/MEM_Stream_Test.cpp +++ b/tests/MEM_Stream_Test.cpp @@ -469,7 +469,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_OS::sprintf(lognm, ACE_TEXT ("MEM_Stream_Test-%d"), mypid); ACE_START_TEST (lognm); - ACE_Get_Opt opts (argc, argv, ACE_TEXT ("p:rm")); + ACE_Get_Arg_Opt<ACE_TCHAR> opts (argc, argv, ACE_TEXT ("p:rm")); int opt, iport, status; ACE_MEM_IO::Signal_Strategy model = ACE_MEM_IO::Reactive; diff --git a/tests/MT_Reactor_Upcall_Test.cpp b/tests/MT_Reactor_Upcall_Test.cpp index 49c203b5f2c..532fe5de17e 100644 --- a/tests/MT_Reactor_Upcall_Test.cpp +++ b/tests/MT_Reactor_Upcall_Test.cpp @@ -266,7 +266,7 @@ test_reactor_upcall (ACE_Reactor &reactor) int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("t:m:s:l:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("t:m:s:l:")); int c; diff --git a/tests/MT_Reference_Counted_Event_Handler_Test.cpp b/tests/MT_Reference_Counted_Event_Handler_Test.cpp index f2e52a5c24f..3254114ce9e 100644 --- a/tests/MT_Reference_Counted_Event_Handler_Test.cpp +++ b/tests/MT_Reference_Counted_Event_Handler_Test.cpp @@ -1240,7 +1240,7 @@ test<REACTOR_IMPL>::test (int ignore_nested_upcalls, static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:d:f:g:k:l:m:n:o:uz:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("a:b:c:d:f:g:k:l:m:n:o:uz:")); int cc; while ((cc = get_opt ()) != -1) diff --git a/tests/MT_Reference_Counted_Notify_Test.cpp b/tests/MT_Reference_Counted_Notify_Test.cpp index 713e81d6a5e..e9c60d8f750 100644 --- a/tests/MT_Reference_Counted_Notify_Test.cpp +++ b/tests/MT_Reference_Counted_Notify_Test.cpp @@ -319,7 +319,7 @@ test<REACTOR_IMPLEMENTATION>::test (int extra_iterations_needed) static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:d:e:f:g:z:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("a:b:c:d:e:f:g:z:")); int cc; while ((cc = get_opt ()) != -1) diff --git a/tests/MT_SOCK_Test.cpp b/tests/MT_SOCK_Test.cpp index eb407f5f596..dd44f380df0 100644 --- a/tests/MT_SOCK_Test.cpp +++ b/tests/MT_SOCK_Test.cpp @@ -236,8 +236,9 @@ server (void *arg) ++num_clients_connected; ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server: Client %C connected from %d\n"), - cli_addr.get_host_name (), + + ACE_TEXT ("(%P|%t) server: Client %s connected from %d\n"), + ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()), cli_addr.get_port_number ())); // Enable non-blocking I/O. diff --git a/tests/Manual_Event_Test.cpp b/tests/Manual_Event_Test.cpp index 1b28d846a71..4b70d2ef44e 100644 --- a/tests/Manual_Event_Test.cpp +++ b/tests/Manual_Event_Test.cpp @@ -74,7 +74,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("w:n:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("w:n:")); int c; diff --git a/tests/Message_Block_Test.cpp b/tests/Message_Block_Test.cpp index 3757c3c9f2c..88bab4a2d00 100644 --- a/tests/Message_Block_Test.cpp +++ b/tests/Message_Block_Test.cpp @@ -124,7 +124,7 @@ Worker_Task::svc (void) // message here. else if (length > 0) { - int current_count = ACE_OS::atoi (ACE_TEXT_CHAR_TO_TCHAR (mb->rd_ptr ())); + int current_count = ACE_OS::atoi (ACE_TEXT_TO_TCHAR_IN (mb->rd_ptr ())); int i; ACE_ASSERT (count == current_count); @@ -166,7 +166,9 @@ Worker_Task::svc (void) { int deqresult = this->msg_queue ()->dequeue_head (dup); ACE_ASSERT (deqresult != -1); - ACE_ASSERT (count == ACE_OS::atoi (ACE_TEXT_CHAR_TO_TCHAR (dup->rd_ptr ()))); + //ACE_ASSERT (this->msg_queue ()->dequeue_head (dup) != -1); + ACE_ASSERT (count == ACE_OS::atoi (ACE_TEXT_TO_TCHAR_IN (dup->rd_ptr ()))); + ACE_ASSERT (ACE_OS::strcmp (mb->rd_ptr (), dup->rd_ptr ()) == 0); ACE_ASSERT (dup->msg_priority () == ACE_DEFAULT_MESSAGE_BLOCK_PRIORITY + 1); dup->release (); diff --git a/tests/Multicast_Test.cpp b/tests/Multicast_Test.cpp index 8613c1a498b..9a3b5e7e994 100644 --- a/tests/Multicast_Test.cpp +++ b/tests/Multicast_Test.cpp @@ -156,64 +156,64 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[]) int retval = 0; int help = 0; - ACE_Get_Opt getopt (argc, argv, ACE_TEXT (":?"), 1, 1); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT (":?"), 1, 1); if (getopt.long_option (ACE_TEXT ("GroupStart"), 'g', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add GroupStart option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Groups"), 'n', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add Groups option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Debug"), 'd', - ACE_Get_Opt::NO_ARG) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::NO_ARG) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add Debug option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Role"), 'r', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add Role option.\n")), 1); if (getopt.long_option (ACE_TEXT ("SDM_options"), 'm', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add Multicast_Options option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Iterations"), 'i', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add iterations option.\n")), 1); if (getopt.long_option (ACE_TEXT ("TTL"), 't', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add TTL option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Wait"), 'w', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add wait option.\n")), 1); if (getopt.long_option (ACE_TEXT ("help"), 'h', - ACE_Get_Opt::NO_ARG) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::NO_ARG) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add help option.\n")), 1); diff --git a/tests/Multicast_Test_IPV6.cpp b/tests/Multicast_Test_IPV6.cpp index fd7d1705a92..397e7f5454d 100644 --- a/tests/Multicast_Test_IPV6.cpp +++ b/tests/Multicast_Test_IPV6.cpp @@ -160,64 +160,64 @@ MCT_Config::open (int argc, ACE_TCHAR *argv[]) int retval = 0; int help = 0; - ACE_Get_Opt getopt (argc, argv, ACE_TEXT (":?"), 1, 1); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT (":?"), 1, 1); if (getopt.long_option (ACE_TEXT ("GroupStart"), 'g', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add GroupStart option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Groups"), 'n', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add Groups option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Debug"), 'd', - ACE_Get_Opt::NO_ARG) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::NO_ARG) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add Debug option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Role"), 'r', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add Role option.\n")), 1); if (getopt.long_option (ACE_TEXT ("SDM_options"), 'm', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add Multicast_Options option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Iterations"), 'i', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add iterations option.\n")), 1); if (getopt.long_option (ACE_TEXT ("TTL"), 't', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add TTL option.\n")), 1); if (getopt.long_option (ACE_TEXT ("Wait"), 'w', - ACE_Get_Opt::ARG_REQUIRED) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::ARG_REQUIRED) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add wait option.\n")), 1); if (getopt.long_option (ACE_TEXT ("help"), 'h', - ACE_Get_Opt::NO_ARG) != 0) + ACE_Get_Arg_Opt<ACE_TCHAR> ::NO_ARG) != 0) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (" Unable to add help option.\n")), 1); diff --git a/tests/Multihomed_INET_Addr_Test_IPV6.cpp b/tests/Multihomed_INET_Addr_Test_IPV6.cpp index 1607dd81fb2..7427a757e0d 100644 --- a/tests/Multihomed_INET_Addr_Test_IPV6.cpp +++ b/tests/Multihomed_INET_Addr_Test_IPV6.cpp @@ -96,7 +96,7 @@ int run_main (int argc, ACE_TCHAR *argv[]) } // Check the primary address - if (0 != ACE_OS::strcmp (ACE_TEXT_CHAR_TO_TCHAR(addr.get_host_addr()), primary_ipv6)) + if (0 != ACE_OS::strcmp (ACE_TEXT_TO_TCHAR_IN(addr.get_host_addr()), primary_ipv6)) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("%s failed get_host_addr() check\n") diff --git a/tests/Network_Adapters_Test.cpp b/tests/Network_Adapters_Test.cpp index 882ac59118c..c8714a13b3e 100644 --- a/tests/Network_Adapters_Test.cpp +++ b/tests/Network_Adapters_Test.cpp @@ -939,7 +939,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) return 0; } - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("b:p:t:w:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("b:p:t:w:")); int c, counter = 0; ACE_INET_Addr b_temp_addr; ACE_TCHAR *token = 0; diff --git a/tests/NonBlocking_Conn_Test.cpp b/tests/NonBlocking_Conn_Test.cpp index 1b4dfa8a884..6512190cd31 100644 --- a/tests/NonBlocking_Conn_Test.cpp +++ b/tests/NonBlocking_Conn_Test.cpp @@ -168,7 +168,7 @@ test (ACE_Reactor_Impl *impl) else ACE_DEBUG ((LM_INFO, ACE_TEXT ("%p\n"), - ACE_TEXT_CHAR_TO_TCHAR (hosts[i]))); + ACE_TEXT_TO_TCHAR_IN (hosts[i]))); } ACE_Reactor reactor (impl, @@ -237,7 +237,7 @@ test (ACE_Reactor_Impl *impl) static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("a:b:c:")); int cc; while ((cc = get_opt ()) != -1) @@ -316,4 +316,3 @@ run_main (int argc, ACE_TCHAR *argv[]) return 0; } - diff --git a/tests/Notify_Performance_Test.cpp b/tests/Notify_Performance_Test.cpp index b812630a065..0c88866e808 100644 --- a/tests/Notify_Performance_Test.cpp +++ b/tests/Notify_Performance_Test.cpp @@ -166,7 +166,7 @@ run_main (int argc, ACE_TCHAR *argv[]) { ACE_START_TEST (ACE_TEXT ("Notify_Performance_Test")); - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("pswdc:l:")); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("pswdc:l:")); for (int c; (c = getopt ()) != -1; ) switch (c) diff --git a/tests/OS_Test.cpp b/tests/OS_Test.cpp index fa7b058e4e4..866ce0cd03d 100644 --- a/tests/OS_Test.cpp +++ b/tests/OS_Test.cpp @@ -284,7 +284,6 @@ string_emulation_test (void) "-4566733") == 0); } -#if defined (ACE_HAS_WCHAR) { // ======================================================================== // Test itoa (wchar_t version) @@ -519,7 +518,6 @@ string_emulation_test (void) } -#endif /* ACE_HAS_WCHAR */ return 0; } @@ -661,7 +659,6 @@ string_strsncpy_test (void) } -#if defined (ACE_HAS_WCHAR) { // Test strsncpy (wchar_t version) ACE_DEBUG ((LM_DEBUG, @@ -728,7 +725,6 @@ string_strsncpy_test (void) // size should be 9 (+ '\0' char) ACE_ASSERT(ACE_OS::strlen(strsncpy2) == 9); } -#endif /* ACE_HAS_WCHAR */ return 0; } @@ -738,7 +734,6 @@ string_strsncpy_test (void) int string_convert_test (void) { -#if defined (ACE_HAS_WCHAR) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing narrow/wide string conversion\n"))); @@ -749,28 +744,28 @@ string_convert_test (void) const wchar_t *test2_w = ACE_TEXT_WIDE ("\xe9\xe8\xe0\xf9\xea"); wchar_t str_w[10]; char str_n[10]; - ACE_OS::strcpy (str_w, ACE_Ascii_To_Wide (test1_n).wchar_rep ()); + ACE_OS::strcpy (str_w, ACE_TEXT_TO_WCHAR_IN (test1_n)); if (0 != ACE_OS::strcmp (test1_w, str_w)) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Simple narrow->wide failed: ") ACE_TEXT ("Expected \"%W\"; Got \"%W\"\n"), test1_w, str_w)); result = 1; } - ACE_OS::strcpy (str_n, ACE_Wide_To_Ascii (test1_w).char_rep ()); + ACE_OS::strcpy (str_n, ACE_TEXT_TO_CHAR_IN (test1_w)); if (0 != ACE_OS::strcmp (test1_n, str_n)) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Simple wide->narrow failed: ") ACE_TEXT ("Expected \"%C\"; Got \"%C\"\n"), test1_n, str_n)); result = 1; } - ACE_OS::strcpy (str_w, ACE_Ascii_To_Wide (test2_n).wchar_rep ()); + ACE_OS::strcpy (str_w, ACE_TEXT_TO_WCHAR_IN (test2_n)); if (0 != ACE_OS::strcmp (test2_w, str_w)) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Complex narrow->wide failed: ") ACE_TEXT ("Expected \"%W\"; Got \"%W\"\n"), test2_w, str_w)); result = 1; } - ACE_OS::strcpy (str_n, ACE_Wide_To_Ascii (test2_w).char_rep ()); + ACE_OS::strcpy (str_n, ACE_TEXT_TO_CHAR_IN (test2_w)); if (0 != ACE_OS::strcmp (test2_n, str_n)) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Complex wide->narrow failed: ") @@ -778,9 +773,6 @@ string_convert_test (void) result = 1; } return result; -#else - return 0; -#endif /* ACE_HAS_WCHAR */ } // Test the methods for getting cpu info diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp index bf722c921b9..adef9bc3af5 100644 --- a/tests/Pipe_Test.cpp +++ b/tests/Pipe_Test.cpp @@ -51,7 +51,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("dci:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("dci:")); int c; diff --git a/tests/Priority_Reactor_Test.cpp b/tests/Priority_Reactor_Test.cpp index b790b78b21c..e3be61e1c80 100644 --- a/tests/Priority_Reactor_Test.cpp +++ b/tests/Priority_Reactor_Test.cpp @@ -238,7 +238,7 @@ run_main (int argc, ACE_TCHAR *argv[]) { ACE_START_TEST (ACE_TEXT ("Priority_Reactor_Test")); - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("dc:l:m:t:")); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("dc:l:m:t:")); for (int c; (c = getopt ()) != -1; ) switch (c) @@ -394,4 +394,3 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_END_TEST; return 0; } - diff --git a/tests/Proactor_Scatter_Gather_Test.cpp b/tests/Proactor_Scatter_Gather_Test.cpp index a3cbb335a34..830d405f6e3 100644 --- a/tests/Proactor_Scatter_Gather_Test.cpp +++ b/tests/Proactor_Scatter_Gather_Test.cpp @@ -1323,7 +1323,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) if (argc == 1) // no arguments , so one button test return 0; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:csh:p:u")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("f:csh:p:u")); int c; while ((c = get_opt ()) != EOF) diff --git a/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp index 9d739b2d5e3..cf7d81d314d 100644 --- a/tests/Proactor_Test.cpp +++ b/tests/Proactor_Test.cpp @@ -1104,8 +1104,8 @@ Connector::start (const ACE_INET_Addr& addr, int num) if (this->open (1, 0, 1) != 0) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("(%t) %p\n"), - ACE_LIB_TEXT ("Connector::open failed"))); + ACE_TEXT ("(%t) %p\n"), + ACE_TEXT ("Connector::open failed"))); return rc; } @@ -1799,7 +1799,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) if (argc == 1) // no arguments , so one button test return 0; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("x:t:o:n:p:d:h:c:v:ub")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("x:t:o:n:p:d:h:c:v:ub")); int c; while ((c = get_opt ()) != EOF) diff --git a/tests/Proactor_Test_IPV6.cpp b/tests/Proactor_Test_IPV6.cpp index 7ac9443d0ae..d82a63374b6 100644 --- a/tests/Proactor_Test_IPV6.cpp +++ b/tests/Proactor_Test_IPV6.cpp @@ -1104,8 +1104,8 @@ Connector::start (const ACE_INET_Addr& addr, int num) if (this->open (1, 0, 1) != 0) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("(%t) %p\n"), - ACE_LIB_TEXT ("Connector::open failed"))); + ACE_TEXT ("(%t) %p\n"), + ACE_TEXT ("Connector::open failed"))); return rc; } @@ -1843,7 +1843,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) if (argc == 1) // no arguments , so one button test return 0; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("x:t:o:n:p:d:h:c:v:ub")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("x:t:o:n:p:d:h:c:v:ub")); int c; while ((c = get_opt ()) != EOF) diff --git a/tests/Proactor_Timer_Test.cpp b/tests/Proactor_Timer_Test.cpp index da61f142143..9b2e282fcab 100644 --- a/tests/Proactor_Timer_Test.cpp +++ b/tests/Proactor_Timer_Test.cpp @@ -112,7 +112,7 @@ test_registering_all_handlers (void) { ACE_Trace t (ACE_TEXT ("test_registering_all_handler"), __LINE__, - ACE_TEXT_CHAR_TO_TCHAR (__FILE__)); + ACE_TEXT_TO_TCHAR_IN (__FILE__)); Time_Handler rt[ACE_MAX_TIMERS]; long t_id[ACE_MAX_TIMERS]; size_t which[ACE_MAX_TIMERS]; @@ -138,7 +138,7 @@ test_registering_one_handler (void) { ACE_Trace t (ACE_TEXT ("test_registering_one_handler"), __LINE__, - ACE_TEXT_CHAR_TO_TCHAR (__FILE__)); + ACE_TEXT_TO_TCHAR_IN (__FILE__)); Time_Handler rt[ACE_MAX_TIMERS]; long t_id[ACE_MAX_TIMERS]; size_t which[ACE_MAX_TIMERS]; @@ -166,7 +166,7 @@ test_canceling_odd_timers (void) { ACE_Trace t (ACE_TEXT ("test_canceling_odd_timers"), __LINE__, - ACE_TEXT_CHAR_TO_TCHAR (__FILE__)); + ACE_TEXT_TO_TCHAR_IN (__FILE__)); Time_Handler rt[ACE_MAX_TIMERS]; long t_id[ACE_MAX_TIMERS]; size_t which[ACE_MAX_TIMERS]; diff --git a/tests/Process_Manager_Test.cpp b/tests/Process_Manager_Test.cpp index f9ce72afc5a..123018b9377 100644 --- a/tests/Process_Manager_Test.cpp +++ b/tests/Process_Manager_Test.cpp @@ -105,7 +105,7 @@ const ACE_TCHAR *cmdline_format = ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR ACE int run_main (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt args (argc, argv, ACE_TEXT ("d")); + ACE_Get_Arg_Opt<ACE_TCHAR> args (argc, argv, ACE_TEXT ("d")); for (int arg = args (); arg != EOF; arg = args ()) switch (arg) diff --git a/tests/Process_Manual_Event_Test.cpp b/tests/Process_Manual_Event_Test.cpp index b697743273b..bd7255912f2 100644 --- a/tests/Process_Manual_Event_Test.cpp +++ b/tests/Process_Manual_Event_Test.cpp @@ -53,7 +53,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("i:c")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("i:c")); int c; diff --git a/tests/Process_Mutex_Test.cpp b/tests/Process_Mutex_Test.cpp index e70cd8adede..9516868c194 100644 --- a/tests/Process_Mutex_Test.cpp +++ b/tests/Process_Mutex_Test.cpp @@ -51,7 +51,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("dcn:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("dcn:")); int c; diff --git a/tests/Process_Semaphore_Test.cpp b/tests/Process_Semaphore_Test.cpp index af08108ad75..d1086485656 100644 --- a/tests/Process_Semaphore_Test.cpp +++ b/tests/Process_Semaphore_Test.cpp @@ -55,7 +55,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("i:c")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("i:c")); int c; @@ -80,11 +80,11 @@ acquire_release (void) #if defined (ACE_WIN32) || \ defined (ACE_USES_FIFO_SEM) || \ (defined (ACE_HAS_POSIX_SEM) && !defined (ACE_LACKS_NAMED_POSIX_SEM)) - ACE_Semaphore sema_ping (0, USYNC_PROCESS, ACE_TEXT_CHAR_TO_TCHAR (sema_ping_name)); - ACE_Semaphore sema_pong (0, USYNC_PROCESS, ACE_TEXT_CHAR_TO_TCHAR (sema_pong_name)); + ACE_Semaphore sema_ping (0, USYNC_PROCESS, ACE_TEXT_TO_TCHAR_IN (sema_ping_name)); + ACE_Semaphore sema_pong (0, USYNC_PROCESS, ACE_TEXT_TO_TCHAR_IN (sema_pong_name)); #else - ACE_Process_Semaphore sema_ping (0, ACE_TEXT_CHAR_TO_TCHAR (sema_ping_name)); - ACE_Process_Semaphore sema_pong (0, ACE_TEXT_CHAR_TO_TCHAR (sema_pong_name)); + ACE_Process_Semaphore sema_ping (0, ACE_TEXT_TO_TCHAR_IN (sema_ping_name)); + ACE_Process_Semaphore sema_pong (0, ACE_TEXT_TO_TCHAR_IN (sema_pong_name)); #endif // Make sure the constructor succeeded diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp index aca7cc2e7de..aade8ee53ea 100644 --- a/tests/Process_Strategy_Test.cpp +++ b/tests/Process_Strategy_Test.cpp @@ -64,8 +64,8 @@ ACE_RCSID(tests, Process_Strategy_Test, "$Id$") #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton<Options, ACE_Null_Mutex> * - ACE_Singleton<Options, ACE_Null_Mutex>::singleton_; + template ACE_Singleton<Options, ACE_Null_Mutex> * +ACE_Singleton<Options, ACE_Null_Mutex>::singleton_; #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */ @@ -169,7 +169,7 @@ Options::~Options (void) int Options::parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:c:f:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:c:f:")); // - 26 is for the "process_strategy_test_temp" that is appended if (ACE::get_temp_dir (this->filename_, MAXPATHLEN - 26) == -1) @@ -416,7 +416,7 @@ Counting_Service::handle_input (ACE_HANDLE) bytes, this->peer ().get_handle (), bytes, - ACE_TEXT_CHAR_TO_TCHAR (buf))); + ACE_TEXT_TO_TCHAR_IN (buf))); // Read and return the current value in the file. if (ACE_OS::strncmp (buf, "read", @@ -581,7 +581,7 @@ client (void *arg) // the call to ACE_OS::strrchr (). buf [bytes_read] = '\0'; - size_t count = ACE_OS::atoi (ACE_OS::strrchr (ACE_TEXT_CHAR_TO_TCHAR (buf), + size_t count = ACE_OS::atoi (ACE_OS::strrchr (ACE_TEXT_TO_TCHAR_IN (buf), ACE_TEXT (' '))); ACE_DEBUG ((LM_DEBUG, diff --git a/tests/Reactor_Dispatch_Order_Test.cpp b/tests/Reactor_Dispatch_Order_Test.cpp index d6263f091d3..91dfd8ad060 100644 --- a/tests/Reactor_Dispatch_Order_Test.cpp +++ b/tests/Reactor_Dispatch_Order_Test.cpp @@ -143,7 +143,9 @@ Handler::handle_input (ACE_HANDLE fd) ACE_ASSERT (result == ssize_t (ACE_OS::strlen (message))); buffer[result] = '\0'; - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Handler::handle_input: %C\n"), buffer)); + ACE_DEBUG ((LM_DEBUG, + "Handler::handle_input: %s\n", + ACE_TEXT_TO_TCHAR_IN (buffer))); ACE_ASSERT (ACE_OS::strcmp (buffer, message) == 0); diff --git a/tests/Reactor_Performance_Test.cpp b/tests/Reactor_Performance_Test.cpp index 7d5aacc6456..e3850d433c6 100644 --- a/tests/Reactor_Performance_Test.cpp +++ b/tests/Reactor_Performance_Test.cpp @@ -315,7 +315,7 @@ run_main (int argc, ACE_TCHAR *argv[]) { ACE_START_TEST (ACE_TEXT ("Reactor_Performance_Test")); - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("dswc:l:"), 1); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("dswc:l:"), 1); for (int c; (c = getopt ()) != -1; ) switch (c) { diff --git a/tests/Reactor_Timer_Test.cpp b/tests/Reactor_Timer_Test.cpp index 2225fd2fd31..dac6cb25142 100644 --- a/tests/Reactor_Timer_Test.cpp +++ b/tests/Reactor_Timer_Test.cpp @@ -129,7 +129,7 @@ test_registering_all_handlers (void) { ACE_Trace t (ACE_TEXT ("test_registering_all_handler"), __LINE__, - ACE_TEXT_CHAR_TO_TCHAR (__FILE__)); + ACE_TEXT_TO_TCHAR_IN (__FILE__)); Time_Handler rt[ACE_MAX_TIMERS]; long t_id[ACE_MAX_TIMERS]; @@ -152,7 +152,7 @@ test_registering_one_handler (void) { ACE_Trace t (ACE_TEXT ("test_registering_one_handler"), __LINE__, - ACE_TEXT_CHAR_TO_TCHAR (__FILE__)); + ACE_TEXT_TO_TCHAR_IN (__FILE__)); Time_Handler rt[ACE_MAX_TIMERS]; long t_id[ACE_MAX_TIMERS]; @@ -177,7 +177,7 @@ test_canceling_odd_timers (void) { ACE_Trace t (ACE_TEXT ("test_canceling_odd_timers"), __LINE__, - ACE_TEXT_CHAR_TO_TCHAR (__FILE__)); + ACE_TEXT_TO_TCHAR_IN (__FILE__)); Time_Handler rt[ACE_MAX_TIMERS]; long t_id[ACE_MAX_TIMERS]; @@ -214,7 +214,7 @@ test_resetting_timer_intervals (void) { ACE_Trace t (ACE_TEXT ("test_resetting_timer_intervals"), __LINE__, - ACE_TEXT_CHAR_TO_TCHAR (__FILE__)); + ACE_TEXT_TO_TCHAR_IN (__FILE__)); Time_Handler rt; long t_id; diff --git a/tests/Reader_Writer_Test.cpp b/tests/Reader_Writer_Test.cpp index 4c18681d8f9..147bbb2f475 100644 --- a/tests/Reader_Writer_Test.cpp +++ b/tests/Reader_Writer_Test.cpp @@ -76,7 +76,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("r:w:n:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("r:w:n:")); int c; diff --git a/tests/Refcounted_Auto_Ptr_Test.cpp b/tests/Refcounted_Auto_Ptr_Test.cpp index e463afe276e..620a1577c42 100644 --- a/tests/Refcounted_Auto_Ptr_Test.cpp +++ b/tests/Refcounted_Auto_Ptr_Test.cpp @@ -37,7 +37,7 @@ Printer::Printer (const char *message) : message_ (message) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Creating Printer object\n"))); + ACE_TEXT ("(%t) Creating Printer object\n"))); ++Printer::instance_count_; } @@ -45,15 +45,15 @@ Printer::~Printer (void) { --Printer::instance_count_; ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Deleting Printer object\n"))); + ACE_TEXT ("(%t) Deleting Printer object\n"))); } void Printer::print (void) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) %s\n"), - ACE_TEXT_CHAR_TO_TCHAR(this->message_))); + ACE_TEXT ("(%t) %s\n"), + ACE_TEXT_TO_TCHAR_IN(this->message_))); } #if defined (ACE_HAS_THREADS) @@ -129,18 +129,18 @@ Method_Request_print::Method_Request_print (Scheduler *new_scheduler, printer_ (printer) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Method_Request_print created\n"))); + ACE_TEXT ("(%t) Method_Request_print created\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Printer reference count: %d\n"), + ACE_TEXT ("(%t) Printer reference count: %d\n"), printer_.count ())); } Method_Request_print::~Method_Request_print (void) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Method_Request_print will be deleted.\n"))); + ACE_TEXT ("(%t) Method_Request_print will be deleted.\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Printer reference count: %d\n"), + ACE_TEXT ("(%t) Printer reference count: %d\n"), printer_.count ())); } @@ -199,7 +199,7 @@ Scheduler::Scheduler (Scheduler *new_scheduler) : activation_queue_ (msg_queue ()), scheduler_ (new_scheduler) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Scheduler created\n"))); + ACE_TEXT ("(%t) Scheduler created\n"))); } // Destructor @@ -207,7 +207,7 @@ Scheduler::Scheduler (Scheduler *new_scheduler) Scheduler::~Scheduler (void) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Scheduler will be destroyed\n"))); + ACE_TEXT ("(%t) Scheduler will be destroyed\n"))); } // open @@ -216,7 +216,7 @@ int Scheduler::open (void *) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Scheduler open\n"))); + ACE_TEXT ("(%t) Scheduler open\n"))); // Become an Active Object. int num_threads = 3; return this->activate (THR_BOUND | THR_JOINABLE, num_threads); @@ -227,7 +227,7 @@ Scheduler::open (void *) int Scheduler::close (u_long) { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) rundown\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) rundown\n"))); return 0; } @@ -244,13 +244,13 @@ Scheduler::svc (void) if (0 == mo_p) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) activation queue shut down\n"))); + ACE_TEXT ("(%t) activation queue shut down\n"))); break; } auto_ptr<ACE_Method_Request> mo (mo_p); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) calling method request\n"))); + ACE_TEXT ("(%t) calling method request\n"))); // Call it. if(mo->call () == -1) break; @@ -285,7 +285,7 @@ static int n_loops = 10; int run_main (int, ACE_TCHAR *[]) { - ACE_START_TEST (ACE_LIB_TEXT ("Refcounted_Auto_Ptr_Test")); + ACE_START_TEST (ACE_TEXT ("Refcounted_Auto_Ptr_Test")); // ========================================================================= @@ -293,7 +293,7 @@ run_main (int, ACE_TCHAR *[]) // thread of control, hence we use the ACE_Null_Mutex ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) performing synchronous test...\n"))); + ACE_TEXT ("(%t) performing synchronous test...\n"))); Printer *printer1; ACE_NEW_RETURN (printer1, @@ -309,7 +309,7 @@ run_main (int, ACE_TCHAR *[]) ACE_Refcounted_Auto_Ptr<Printer, ACE_Null_Mutex> r6 = r1; } ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Printer instance count is %d, expecting 0\n"), + ACE_TEXT ("(%t) Printer instance count is %d, expecting 0\n"), Printer::instance_count_)); ACE_ASSERT (Printer::instance_count_ == 0); @@ -320,7 +320,7 @@ run_main (int, ACE_TCHAR *[]) // threads of control. ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) performing asynchronous test...\n"))); + ACE_TEXT ("(%t) performing asynchronous test...\n"))); Scheduler *scheduler_ptr; @@ -352,7 +352,7 @@ run_main (int, ACE_TCHAR *[]) scheduler->wait (); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Printer instance count is %d, expecting 0\n"), + ACE_TEXT ("(%t) Printer instance count is %d, expecting 0\n"), Printer::instance_count_)); ACE_ASSERT (Printer::instance_count_ == 0); diff --git a/tests/Reference_Counted_Event_Handler_Test.cpp b/tests/Reference_Counted_Event_Handler_Test.cpp index 1e947135d6d..e8e45272f0d 100644 --- a/tests/Reference_Counted_Event_Handler_Test.cpp +++ b/tests/Reference_Counted_Event_Handler_Test.cpp @@ -890,7 +890,7 @@ test<REACTOR_IMPLEMENTATION>::test (void) static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:f:g:h:i:k:l:m:z:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("a:b:c:f:g:h:i:k:l:m:z:")); int cc; while ((cc = get_opt ()) != -1) @@ -1012,4 +1012,3 @@ run_main (int argc, ACE_TCHAR *argv[]) return 0; } - diff --git a/tests/SOCK_Connector_Test.cpp b/tests/SOCK_Connector_Test.cpp index 0eee2d171d3..229bac706fd 100644 --- a/tests/SOCK_Connector_Test.cpp +++ b/tests/SOCK_Connector_Test.cpp @@ -93,7 +93,7 @@ find_another_host (ACE_TCHAR other_host[]) ACE_OS::strcpy (other_host, ACE_LOCALHOST); else // Use me if can't find another - ACE_OS::strcpy (other_host, ACE_TEXT_CHAR_TO_TCHAR (h->h_name)); + ACE_OS::strcpy (other_host, ACE_TEXT_TO_TCHAR_IN (h->h_name)); // @@ We really need to add wrappers for these hostent methods. @@ -114,7 +114,7 @@ find_another_host (ACE_TCHAR other_host[]) while ((h = gethostent ()) != 0) { if (ACE_OS::strcmp (h->h_name, - ACE_TEXT_ALWAYS_CHAR (ACE_DEFAULT_SERVER_HOST)) == 0) + ACE_TEXT_TO_CHAR_IN (ACE_DEFAULT_SERVER_HOST)) == 0) continue; // AIX just _has_ to be different if (ACE_OS::strcmp (h->h_name, "loopback") == 0) @@ -122,11 +122,11 @@ find_another_host (ACE_TCHAR other_host[]) // If not me. if (ACE_OS::strcmp - (h->h_name, ACE_TEXT_ALWAYS_CHAR (other_host)) != 0 + (h->h_name, ACE_TEXT_TO_CHAR_IN (other_host)) != 0 && ACE_OS::strcmp (h->h_name, un.nodename) != 0) { ACE_OS::strcpy (candidate[candidate_count].host_name, - ACE_TEXT_CHAR_TO_TCHAR (h->h_name)); + ACE_TEXT_TO_TCHAR_IN (h->h_name)); if (++candidate_count >= MAX_CANDIDATES) break; } diff --git a/tests/SOCK_Dgram_Bcast_Test.cpp b/tests/SOCK_Dgram_Bcast_Test.cpp index fc8149bce3c..7300801c6f2 100644 --- a/tests/SOCK_Dgram_Bcast_Test.cpp +++ b/tests/SOCK_Dgram_Bcast_Test.cpp @@ -216,7 +216,7 @@ int run_main (int argc, ACE_TCHAR *argv[]) int opt = 0; int auto_test_recv = 0; int result = 0; - ACE_Get_Opt opts (argc, argv, ACE_TEXT ("p:t:n:sra")); + ACE_Get_Arg_Opt<ACE_TCHAR> opts (argc, argv, ACE_TEXT ("p:t:n:sra")); while ((opt = opts ()) != -1) switch (opt) { diff --git a/tests/SOCK_Send_Recv_Test.cpp b/tests/SOCK_Send_Recv_Test.cpp index f971c98e65b..3366be73b58 100644 --- a/tests/SOCK_Send_Recv_Test.cpp +++ b/tests/SOCK_Send_Recv_Test.cpp @@ -81,7 +81,7 @@ client (void *arg) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) connected to %s\n"), - ACE_TEXT_CHAR_TO_TCHAR(server_addr.get_host_name ()))); + ACE_TEXT_TO_TCHAR_IN(server_addr.get_host_name ()))); //******************* TEST 1 ****************************** // @@ -208,7 +208,7 @@ server (void *arg) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) client %s connected from %d\n"), - ACE_TEXT_CHAR_TO_TCHAR(cli_addr.get_host_name ()), + ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()), cli_addr.get_port_number ())); //******************* TEST 1 ****************************** diff --git a/tests/SOCK_Send_Recv_Test_IPV6.cpp b/tests/SOCK_Send_Recv_Test_IPV6.cpp index b630ffb00ec..5626671fb27 100644 --- a/tests/SOCK_Send_Recv_Test_IPV6.cpp +++ b/tests/SOCK_Send_Recv_Test_IPV6.cpp @@ -76,7 +76,7 @@ client (void *arg) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) connected to %s\n"), - ACE_TEXT_CHAR_TO_TCHAR(server_addr.get_host_name ()))); + ACE_TEXT_TO_TCHAR_IN(server_addr.get_host_name ()))); //******************* TEST 1 ****************************** // @@ -203,7 +203,7 @@ server (void *arg) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) client %s connected from %d\n"), - ACE_TEXT_CHAR_TO_TCHAR(cli_addr.get_host_name ()), + ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()), cli_addr.get_port_number ())); //******************* TEST 1 ****************************** diff --git a/tests/SOCK_Test.cpp b/tests/SOCK_Test.cpp index 6472711a857..2cd92351063 100644 --- a/tests/SOCK_Test.cpp +++ b/tests/SOCK_Test.cpp @@ -63,7 +63,7 @@ client (void *arg) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("connection failed")), 0); else ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) connected to %s\n"), - ACE_TEXT_CHAR_TO_TCHAR(server_addr.get_host_name ()))); + ACE_TEXT_TO_TCHAR_IN(server_addr.get_host_name ()))); } if (cli_stream.disable (ACE_NONBLOCK) == -1) @@ -141,7 +141,7 @@ server (void *arg) while ((result = peer_acceptor->accept (new_stream, &cli_addr)) != -1) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) client %s connected from %d\n"), - ACE_TEXT_CHAR_TO_TCHAR(cli_addr.get_host_name ()), cli_addr.get_port_number ())); + ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()), cli_addr.get_port_number ())); // Enable non-blocking I/O. if (new_stream.enable (ACE_NONBLOCK) == -1) diff --git a/tests/SOCK_Test_IPv6.cpp b/tests/SOCK_Test_IPv6.cpp index 08950687fcf..31082bb9e97 100644 --- a/tests/SOCK_Test_IPv6.cpp +++ b/tests/SOCK_Test_IPv6.cpp @@ -64,7 +64,7 @@ client (void *arg) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("connection failed")), 0); else ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) connected to %s\n"), - ACE_TEXT_CHAR_TO_TCHAR(server_addr.get_host_name ()))); + ACE_TEXT_TO_TCHAR_IN(server_addr.get_host_name ()))); } if (cli_stream.disable (ACE_NONBLOCK) == -1) @@ -142,7 +142,7 @@ server (void *arg) while ((result = peer_acceptor->accept (new_stream, &cli_addr)) != -1) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) client %s connected from %d\n"), - ACE_TEXT_CHAR_TO_TCHAR(cli_addr.get_host_name ()), cli_addr.get_port_number ())); + ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()), cli_addr.get_port_number ())); // Enable non-blocking I/O. if (new_stream.enable (ACE_NONBLOCK) == -1) diff --git a/tests/SString_Test.cpp b/tests/SString_Test.cpp index 7486e2d2b5b..a6be520d300 100644 --- a/tests/SString_Test.cpp +++ b/tests/SString_Test.cpp @@ -26,7 +26,6 @@ ACE_RCSID(tests, SString_Test, "$Id$") static int testConcatenation() { -#ifdef ACE_HAS_WCHAR ACE_WString s1; s1 += L'H'; if (s1 != ACE_WString(L"H")) { @@ -62,7 +61,6 @@ static int testConcatenation() { ACE_ERROR((LM_ERROR, "Concat wchar_t 2\n")); return 1; } -#endif /* ACE_HAS_WCHAR */ return 0; } @@ -211,7 +209,7 @@ run_main (int, ACE_TCHAR *[]) ACE_NS_WString s5 = s1 + " " + s2; ACE_NS_WString s6 = ("hella"); // Same length as s1, off by one char. - ACE_WCHAR_T single_character = 'z'; + wchar_t single_character = 'z'; ACE_NS_WString single_character_string (single_character); ACE_NS_WString empty_string; diff --git a/tests/Semaphore_Test.cpp b/tests/Semaphore_Test.cpp index e2b82042559..0f68bb0f2a4 100644 --- a/tests/Semaphore_Test.cpp +++ b/tests/Semaphore_Test.cpp @@ -119,7 +119,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("s:w:n:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("s:w:n:")); int c; diff --git a/tests/Signal_Test.cpp b/tests/Signal_Test.cpp index 330ce322c37..aa09b53aaaf 100644 --- a/tests/Signal_Test.cpp +++ b/tests/Signal_Test.cpp @@ -374,7 +374,7 @@ run_test (ACE_THR_FUNC worker, static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("i:chp:t:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("i:chp:t:")); int c; diff --git a/tests/Svc_Handler_Test.cpp b/tests/Svc_Handler_Test.cpp index c36d8483e08..9fa2bdd8011 100644 --- a/tests/Svc_Handler_Test.cpp +++ b/tests/Svc_Handler_Test.cpp @@ -40,23 +40,23 @@ run_test (SVC_HANDLER &svc_handler, { ACE_Message_Block *mb; ACE_NEW (mb, - ACE_Message_Block (sizeof (ACE_LIB_TEXT("hello ")))); + ACE_Message_Block (sizeof (ACE_TEXT("hello ")))); ACE_Message_Block *cb1; ACE_NEW (cb1, - ACE_Message_Block (sizeof (ACE_LIB_TEXT("there\n")))); + ACE_Message_Block (sizeof (ACE_TEXT("there\n")))); ACE_Message_Block *cb2; ACE_NEW (cb2, - ACE_Message_Block (sizeof (ACE_LIB_TEXT("there\n")))); + ACE_Message_Block (sizeof (ACE_TEXT("there\n")))); mb->copy ("hello ", - ACE_OS::strlen (ACE_LIB_TEXT("hello "))); + ACE_OS::strlen (ACE_TEXT("hello "))); cb1->copy ("there ", - ACE_OS::strlen (ACE_LIB_TEXT("there "))); + ACE_OS::strlen (ACE_TEXT("there "))); mb->cont (cb1); cb2->copy ("doug\n", - ACE_OS::strlen (ACE_LIB_TEXT("doug\n"))); + ACE_OS::strlen (ACE_TEXT("doug\n"))); cb1->cont (cb2); // Note that this is a buffered call! @@ -132,15 +132,15 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_FILE_Info info; file_io.get_info (info); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("file size = %d\n"), info.size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("file size = %d\n"), info.size_)); for (ssize_t n_bytes; (n_bytes = file_io.recv (buf, ACE_MAXLOGMSGLEN)) > 0; ) { buf[n_bytes] = '\0'; - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("%s"), ACE_TEXT_CHAR_TO_TCHAR(buf))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("%s"), ACE_TEXT_TO_TCHAR_IN(buf))); } - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n"))); file_io.close (); @@ -154,4 +154,3 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_END_TEST; return 0; } - diff --git a/tests/TP_Reactor_Test.cpp b/tests/TP_Reactor_Test.cpp index 91d2b43812f..5be774ae934 100644 --- a/tests/TP_Reactor_Test.cpp +++ b/tests/TP_Reactor_Test.cpp @@ -1072,7 +1072,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) return 0; } - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("i:n:p:d:h:s:v:ub")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("i:n:p:d:h:s:v:ub")); int c; while ((c = get_opt ()) != EOF) diff --git a/tests/Test_Output.cpp b/tests/Test_Output.cpp index 3502fea9e3b..ee390f26a52 100644 --- a/tests/Test_Output.cpp +++ b/tests/Test_Output.cpp @@ -101,7 +101,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) test_dir = 0; else { - ACE_OS::strcpy (tempenv, ACE_TEXT_CHAR_TO_TCHAR (test_dir_n)); + ACE_OS::strcpy (tempenv, ACE_TEXT_TO_TCHAR_IN (test_dir_n)); test_dir = tempenv; } # endif /* ACE_WIN32 || !ACE_USES_WCHAR */ @@ -145,7 +145,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) # endif /* ! VXWORKS */ # if !defined (ACE_LACKS_IOSTREAM_TOTALLY) - this->output_file_->open (ACE_TEXT_ALWAYS_CHAR (temp), + this->output_file_->open (ACE_TEXT_TO_CHAR_IN (temp), ios::out | (append ? ios::app : ios::trunc)); if (this->output_file_->bad ()) return -1; @@ -249,4 +249,3 @@ randomize (int array[], size_t size) array [size] = temp; } } - diff --git a/tests/Thread_Pool_Reactor_Resume_Test.cpp b/tests/Thread_Pool_Reactor_Resume_Test.cpp index 327ef0bc917..c860d90310c 100644 --- a/tests/Thread_Pool_Reactor_Resume_Test.cpp +++ b/tests/Thread_Pool_Reactor_Resume_Test.cpp @@ -84,7 +84,7 @@ static int req_delay = 50; static void parse_arg (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("r:s:c:d:i:n:")); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("r:s:c:d:i:n:")); int c; diff --git a/tests/Thread_Pool_Reactor_Test.cpp b/tests/Thread_Pool_Reactor_Test.cpp index ff0c3098e80..7d813e95b67 100644 --- a/tests/Thread_Pool_Reactor_Test.cpp +++ b/tests/Thread_Pool_Reactor_Test.cpp @@ -87,7 +87,7 @@ static int req_delay = 50; static void parse_arg (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("r:s:c:d:i:n:")); + ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("r:s:c:d:i:n:")); int c; diff --git a/tests/Timer_Queue_Reference_Counting_Test.cpp b/tests/Timer_Queue_Reference_Counting_Test.cpp index f21585938d0..30b2f29c3aa 100644 --- a/tests/Timer_Queue_Reference_Counting_Test.cpp +++ b/tests/Timer_Queue_Reference_Counting_Test.cpp @@ -550,7 +550,7 @@ static int test_simple = 1; static int parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:b:c:d:l:m:n:o:z:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("a:b:c:d:l:m:n:o:z:")); int cc; while ((cc = get_opt ()) != -1) @@ -673,4 +673,3 @@ run_main (int argc, ACE_TCHAR *argv[]) return 0; } - diff --git a/tests/Upgradable_RW_Test.cpp b/tests/Upgradable_RW_Test.cpp index ca99f677496..ae76bccbcae 100644 --- a/tests/Upgradable_RW_Test.cpp +++ b/tests/Upgradable_RW_Test.cpp @@ -117,7 +117,7 @@ print_usage_and_die (void) static void parse_args (int argc, ACE_TCHAR *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("e:fr:w:n:u")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("e:fr:w:n:u")); int c; @@ -488,4 +488,3 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_END_TEST; return status; } - diff --git a/tests/tests.mpc b/tests/tests.mpc index 8903bca5f89..ca539304ead 100644 --- a/tests/tests.mpc +++ b/tests/tests.mpc @@ -1324,6 +1324,13 @@ project(Based Pointer Test) : acetest { } } +project(WChar_Conversion) : acetest { + exename = WChar_Conversion + Source_Files { + WChar_Conversion.cpp + } +} + project(Library Unload) { exename = UnloadLibACE staticflags += ACE_AS_STATIC_LIBS |