diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-01 11:15:26 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-01 11:15:26 +0000 |
| commit | b38582354ed287367fd93be229ae5e9dbf9188e7 (patch) | |
| tree | 9a2cd7fff6f9e796968703bf3bb2cb7ca5c5bf82 /tests | |
| parent | 6a0568c32aa670b9d9c216c18ae796749c816819 (diff) | |
| download | ATCD-b38582354ed287367fd93be229ae5e9dbf9188e7.tar.gz | |
ChangeLogTag:Sat Nov 1 05:40:21 UTC 2003 Don Hinton <dhinton@dresystems.com>
Diffstat (limited to 'tests')
81 files changed, 347 insertions, 281 deletions
diff --git a/tests/Aio_Platform_Test.cpp b/tests/Aio_Platform_Test.cpp index e2ec2209aa1..9d22b6da78d 100644 --- a/tests/Aio_Platform_Test.cpp +++ b/tests/Aio_Platform_Test.cpp @@ -19,7 +19,7 @@ // ===================================================================== #include "test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Aio_Platform_Test, "$Id$") diff --git a/tests/Auto_IncDec_Test.cpp b/tests/Auto_IncDec_Test.cpp index 31516eed34d..6b4330e83ba 100644 --- a/tests/Auto_IncDec_Test.cpp +++ b/tests/Auto_IncDec_Test.cpp @@ -21,7 +21,7 @@ #include "ace/Thread_Manager.h" #include "ace/Atomic_Op.h" #include "tests/test_config.h" - +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Auto_IncDec_Test, "Auto_IncDec_Test.cpp, by Edan Ayal") diff --git a/tests/Barrier_Test.cpp b/tests/Barrier_Test.cpp index c7db6350014..ce2fa29cb5b 100644 --- a/tests/Barrier_Test.cpp +++ b/tests/Barrier_Test.cpp @@ -18,7 +18,7 @@ // ============================================================================ #include "test_config.h" -#include "ace/Synch.h" +#include "ace/Barrier.h" #include "ace/Thread_Manager.h" ACE_RCSID(tests, Barrier_Test, "$Id$") diff --git a/tests/Basic_Types_Test.cpp b/tests/Basic_Types_Test.cpp index 95e1cd848cf..cd7c58f6174 100644 --- a/tests/Basic_Types_Test.cpp +++ b/tests/Basic_Types_Test.cpp @@ -36,7 +36,7 @@ #endif /* ! ACE_HAS_MINIMAL_ACE_OS */ #include "ace/Basic_Types.h" -#include "ace/OS.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Basic_Types_Test, "$Id$") diff --git a/tests/Buffer_Stream_Test.cpp b/tests/Buffer_Stream_Test.cpp index 9a8575ff6b1..7c903162435 100644 --- a/tests/Buffer_Stream_Test.cpp +++ b/tests/Buffer_Stream_Test.cpp @@ -26,6 +26,7 @@ #include "ace/Stream.h" #include "ace/Module.h" #include "ace/Task.h" +#include "ace/OS_NS_time.h" ACE_RCSID(tests, Buffer_Stream_Test, "$Id$") diff --git a/tests/CE_fostream.h b/tests/CE_fostream.h index 347cfc0e71d..b488aaba3b1 100644 --- a/tests/CE_fostream.h +++ b/tests/CE_fostream.h @@ -23,8 +23,7 @@ #ifdef ACE_HAS_WINCE -#include "ace/OS.h" - +#include "ace/Null_Mutex.h" #include "ace/Singleton.h" #ifdef ostream diff --git a/tests/Cache_Map_Manager_Test.cpp b/tests/Cache_Map_Manager_Test.cpp index 871ca9319b9..524c64e63f2 100644 --- a/tests/Cache_Map_Manager_Test.cpp +++ b/tests/Cache_Map_Manager_Test.cpp @@ -19,12 +19,13 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_NS_string.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/OS_NS_time.h" #include "test_config.h" #include "ace/Hash_Cache_Map_Manager_T.h" #include "ace/Map_Manager.h" diff --git a/tests/Config_Test.cpp b/tests/Config_Test.cpp index 29d0aa2dd25..a1f0b549f44 100644 --- a/tests/Config_Test.cpp +++ b/tests/Config_Test.cpp @@ -22,6 +22,8 @@ #include "test_config.h" #include "Config_Test.h" #include "ace/Configuration_Import_Export.h" +#include "ace/OS_NS_errno.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(tests, Config_Test, "$Id$") diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp index 04466e250bd..1a238c5e5af 100644 --- a/tests/Conn_Test.cpp +++ b/tests/Conn_Test.cpp @@ -33,6 +33,10 @@ #include "ace/Get_Opt.h" #include "ace/Process_Mutex.h" #include "Conn_Test.h" +#include "ace/Barrier.h" +#include "ace/OS_NS_signal.h" +#include "ace/OS_NS_sys_wait.h" +#include "ace/os_include/os_netdb.h" ACE_RCSID(tests, Conn_Test, "$Id$") diff --git a/tests/DLL_Test.cpp b/tests/DLL_Test.cpp index 077de0581e8..adea3f2903a 100644 --- a/tests/DLL_Test.cpp +++ b/tests/DLL_Test.cpp @@ -117,7 +117,7 @@ int basic_test (ACE_DLL &dll) // Allocate and free a string allocated via malloc in a different dll. ACE_TCHAR *malloc_str = my_hello->malloc_info (); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Result for malloc_info(): %s\n"), malloc_str)); - ACE_OS_Memory::free (malloc_str); + ACE_OS::free (malloc_str); return 0; } diff --git a/tests/DLL_Test_Impl.cpp b/tests/DLL_Test_Impl.cpp index 7663009ceec..e1171b1c5e2 100644 --- a/tests/DLL_Test_Impl.cpp +++ b/tests/DLL_Test_Impl.cpp @@ -20,6 +20,7 @@ #include "ace/ACE.h" #include "ace/OS_Errno.h" #include "ace/svc_export.h" +#include "ace/OS_NS_string.h" ACE_RCSID (tests, DLL_Test_Impl, @@ -51,7 +52,7 @@ Hello_Impl::new_info (void) ACE_TCHAR * Hello_Impl::malloc_info (void) { - return ACE_OS_String::strdup (ACE_TEXT ("Hello_Impl::new_info() allocated by ACE_OS_Memory::malloc()")); + return ACE_OS::strdup (ACE_TEXT ("Hello_Impl::new_info() allocated by ACE_OS::malloc()")); } void * diff --git a/tests/DLL_Test_Impl.h b/tests/DLL_Test_Impl.h index 5ae706edf2b..bf16bdd5c48 100644 --- a/tests/DLL_Test_Impl.h +++ b/tests/DLL_Test_Impl.h @@ -46,7 +46,7 @@ public: // Uses ACE::strnew() to allocate the returned string. ACE_TCHAR *malloc_info (void); - // Uses ACE_OS_Memory::malloc() to allocate the returned string. + // Uses ACE_OS::malloc() to allocate the returned string. // Overload the new/delete opertors so the object will be // created/deleted using the memory allocator associated with the diff --git a/tests/Dirent_Test.cpp b/tests/Dirent_Test.cpp index 0ddec323d80..e392d022c7a 100644 --- a/tests/Dirent_Test.cpp +++ b/tests/Dirent_Test.cpp @@ -24,8 +24,7 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" -#include "ace/OS_String.h" +#include "ace/OS_NS_string.h" #include "ace/Dirent.h" #include "ace/Dirent_Selector.h" @@ -47,13 +46,13 @@ static int entrycount = 0; static int selector (const dirent *d) { - return ACE_OS_String::strcmp (d->d_name, ACE_TEXT (TEST_ENTRY)) == 0; + return ACE_OS::strcmp (d->d_name, ACE_TEXT (TEST_ENTRY)) == 0; } static int comparator (const dirent **d1, const dirent **d2) { - return ACE_OS_String::strcmp ((*d1)->d_name, (*d2)->d_name); + return ACE_OS::strcmp ((*d1)->d_name, (*d2)->d_name); } static int diff --git a/tests/Enum_Interfaces_Test.cpp b/tests/Enum_Interfaces_Test.cpp index f9855977db6..71f409dfae9 100644 --- a/tests/Enum_Interfaces_Test.cpp +++ b/tests/Enum_Interfaces_Test.cpp @@ -29,7 +29,7 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_sys_utsname.h" #include "ace/INET_Addr.h" ACE_RCSID(tests, Enum_Interfaces_Test, "$Id$") diff --git a/tests/Env_Value_Test.cpp b/tests/Env_Value_Test.cpp index 8971ffd39a6..bb2ece06627 100644 --- a/tests/Env_Value_Test.cpp +++ b/tests/Env_Value_Test.cpp @@ -15,7 +15,6 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" #include "ace/Process.h" #include "ace/Env_Value_T.h" diff --git a/tests/FIFO_Test.cpp b/tests/FIFO_Test.cpp index 6d82391a83a..7778d52a9db 100644 --- a/tests/FIFO_Test.cpp +++ b/tests/FIFO_Test.cpp @@ -20,7 +20,9 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_sys_stat.h" +#include "ace/OS_NS_sys_wait.h" #include "ace/ACE.h" #include "ace/FIFO_Send_Msg.h" #include "ace/FIFO_Recv_Msg.h" @@ -187,7 +189,7 @@ test_fifo_msg (void) if (ACE_Lib_Find::get_temp_dir (fifo_path, MAXPATHLEN) == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("get_temp_dir")), 1); - ACE_OS_String::strcat (fifo_path, ACE_TEXT ("FIFO_Test")); + ACE_OS::strcat (fifo_path, ACE_TEXT ("FIFO_Test")); ACE_FIFO_Recv_Msg read_side; // Open read only, not persistent (4th arg is 0) if (-1 == read_side.open (fifo_path, diff --git a/tests/Framework_Component_DLL.cpp b/tests/Framework_Component_DLL.cpp index e5a1bdb4bca..894d1af9f4f 100644 --- a/tests/Framework_Component_DLL.cpp +++ b/tests/Framework_Component_DLL.cpp @@ -3,7 +3,6 @@ #include "ace/Service_Config.h" #include "ace/Service_Object.h" #include "ace/Framework_Component_T.h" -#include "ace/OS.h" ACE_RCSID (tests, Framework_Component_DLL, diff --git a/tests/Hash_Map_Bucket_Iterator_Test.cpp b/tests/Hash_Map_Bucket_Iterator_Test.cpp index cae31d8c504..affd0ba8698 100644 --- a/tests/Hash_Map_Bucket_Iterator_Test.cpp +++ b/tests/Hash_Map_Bucket_Iterator_Test.cpp @@ -18,7 +18,8 @@ #include "test_config.h" #include "ace/Hash_Map_Manager.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Null_Mutex.h" #include "ace/Get_Opt.h" #include "ace/Functor.h" diff --git a/tests/Hash_Map_Manager_Test.cpp b/tests/Hash_Map_Manager_Test.cpp index c87f7c5f9b0..26a41c0cd98 100644 --- a/tests/Hash_Map_Manager_Test.cpp +++ b/tests/Hash_Map_Manager_Test.cpp @@ -23,7 +23,7 @@ #include "test_config.h" #include "ace/Hash_Map_Manager.h" #include "ace/Malloc_T.h" -#include "ace/Synch.h" +#include "ace/Null_Mutex.h" ACE_RCSID(tests, Hash_Map_Manager_Test, "$Id$") diff --git a/tests/High_Res_Timer_Test.cpp b/tests/High_Res_Timer_Test.cpp index b2e99072314..7a990302fd8 100644 --- a/tests/High_Res_Timer_Test.cpp +++ b/tests/High_Res_Timer_Test.cpp @@ -20,6 +20,7 @@ #include "ace/High_Res_Timer.h" #include "ace/Sched_Params.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, High_Res_Timer_Test, "High_Res_Timer_Test.cpp,v 4.6 2000/04/23 04:43:58 brunsch Exp") diff --git a/tests/INET_Addr_Test.cpp b/tests/INET_Addr_Test.cpp index f48f99f51fa..c738ff94d1d 100644 --- a/tests/INET_Addr_Test.cpp +++ b/tests/INET_Addr_Test.cpp @@ -19,9 +19,10 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_string.h" #include "ace/INET_Addr.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_arpa_inet.h" // Make sure that ACE_Addr::addr_type_ is the same // as the family of the inet_addr_. diff --git a/tests/Logging_Strategy_Test.cpp b/tests/Logging_Strategy_Test.cpp index 32ab9aace06..f393d3033d1 100644 --- a/tests/Logging_Strategy_Test.cpp +++ b/tests/Logging_Strategy_Test.cpp @@ -32,7 +32,7 @@ // //========================================================================== -#include "ace/OS.h" +#include "ace/OS_NS_sys_stat.h" #include "ace/Auto_Ptr.h" #include "ace/Service_Config.h" #include "ace/Thread_Manager.h" @@ -46,6 +46,7 @@ #include "ace/Auto_Ptr.cpp" #include "ace/Get_Opt.h" #include "test_config.h" +#include "ace/OS_NS_time.h" ACE_RCSID(tests, Logging_Strategy_Test, "$Id$") @@ -463,11 +464,11 @@ int run_main (int argc, ACE_TCHAR *argv []) for (int i = 1; i < argc; i++) { - ACE_OS_String::strcat (arg_str, argv[i]); - ACE_OS_String::strcat (arg_str, ACE_TEXT (" ")); + ACE_OS::strcat (arg_str, argv[i]); + ACE_OS::strcat (arg_str, ACE_TEXT (" ")); } - ACE_OS_String::strcat (arg_str, ACE_TEXT ("\"")); + ACE_OS::strcat (arg_str, ACE_TEXT ("\"")); if (ACE_Service_Config::process_directive (arg_str) == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/tests/MEM_Stream_Test.cpp b/tests/MEM_Stream_Test.cpp index 77089073451..2c5ee3b24b3 100644 --- a/tests/MEM_Stream_Test.cpp +++ b/tests/MEM_Stream_Test.cpp @@ -18,7 +18,6 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" #include "ace/Thread_Manager.h" #include "ace/MEM_Connector.h" @@ -123,7 +122,7 @@ Echo_Handler::handle_input (ACE_HANDLE) ACE_TCHAR return_buf[MAXPATHLEN]; ACE_OS::strcpy (return_buf, this->name_); - ACE_OS_String::strcat (return_buf, buf); + ACE_OS::strcat (return_buf, buf); len = (ACE_OS::strlen (return_buf) + 1) * sizeof (ACE_TCHAR); if (this->peer ().send (return_buf, len) != len) diff --git a/tests/MEM_Stream_Test.h b/tests/MEM_Stream_Test.h index 663bfcb8ac6..b9ed6924463 100644 --- a/tests/MEM_Stream_Test.h +++ b/tests/MEM_Stream_Test.h @@ -26,11 +26,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" #include "ace/MEM_Stream.h" #include "ace/Reactor.h" #include "ace/Svc_Handler.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) diff --git a/tests/MM_Shared_Memory_Test.cpp b/tests/MM_Shared_Memory_Test.cpp index 46f2be7d000..a69a33a0606 100644 --- a/tests/MM_Shared_Memory_Test.cpp +++ b/tests/MM_Shared_Memory_Test.cpp @@ -23,11 +23,11 @@ #include "test_config.h" #include "ace/Shared_Memory_MM.h" -#include "ace/Synch.h" #include "ace/SV_Semaphore_Simple.h" #include "ace/Process_Semaphore.h" #include "ace/Thread_Manager.h" #include "ace/ACE.h" +#include "ace/OS_NS_string.h" ACE_RCSID(tests, MM_Shared_Memory_Test, "$Id$") @@ -202,7 +202,7 @@ run_main (int, ACE_TCHAR *[]) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Temporary path too long\n")), -1); // Add the filename to the end - ACE_OS_String::strcat (temp_file, ACE_TEXT ("mm_shared_mem_testXXXXXX")); + ACE_OS::strcat (temp_file, ACE_TEXT ("mm_shared_mem_testXXXXXX")); // Store in the global variable. shm_key = temp_file; diff --git a/tests/MT_Reactor_Upcall_Test.cpp b/tests/MT_Reactor_Upcall_Test.cpp index 71ec9cc5f2b..5c9e5992c9f 100644 --- a/tests/MT_Reactor_Upcall_Test.cpp +++ b/tests/MT_Reactor_Upcall_Test.cpp @@ -208,8 +208,8 @@ test_reactor_upcall (ACE_Reactor &reactor) data_message.type_ = Message::DATA; data_message.size_ = - ACE_OS_String::strlen (message); - ACE_OS_String::strcpy (data_message.data_, message); + ACE_OS::strlen (message); + ACE_OS::strcpy (data_message.data_, message); // Send in three pieces because the struct members may not be adjacent // in memory. diff --git a/tests/MT_Reference_Counted_Event_Handler_Test.cpp b/tests/MT_Reference_Counted_Event_Handler_Test.cpp index d7f9f73e3fb..e994b4344a1 100644 --- a/tests/MT_Reference_Counted_Event_Handler_Test.cpp +++ b/tests/MT_Reference_Counted_Event_Handler_Test.cpp @@ -36,6 +36,8 @@ #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Connector.h" #include "ace/Auto_Event.h" +#include "ace/OS_NS_signal.h" +#include "ace/OS_NS_time.h" ACE_RCSID(tests, MT_Reference_Counted_Event_Handler_Test, "$Id$") diff --git a/tests/MT_SOCK_Test.cpp b/tests/MT_SOCK_Test.cpp index 35377099030..a82d7a19aaa 100644 --- a/tests/MT_SOCK_Test.cpp +++ b/tests/MT_SOCK_Test.cpp @@ -24,7 +24,8 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_sys_select.h" +#include "ace/OS_NS_sys_wait.h" #include "ace/Thread.h" #include "ace/Thread_Manager.h" #include "ace/SOCK_Connector.h" diff --git a/tests/Main.cpp b/tests/Main.cpp index e80f79ca2c2..44b92128394 100644 --- a/tests/Main.cpp +++ b/tests/Main.cpp @@ -17,7 +17,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_HAS_WINCE) # include "ace/ACE.h" #endif /* ACE_HAS_WINCE */ diff --git a/tests/Map_Test.cpp b/tests/Map_Test.cpp index 4d9d7bba1ac..9a8a634662f 100644 --- a/tests/Map_Test.cpp +++ b/tests/Map_Test.cpp @@ -21,7 +21,6 @@ #include "Map_Test.h" #include "ace/Map_T.h" #include "ace/Profile_Timer.h" -#include "ace/Synch.h" ACE_RCSID(tests, Map_Test, "$Id$") diff --git a/tests/Map_Test.h b/tests/Map_Test.h index 946b03f33f1..c881a3f7645 100644 --- a/tests/Map_Test.h +++ b/tests/Map_Test.h @@ -22,11 +22,12 @@ #ifndef ACE_TESTS_MAP_TEST_H #define ACE_TESTS_MAP_TEST_H +#include "ace/OS_NS_string.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/OS.h" #include "ace/Active_Map_Manager.h" #include "ace/Containers.h" diff --git a/tests/Max_Default_Port_Test.cpp b/tests/Max_Default_Port_Test.cpp index 242edbb3e8a..39ab791ccc8 100644 --- a/tests/Max_Default_Port_Test.cpp +++ b/tests/Max_Default_Port_Test.cpp @@ -26,7 +26,6 @@ // // ============================================================================ -#include "ace/OS.h" #include "ace/streams.h" #include "ace/Reactor.h" #include "ace/SOCK_Connector.h" diff --git a/tests/Mem_Map_Test.cpp b/tests/Mem_Map_Test.cpp index 199efe6e824..87a7953ee31 100644 --- a/tests/Mem_Map_Test.cpp +++ b/tests/Mem_Map_Test.cpp @@ -22,6 +22,7 @@ #include "test_config.h" #include "ace/Mem_Map.h" #include "ace/ACE.h" +#include "ace/OS_NS_string.h" ACE_RCSID(tests, Mem_Map_Test, "$Id$") @@ -144,12 +145,12 @@ run_main (int, ACE_TCHAR *[]) ACE_OS::strcpy (temp_file2, test_file); // Add the filenames to the end - ACE_OS_String::strcat (test_file, - ACE_TEXT ("ace_mem_map_test")); - ACE_OS_String::strcat (temp_file1, - ACE_TEXT ("ace_mem_map_temp_1")); - ACE_OS_String::strcat (temp_file2, - ACE_TEXT ("ace_mem_map_temp_2")); + ACE_OS::strcat (test_file, + ACE_TEXT ("ace_mem_map_test")); + ACE_OS::strcat (temp_file1, + ACE_TEXT ("ace_mem_map_temp_1")); + ACE_OS::strcat (temp_file2, + ACE_TEXT ("ace_mem_map_temp_2")); // First create a test file to work on if (create_test_file (test_file, LINE_LENGTH, NUM_LINES) != 0) diff --git a/tests/Message_Queue_Notifications_Test.cpp b/tests/Message_Queue_Notifications_Test.cpp index 567df50cf00..96b707a9e04 100644 --- a/tests/Message_Queue_Notifications_Test.cpp +++ b/tests/Message_Queue_Notifications_Test.cpp @@ -40,6 +40,7 @@ #include "ace/Reactor_Notification_Strategy.h" #include "ace/Atomic_Op.h" #include "ace/Barrier.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Message_Queue_Notifications_Test, "$Id$") diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp index a60d99253e4..6f4c9a07166 100644 --- a/tests/Message_Queue_Test.cpp +++ b/tests/Message_Queue_Test.cpp @@ -25,8 +25,11 @@ #include "test_config.h" #include "ace/Thread_Manager.h" #include "ace/Message_Queue.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Null_Mutex.h" +#include "ace/Null_Condition.h" #include "ace/High_Res_Timer.h" +#include "ace/OS_NS_string.h" ACE_RCSID(tests, Message_Queue_Test, "$Id$") diff --git a/tests/Message_Queue_Test_Ex.cpp b/tests/Message_Queue_Test_Ex.cpp index b26ae57b453..b48471699e6 100644 --- a/tests/Message_Queue_Test_Ex.cpp +++ b/tests/Message_Queue_Test_Ex.cpp @@ -26,7 +26,9 @@ #include "test_config.h" #include "ace/Thread_Manager.h" #include "ace/Message_Queue.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Null_Mutex.h" +#include "ace/Null_Condition.h" #include "ace/High_Res_Timer.h" #include "ace/Message_Block.h" #include "Message_Queue_Test_Ex.h" // Declares User_Class diff --git a/tests/Message_Queue_Test_Ex.h b/tests/Message_Queue_Test_Ex.h index fb3533a00d2..70c5e1f9cf8 100644 --- a/tests/Message_Queue_Test_Ex.h +++ b/tests/Message_Queue_Test_Ex.h @@ -18,7 +18,7 @@ #ifndef ACE_TESTS_MESSAGE_QUEUE_TEST_EX_H #define ACE_TESTS_MESSAGE_QUEUE_TEST_EX_H -#include "ace/OS.h" +#include "ace/OS_NS_string.h" // User-defined class used for queue data. class User_Class diff --git a/tests/Multicast_Test.cpp b/tests/Multicast_Test.cpp index 83d28d72200..84b25bd01dd 100644 --- a/tests/Multicast_Test.cpp +++ b/tests/Multicast_Test.cpp @@ -39,7 +39,8 @@ #include "ace/SOCK_Dgram_Mcast.h" #include "ace/ACE.h" #include "ace/Reactor.h" -#include "ace/OS_String.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_strings.h" #include "ace/Task.h" #include "ace/Atomic_Op.h" #include "ace/SString.h" @@ -738,7 +739,7 @@ int send_dgram (ACE_SOCK_Dgram &socket, ACE_INET_Addr addr, int done = 0) else ACE_OS::sprintf (buf, "%s/%d", address, port); //ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("sending (%s)\n"), buf)); - if (socket.send (buf, ACE_OS_String::strlen (buf),addr) == -1) + if (socket.send (buf, ACE_OS::strlen (buf),addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("send_dgram - error calling send on ") ACE_TEXT ("ACE_SOCK_Dgram.")), -1); diff --git a/tests/Multihomed_INET_Addr_Test.cpp b/tests/Multihomed_INET_Addr_Test.cpp index 6d89b769946..0312f9be665 100644 --- a/tests/Multihomed_INET_Addr_Test.cpp +++ b/tests/Multihomed_INET_Addr_Test.cpp @@ -18,10 +18,11 @@ // // ============================================================================ -#include /**/ "test_config.h" -#include /**/ "ace/OS.h" -#include /**/ "ace/Multihomed_INET_Addr.h" -#include /**/ "ace/Log_Msg.h" +#include "test_config.h" +#include "ace/OS_NS_string.h" +#include "ace/Multihomed_INET_Addr.h" +#include "ace/Log_Msg.h" +#include "ace/OS_NS_arpa_inet.h" int run_main (int argc, ACE_TCHAR *argv[]) { diff --git a/tests/Naming_Test.cpp b/tests/Naming_Test.cpp index 4944a706f1d..1cb459060e4 100644 --- a/tests/Naming_Test.cpp +++ b/tests/Naming_Test.cpp @@ -22,6 +22,7 @@ #include "ace/SString.h" #include "ace/Naming_Context.h" #include "ace/Profile_Timer.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(tests, Naming_Test, "$Id$") @@ -198,7 +199,7 @@ run_main (int argc, ACE_TCHAR *argv[]) { ACE_OS::strcpy (temp_file, ACE::basename (name_options->process_name (), ACE_DIRECTORY_SEPARATOR_CHAR)); - ACE_OS_String::strcat (temp_file, ACE_TEXT ("XXXXXX")); + ACE_OS::strcat (temp_file, ACE_TEXT ("XXXXXX")); // Set the database name using mktemp to generate a unique file name name_options->database (ACE_OS::mktemp (temp_file)); diff --git a/tests/New_Fail_Test.cpp b/tests/New_Fail_Test.cpp index 20fcc8f8ba9..4a25d63933c 100644 --- a/tests/New_Fail_Test.cpp +++ b/tests/New_Fail_Test.cpp @@ -25,7 +25,7 @@ #include "test_config.h" #include "ace/Log_Msg.h" -#include "ace/OS.h" +#include "ace/OS_Memory.h" #include "ace/CORBA_macros.h" ACE_RCSID(tests, New_Fail_Test, "$Id$") diff --git a/tests/OS_Test.cpp b/tests/OS_Test.cpp index e11b78c3278..343c31119ff 100644 --- a/tests/OS_Test.cpp +++ b/tests/OS_Test.cpp @@ -13,7 +13,14 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_strings.h" +#include "ace/OS_NS_stdlib.h" +#include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_sys_stat.h" +#include "ace/OS_NS_unistd.h" #include "test_config.h" ACE_RCSID(tests, OS_Test, "$Id$") @@ -141,11 +148,11 @@ string_emulation_test (void) const char *memchr1 = "abcdefghijklmnopqrstuvwxyz"; - ACE_ASSERT (ACE_OS_String::memchr (ACE_static_cast (const void *, NULL), - 'a', - 0) == NULL); - ACE_ASSERT (ACE_OS_String::memchr (memchr1, 'a', sizeof (memchr1)) != NULL); - ACE_ASSERT (ACE_OS_String::memchr (memchr1, '1', sizeof (memchr1)) == NULL); + ACE_ASSERT (ACE_OS::memchr (ACE_static_cast (const void *, NULL), + 'a', + 0) == NULL); + ACE_ASSERT (ACE_OS::memchr (memchr1, 'a', sizeof (memchr1)) != NULL); + ACE_ASSERT (ACE_OS::memchr (memchr1, '1', sizeof (memchr1)) == NULL); // ======================================================================== // Test strchr @@ -153,9 +160,9 @@ string_emulation_test (void) const char *strchr1 = "abcdefghijkabcdefghijk"; - ACE_ASSERT (*ACE_OS_String::strchr (strchr1, 'h') == 'h'); - ACE_ASSERT (ACE_OS_String::strchr (strchr1, 'h') == strchr1 + 7); - ACE_ASSERT (ACE_OS_String::strchr (strchr1, '1') == NULL); + ACE_ASSERT (*ACE_OS::strchr (strchr1, 'h') == 'h'); + ACE_ASSERT (ACE_OS::strchr (strchr1, 'h') == strchr1 + 7); + ACE_ASSERT (ACE_OS::strchr (strchr1, '1') == NULL); // ======================================================================== // Test strrchr @@ -163,9 +170,9 @@ string_emulation_test (void) const char *strrchr1 = "abcdefghijkabcdefghijk"; - ACE_ASSERT (*ACE_OS_String::strrchr (strrchr1, 'h') == 'h'); - ACE_ASSERT (ACE_OS_String::strrchr (strrchr1, 'h') == strrchr1 + 18); - ACE_ASSERT (ACE_OS_String::strrchr (strrchr1, '1') == NULL); + ACE_ASSERT (*ACE_OS::strrchr (strrchr1, 'h') == 'h'); + ACE_ASSERT (ACE_OS::strrchr (strrchr1, 'h') == strrchr1 + 18); + ACE_ASSERT (ACE_OS::strrchr (strrchr1, '1') == NULL); // ======================================================================== // Test strcspn @@ -173,8 +180,8 @@ string_emulation_test (void) const char *strcspn1 = "abcdefghijkabcdefghijk"; - ACE_ASSERT (ACE_OS_String::strcspn (strcspn1, "d") == 3); - ACE_ASSERT (ACE_OS_String::strcspn (strcspn1, "abcdefghijk") == 0); + ACE_ASSERT (ACE_OS::strcspn (strcspn1, "d") == 3); + ACE_ASSERT (ACE_OS::strcspn (strcspn1, "abcdefghijk") == 0); // ======================================================================== // Test strcasecmp @@ -186,11 +193,11 @@ string_emulation_test (void) const char *strcasecmp4 = "STRINGF"; // Different case const char *strcasecmp5 = "stringe"; // The last letter is lower - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp1) == 0); - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp2) < 0); - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp3) < 0); - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp4) == 0); - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp5) > 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp1) == 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp2) < 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp3) < 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp4) == 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp5) > 0); // ======================================================================== // Test strtok_r @@ -199,23 +206,23 @@ string_emulation_test (void) char strtok_r1[] = "A string of tokens"; char *strtok_r2; - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok_r (strtok_r1, - " ", - &strtok_r2), - "A") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok_r (0, - " ", - &strtok_r2), - "string") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok_r (0, - " ", - &strtok_r2), - "of") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok_r (0, - " ", - &strtok_r2), - "tokens") == 0); - ACE_ASSERT (ACE_OS_String::strtok_r (0, " ", &strtok_r2) == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::strtok_r (strtok_r1, + " ", + &strtok_r2), + "A") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::strtok_r (0, + " ", + &strtok_r2), + "string") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::strtok_r (0, + " ", + &strtok_r2), + "of") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::strtok_r (0, + " ", + &strtok_r2), + "tokens") == 0); + ACE_ASSERT (ACE_OS::strtok_r (0, " ", &strtok_r2) == 0); // ======================================================================== // Test itoa @@ -223,32 +230,32 @@ string_emulation_test (void) char itoa1[33]; - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (42, itoa1, 2), - "101010") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (42, itoa1, 2), + "101010") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (42, itoa1, 3), - "1120") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (42, itoa1, 3), + "1120") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (42, itoa1, 16), - "2a") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (42, itoa1, 16), + "2a") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (8, itoa1, 10), - "8") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (8, itoa1, 10), + "8") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (-8, itoa1, 10), - "-8") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (-8, itoa1, 10), + "-8") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (20345, itoa1, 10), - "20345") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (20345, itoa1, 10), + "20345") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (-20345, itoa1, 10), - "-20345") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (-20345, itoa1, 10), + "-20345") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (4566733, itoa1, 10), - "4566733") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (4566733, itoa1, 10), + "4566733") == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (-4566733, itoa1, 10), - "-4566733") == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (-4566733, itoa1, 10), + "-4566733") == 0); } #if defined (ACE_HAS_WCHAR) @@ -259,14 +266,14 @@ string_emulation_test (void) wchar_t itow1[33]; - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (42, itow1, 2), - ACE_TEXT_WIDE ("101010")) == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (42, itow1, 2), + ACE_TEXT_WIDE ("101010")) == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (42, itow1, 3), - ACE_TEXT_WIDE ("1120")) == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (42, itow1, 3), + ACE_TEXT_WIDE ("1120")) == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::itoa (42, itow1, 16), - ACE_TEXT_WIDE ("2a")) == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::itoa (42, itow1, 16), + ACE_TEXT_WIDE ("2a")) == 0); // ======================================================================== @@ -279,11 +286,11 @@ string_emulation_test (void) const wchar_t *strcmp4 = ACE_TEXT_WIDE ("STRINGF"); const wchar_t *strcmp5 = ACE_TEXT_WIDE ("stringe"); - ACE_ASSERT (ACE_OS_String::strcmp (strcmp1, strcmp1) == 0); - ACE_ASSERT (ACE_OS_String::strcmp (strcmp1, strcmp2) < 0); - ACE_ASSERT (ACE_OS_String::strcmp (strcmp1, strcmp3) < 0); - ACE_ASSERT (ACE_OS_String::strcmp (strcmp1, strcmp4) != 0); - ACE_ASSERT (ACE_OS_String::strcmp (strcmp1, strcmp5) > 0); + ACE_ASSERT (ACE_OS::strcmp (strcmp1, strcmp1) == 0); + ACE_ASSERT (ACE_OS::strcmp (strcmp1, strcmp2) < 0); + ACE_ASSERT (ACE_OS::strcmp (strcmp1, strcmp3) < 0); + ACE_ASSERT (ACE_OS::strcmp (strcmp1, strcmp4) != 0); + ACE_ASSERT (ACE_OS::strcmp (strcmp1, strcmp5) > 0); // ======================================================================== // Test strcpy (wchar_t version) @@ -293,9 +300,9 @@ string_emulation_test (void) wchar_t strcpy2[27]; ACE_ASSERT - (ACE_OS_String::strcmp (ACE_OS_String::strcpy (strcpy2, strcpy1), - strcpy1) == 0); - ACE_ASSERT (ACE_OS_String::strcmp (strcpy2, strcpy1) == 0); + (ACE_OS::strcmp (ACE_OS::strcpy (strcpy2, strcpy1), + strcpy1) == 0); + ACE_ASSERT (ACE_OS::strcmp (strcpy2, strcpy1) == 0); // ======================================================================== // Test strcat (wchar_t version) @@ -306,9 +313,9 @@ string_emulation_test (void) const wchar_t *strcat3 = ACE_TEXT_WIDE ("mnopqrstuvwxyz"); ACE_ASSERT - (ACE_OS_String::strcmp (ACE_OS_String::strcat (strcat2, strcat3), - strcat1) == 0); - ACE_ASSERT (ACE_OS_String::strcmp (strcat2, strcat1) == 0); + (ACE_OS::strcmp (ACE_OS::strcat (strcat2, strcat3), + strcat1) == 0); + ACE_ASSERT (ACE_OS::strcmp (strcat2, strcat1) == 0); // ======================================================================== // Test strncat (wchar_t version) @@ -319,9 +326,9 @@ string_emulation_test (void) const wchar_t *strncat3 = ACE_TEXT_WIDE ("mnopqrstuvwxyzabc"); ACE_ASSERT - (ACE_OS_String::strcmp (ACE_OS_String::strncat (strncat2, strncat3, 14), - strncat1) == 0); - ACE_ASSERT (ACE_OS_String::strcmp (strncat2, strncat1) == 0); + (ACE_OS::strcmp (ACE_OS::strncat (strncat2, strncat3, 14), + strncat1) == 0); + ACE_ASSERT (ACE_OS::strcmp (strncat2, strncat1) == 0); // ======================================================================== // Test strspn (wchar_t version) @@ -329,10 +336,10 @@ string_emulation_test (void) const wchar_t *strspn1 = ACE_TEXT_WIDE ("abcdefghijkabcdefghijk"); - ACE_ASSERT (ACE_OS_String::strspn (strspn1, - ACE_TEXT_WIDE ("abcdf")) == 4); - ACE_ASSERT (ACE_OS_String::strspn (strspn1, - ACE_TEXT_WIDE ("mno")) == 0); + ACE_ASSERT (ACE_OS::strspn (strspn1, + ACE_TEXT_WIDE ("abcdf")) == 4); + ACE_ASSERT (ACE_OS::strspn (strspn1, + ACE_TEXT_WIDE ("mno")) == 0); // ======================================================================== // Test strchr (wchar_t version) @@ -340,11 +347,11 @@ string_emulation_test (void) const wchar_t *strchr1 = ACE_TEXT_WIDE ("abcdefghijkabcdefghijk"); - ACE_ASSERT (*ACE_OS_String::strchr (strchr1, ACE_TEXT_WIDE ('h')) - == ACE_TEXT_WIDE ('h')); - ACE_ASSERT (ACE_OS_String::strchr (strchr1, ACE_TEXT_WIDE ('h')) - == strchr1 + 7); - ACE_ASSERT (ACE_OS_String::strchr (strchr1, ACE_TEXT_WIDE ('1')) == NULL); + ACE_ASSERT (*ACE_OS::strchr (strchr1, ACE_TEXT_WIDE ('h')) + == ACE_TEXT_WIDE ('h')); + ACE_ASSERT (ACE_OS::strchr (strchr1, ACE_TEXT_WIDE ('h')) + == strchr1 + 7); + ACE_ASSERT (ACE_OS::strchr (strchr1, ACE_TEXT_WIDE ('1')) == NULL); // ======================================================================== // Test strstr (wchar_t version) @@ -352,13 +359,13 @@ string_emulation_test (void) const wchar_t *strstr1 = ACE_TEXT_WIDE ("abcdefghijkabcdefghijk"); - ACE_ASSERT (ACE_OS_String::strncmp ( - ACE_OS_String::strstr (strstr1, ACE_TEXT_WIDE ("def")), + ACE_ASSERT (ACE_OS::strncmp ( + ACE_OS::strstr (strstr1, ACE_TEXT_WIDE ("def")), ACE_TEXT_WIDE ("def"), 3) == 0); - ACE_ASSERT (ACE_OS_String::strstr (strstr1, - ACE_TEXT_WIDE ("mno")) == 0); + ACE_ASSERT (ACE_OS::strstr (strstr1, + ACE_TEXT_WIDE ("mno")) == 0); // ======================================================================== // Test strlen (wchar_t version) @@ -367,8 +374,8 @@ string_emulation_test (void) const wchar_t *strlen1 = ACE_TEXT_WIDE (""); const wchar_t *strlen2 = ACE_TEXT_WIDE ("12345"); - ACE_ASSERT (ACE_OS_String::strlen (strlen1) == 0); - ACE_ASSERT (ACE_OS_String::strlen (strlen2) == 5); + ACE_ASSERT (ACE_OS::strlen (strlen1) == 0); + ACE_ASSERT (ACE_OS::strlen (strlen2) == 5); // ======================================================================== // Test strpbrk (wchar_t version) @@ -376,9 +383,9 @@ string_emulation_test (void) const wchar_t *strpbrk1 = ACE_TEXT_WIDE ("abcdefghijkabcdefghijk"); - ACE_ASSERT (ACE_OS_String::strpbrk (strpbrk1, ACE_TEXT_WIDE ("ijkb")) + ACE_ASSERT (ACE_OS::strpbrk (strpbrk1, ACE_TEXT_WIDE ("ijkb")) == strpbrk1 + 1); - ACE_ASSERT (ACE_OS_String::strpbrk (strpbrk1, + ACE_ASSERT (ACE_OS::strpbrk (strpbrk1, ACE_TEXT_WIDE ("mno")) == 0); // ======================================================================== @@ -387,11 +394,11 @@ string_emulation_test (void) const wchar_t *strrchr1 = ACE_TEXT_WIDE ("abcdefghijkabcdefghijk"); - ACE_ASSERT (*ACE_OS_String::strrchr (strrchr1, ACE_TEXT_WIDE ('h')) + ACE_ASSERT (*ACE_OS::strrchr (strrchr1, ACE_TEXT_WIDE ('h')) == ACE_TEXT_WIDE ('h')); - ACE_ASSERT (ACE_OS_String::strrchr (strrchr1, ACE_TEXT_WIDE ('h')) + ACE_ASSERT (ACE_OS::strrchr (strrchr1, ACE_TEXT_WIDE ('h')) == strrchr1 + 18); - ACE_ASSERT (ACE_OS_String::strrchr (strrchr1, ACE_TEXT_WIDE ('1')) + ACE_ASSERT (ACE_OS::strrchr (strrchr1, ACE_TEXT_WIDE ('1')) == NULL); // ======================================================================== @@ -404,11 +411,11 @@ string_emulation_test (void) const wchar_t *strcasecmp4 = ACE_TEXT_WIDE ("STRINGF"); const wchar_t *strcasecmp5 = ACE_TEXT_WIDE ("stringe"); - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp1) == 0); - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp2) < 0); - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp3) < 0); - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp4) == 0); - ACE_ASSERT (ACE_OS_String::strcasecmp (strcasecmp1, strcasecmp5) > 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp1) == 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp2) < 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp3) < 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp4) == 0); + ACE_ASSERT (ACE_OS::strcasecmp (strcasecmp1, strcasecmp5) > 0); // ======================================================================== // Test strncasecmp (wchar_t version) @@ -421,15 +428,15 @@ string_emulation_test (void) const wchar_t *strncasecmp5 = ACE_TEXT_WIDE ("stringe"); ACE_ASSERT - (ACE_OS_String::strncasecmp (strncasecmp1, strncasecmp2, 7) == 0); + (ACE_OS::strncasecmp (strncasecmp1, strncasecmp2, 7) == 0); ACE_ASSERT - (ACE_OS_String::strncasecmp (strncasecmp1, strncasecmp2, 8) < 0); + (ACE_OS::strncasecmp (strncasecmp1, strncasecmp2, 8) < 0); ACE_ASSERT - (ACE_OS_String::strncasecmp (strncasecmp1, strncasecmp3, 7) < 0); + (ACE_OS::strncasecmp (strncasecmp1, strncasecmp3, 7) < 0); ACE_ASSERT - (ACE_OS_String::strncasecmp (strncasecmp1, strncasecmp4, 7) == 0); + (ACE_OS::strncasecmp (strncasecmp1, strncasecmp4, 7) == 0); ACE_ASSERT - (ACE_OS_String::strncasecmp (strncasecmp1, strncasecmp5, 7) > 0); + (ACE_OS::strncasecmp (strncasecmp1, strncasecmp5, 7) > 0); // ======================================================================== // Test strncmp (wchar_t version) @@ -441,11 +448,11 @@ string_emulation_test (void) const wchar_t *strncmp4 = ACE_TEXT_WIDE ("STRINGF"); const wchar_t *strncmp5 = ACE_TEXT_WIDE ("stringe"); - ACE_ASSERT (ACE_OS_String::strncmp (strncmp1, strncmp2, 7) == 0); - ACE_ASSERT (ACE_OS_String::strncmp (strncmp1, strncmp2, 8) < 0); - ACE_ASSERT (ACE_OS_String::strncmp (strncmp1, strncmp3, 7) < 0); - ACE_ASSERT (ACE_OS_String::strncmp (strncmp1, strncmp4, 7) != 0); - ACE_ASSERT (ACE_OS_String::strncmp (strncmp1, strncmp5, 7) > 0); + ACE_ASSERT (ACE_OS::strncmp (strncmp1, strncmp2, 7) == 0); + ACE_ASSERT (ACE_OS::strncmp (strncmp1, strncmp2, 8) < 0); + ACE_ASSERT (ACE_OS::strncmp (strncmp1, strncmp3, 7) < 0); + ACE_ASSERT (ACE_OS::strncmp (strncmp1, strncmp4, 7) != 0); + ACE_ASSERT (ACE_OS::strncmp (strncmp1, strncmp5, 7) > 0); // ======================================================================== // Test strncpy (wchar_t version) @@ -455,34 +462,34 @@ string_emulation_test (void) wchar_t strncpy2[27]; ACE_ASSERT - (ACE_OS_String::strncmp (ACE_OS_String::strncpy (strncpy2, - strncpy1, - 26), - strncpy1, - 26) == 0); + (ACE_OS::strncmp (ACE_OS::strncpy (strncpy2, + strncpy1, + 26), + strncpy1, + 26) == 0); strncpy1[26] = 0; strncpy2[26] = 0; - ACE_ASSERT (ACE_OS_String::strcmp (strncpy2, strncpy1) == 0); + ACE_ASSERT (ACE_OS::strcmp (strncpy2, strncpy1) == 0); // ======================================================================== // Test strtok (wchar_t version) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing strtok (wchar_t version)\n"))); wchar_t strtok_r1[] = ACE_TEXT_WIDE ("A string of tokens"); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok (strtok_r1, - ACE_TEXT_WIDE (" ")), - ACE_TEXT_WIDE ("A")) == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok (0, - ACE_TEXT_WIDE (" ")), - ACE_TEXT_WIDE ("string") ) == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok (0, - ACE_TEXT_WIDE (" ")), - ACE_TEXT_WIDE ("of") ) == 0); - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok (0, - ACE_TEXT_WIDE (" ")), - ACE_TEXT_WIDE ("tokens") ) == 0); - ACE_ASSERT (ACE_OS_String::strtok (0, ACE_TEXT_WIDE (" ")) == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::strtok (strtok_r1, + ACE_TEXT_WIDE (" ")), + ACE_TEXT_WIDE ("A")) == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::strtok (0, + ACE_TEXT_WIDE (" ")), + ACE_TEXT_WIDE ("string") ) == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::strtok (0, + ACE_TEXT_WIDE (" ")), + ACE_TEXT_WIDE ("of") ) == 0); + ACE_ASSERT (ACE_OS::strcmp (ACE_OS::strtok (0, + ACE_TEXT_WIDE (" ")), + ACE_TEXT_WIDE ("tokens") ) == 0); + ACE_ASSERT (ACE_OS::strtok (0, ACE_TEXT_WIDE (" ")) == 0); } @@ -529,7 +536,7 @@ ctime_r_test (void) if (result == 0) { ACE_TCHAR bufcheck[27]; - ACE_OS_String::strcpy (bufcheck, buf); + ACE_OS::strcpy (bufcheck, buf); if (ACE_OS::ctime_r (&secs, buf, 10) != 0) { ACE_ERROR ((LM_ERROR, @@ -545,7 +552,7 @@ ctime_r_test (void) result = -1; } // Make sure it didn't scribble - else if (ACE_OS_String::strcmp (buf, bufcheck) != 0) + else if (ACE_OS::strcmp (buf, bufcheck) != 0) { result = -1; ACE_ERROR ((LM_ERROR, @@ -571,60 +578,60 @@ string_strsncpy_test (void) // strsncpy() where the max. length doesn't matter ACE_ASSERT - (ACE_OS_String::strcmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 36), - strsncpy1) == 0); + (ACE_OS::strcmp (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 36), + strsncpy1) == 0); // strsncpy() where the max length does matter ACE_ASSERT - (ACE_OS_String::strncmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 26), - strsncpy1, - 25) == 0); + (ACE_OS::strncmp (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 26), + strsncpy1, + 25) == 0); // strsncpy1 and strsncpy2 are different size --> not equal - ACE_ASSERT (ACE_OS_String::strcmp (strsncpy2, strsncpy1) != 0); + ACE_ASSERT (ACE_OS::strcmp (strsncpy2, strsncpy1) != 0); // max. length == 2 --> 1 char available ACE_ASSERT - (ACE_OS_String::strncmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 2), - strsncpy1, - 1) == 0); + (ACE_OS::strncmp (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 2), + strsncpy1, + 1) == 0); // max length == 1 --> empty string ACE_ASSERT - (ACE_OS_String::strlen (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 1)) == 0); + (ACE_OS::strlen (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 1)) == 0); // just preparation for the next assert ACE_ASSERT - (ACE_OS_String::strcmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 36), - strsncpy1) == 0); + (ACE_OS::strcmp (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 36), + strsncpy1) == 0); // A tricky one, if the max. length == 0 --> do nothing // so the strsncpy2 shouldn't change ACE_ASSERT - (ACE_OS_String::strcmp (ACE_OS_String::strsncpy (strsncpy2, - "test", - 0), - strsncpy1) == 0); + (ACE_OS::strcmp (ACE_OS::strsncpy (strsncpy2, + "test", + 0), + strsncpy1) == 0); // If src == dst --> truncate dst if needed! ACE_ASSERT - (ACE_OS_String::strncmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy2, - 10), - strsncpy1, - 9) == 0); + (ACE_OS::strncmp (ACE_OS::strsncpy (strsncpy2, + strsncpy2, + 10), + strsncpy1, + 9) == 0); // size should be 9 (+ '\0' char) - ACE_ASSERT(ACE_OS_String::strlen(strsncpy2) == 9); + ACE_ASSERT(ACE_OS::strlen(strsncpy2) == 9); } @@ -639,61 +646,61 @@ string_strsncpy_test (void) // strsncpy() where the max. length doesn't matter ACE_ASSERT - (ACE_OS_String::strcmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 36), - strsncpy1) == 0); + (ACE_OS::strcmp (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 36), + strsncpy1) == 0); // strsncpy() where the max length does matter ACE_ASSERT - (ACE_OS_String::strncmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 26), - strsncpy1, - 25) == 0); + (ACE_OS::strncmp (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 26), + strsncpy1, + 25) == 0); // strsncpy1 and strsncpy2 are different size --> not equal - ACE_ASSERT (ACE_OS_String::strcmp (strsncpy2, strsncpy1) != 0); + ACE_ASSERT (ACE_OS::strcmp (strsncpy2, strsncpy1) != 0); // max. length == 2 --> 1 char available ACE_ASSERT - (ACE_OS_String::strncmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 2), - strsncpy1, - 1) == 0); + (ACE_OS::strncmp (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 2), + strsncpy1, + 1) == 0); // max length == 1 --> empty string ACE_ASSERT - (ACE_OS_String::strlen (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 1)) == 0); + (ACE_OS::strlen (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 1)) == 0); // just preparation for the next assert ACE_ASSERT - (ACE_OS_String::strcmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy1, - 36), - strsncpy1) == 0); + (ACE_OS::strcmp (ACE_OS::strsncpy (strsncpy2, + strsncpy1, + 36), + strsncpy1) == 0); // A tricky one, if the max. length == 0 --> do nothing // so the strsncpy2 shouldn't change ACE_ASSERT - (ACE_OS_String::strcmp (ACE_OS_String::strsncpy (strsncpy2, - ACE_TEXT_WIDE -("test"), - 0), - strsncpy1) == 0); + (ACE_OS::strcmp (ACE_OS::strsncpy (strsncpy2, + ACE_TEXT_WIDE + ("test"), + 0), + strsncpy1) == 0); // If src == dst --> truncate dst if needed! ACE_ASSERT - (ACE_OS_String::strncmp (ACE_OS_String::strsncpy (strsncpy2, - strsncpy2, - 10), - strsncpy1, - 9) == 0); + (ACE_OS::strncmp (ACE_OS::strsncpy (strsncpy2, + strsncpy2, + 10), + strsncpy1, + 9) == 0); // size should be 9 (+ '\0' char) - ACE_ASSERT(ACE_OS_String::strlen(strsncpy2) == 9); + ACE_ASSERT(ACE_OS::strlen(strsncpy2) == 9); } #endif /* ACE_HAS_WCHAR */ diff --git a/tests/Obstack_Test.cpp b/tests/Obstack_Test.cpp index fde46168f7d..516ff79e83b 100644 --- a/tests/Obstack_Test.cpp +++ b/tests/Obstack_Test.cpp @@ -16,7 +16,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_NS_string.h" #include "ace/Obstack.h" #include "ace/Log_Msg.h" #include "test_config.h" @@ -35,7 +35,7 @@ int run_main (int, ACE_TCHAR *[]) const ACE_TCHAR str2[] = ACE_TEXT ("It's fleece was white as snow; but...."); ACE_Obstack_T<ACE_TCHAR> stack (sizeof (str1) + 1); - for (size_t i = 0; i < ACE_OS_String::strlen (str1); i++) + for (size_t i = 0; i < ACE_OS::strlen (str1); i++) stack.grow_fast (str1[i]); ACE_TCHAR *str = stack.freeze (); @@ -45,7 +45,7 @@ int run_main (int, ACE_TCHAR *[]) ACE_ERROR ((LM_ERROR, ACE_TEXT ("freeze failed!\n"))); ++errors; } - else if (ACE_OS_String::strcmp (str, str1) != 0) + else if (ACE_OS::strcmp (str, str1) != 0) { ACE_ERROR ((LM_ERROR, ACE_TEXT("Lost first string; expected: %s, have: %s\n"), @@ -53,7 +53,7 @@ int run_main (int, ACE_TCHAR *[]) ++errors; } - for (size_t j = 0; j < ACE_OS_String::strlen (str2); ++j) + for (size_t j = 0; j < ACE_OS::strlen (str2); ++j) stack.grow (str2[j]); ACE_TCHAR* temp = stack.freeze(); @@ -71,7 +71,7 @@ int run_main (int, ACE_TCHAR *[]) ++errors; } - for (size_t k = 0; k < ACE_OS_String::strlen (str1); ++k) + for (size_t k = 0; k < ACE_OS::strlen (str1); ++k) stack.grow (str1[k]); ACE_TCHAR* tmp = stack.freeze (); @@ -80,7 +80,7 @@ int run_main (int, ACE_TCHAR *[]) ACE_ERROR ((LM_ERROR, ACE_TEXT ("freeze failed!\n"))); ++errors; } - else if (ACE_OS_String::strcmp (tmp, str1) != 0) + else if (ACE_OS::strcmp (tmp, str1) != 0) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Lost third string; expected: %s, have: %s\n"), @@ -90,7 +90,7 @@ int run_main (int, ACE_TCHAR *[]) stack.unwind (temp); - for (size_t l = 0; l < ACE_OS_String::strlen (str2); ++l) + for (size_t l = 0; l < ACE_OS::strlen (str2); ++l) stack.grow (str2[l]); temp = stack.freeze(); diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp index 188317be335..f1767c1af48 100644 --- a/tests/Pipe_Test.cpp +++ b/tests/Pipe_Test.cpp @@ -21,6 +21,7 @@ #include "ace/Process.h" #include "ace/Get_Opt.h" #include "ace/ACE.h" +#include "ace/OS_NS_stdio.h" ACE_RCSID(tests, Pipe_Test, "$Id$") diff --git a/tests/Priority_Task_Test.cpp b/tests/Priority_Task_Test.cpp index 197c28e8b0e..fe883d27573 100644 --- a/tests/Priority_Task_Test.cpp +++ b/tests/Priority_Task_Test.cpp @@ -21,6 +21,7 @@ #include "test_config.h" #include "ace/Task.h" #include "ace/Sched_Params.h" +#include "ace/OS_NS_errno.h" ACE_RCSID(tests, Priority_Task_Test, "$Id$") diff --git a/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp index bb42a90d68d..4b1821f191f 100644 --- a/tests/Proactor_Test.cpp +++ b/tests/Proactor_Test.cpp @@ -40,6 +40,8 @@ ACE_RCSID (tests, #include "ace/Asynch_Connector.h" #include "ace/Task.h" #include "ace/Thread_Semaphore.h" +#include "ace/OS_NS_signal.h" +#include "ace/os_include/netinet/os_tcp.h" #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) diff --git a/tests/Process_Mutex_Test.cpp b/tests/Process_Mutex_Test.cpp index 38623975e06..42dbfb82d8a 100644 --- a/tests/Process_Mutex_Test.cpp +++ b/tests/Process_Mutex_Test.cpp @@ -17,11 +17,13 @@ // ============================================================================ #include "test_config.h" -#include "ace/Synch.h" +#include "ace/Mutex.h" #include "ace/Process.h" #include "ace/Process_Mutex.h" #include "ace/Get_Opt.h" #include "ace/ACE.h" +#include "ace/OS_NS_stdio.h" +#include "ace/os_include/os_dirent.h" ACE_RCSID(tests, Process_Mutex_Test, "$Id$") diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp index 80dd3a31f11..d871dce2133 100644 --- a/tests/Process_Strategy_Test.cpp +++ b/tests/Process_Strategy_Test.cpp @@ -197,7 +197,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) ACE_TEXT ("Temporary path too long\n")), -1); - ACE_OS_String::strcat (this->filename_, ACE_TEXT ("process_strategy_test_temp")); + ACE_OS::strcat (this->filename_, ACE_TEXT ("process_strategy_test_temp")); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/tests/RB_Tree_Test.cpp b/tests/RB_Tree_Test.cpp index afdae22f04d..5ca2df7bcc7 100644 --- a/tests/RB_Tree_Test.cpp +++ b/tests/RB_Tree_Test.cpp @@ -29,7 +29,7 @@ #include "test_config.h" /* Include first to enable ACE_ASSERT. */ #include "ace/RB_Tree.h" #include "ace/SString.h" -#include "ace/Synch.h" +#include "ace/Null_Mutex.h" #include "RB_Tree_Test.h" diff --git a/tests/RMCast/Main.cpp b/tests/RMCast/Main.cpp index e80f79ca2c2..44b92128394 100644 --- a/tests/RMCast/Main.cpp +++ b/tests/RMCast/Main.cpp @@ -17,7 +17,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_HAS_WINCE) # include "ace/ACE.h" #endif /* ACE_HAS_WINCE */ diff --git a/tests/RMCast/RMCast_Fragment_Test.cpp b/tests/RMCast/RMCast_Fragment_Test.cpp index 5ff54679a0c..9d04bc72fb7 100644 --- a/tests/RMCast/RMCast_Fragment_Test.cpp +++ b/tests/RMCast/RMCast_Fragment_Test.cpp @@ -15,6 +15,7 @@ #include "ace/Message_Block.h" #include "ace/Task.h" #include "ace/RMCast/RMCast_Fragment.h" +#include "ace/OS_NS_time.h" ACE_RCSID(tests, RMCast_Fragment_Test, "$Id$") diff --git a/tests/RMCast/RMCast_Membership_Test.cpp b/tests/RMCast/RMCast_Membership_Test.cpp index 8e6b716cded..4a34a73c5fd 100644 --- a/tests/RMCast/RMCast_Membership_Test.cpp +++ b/tests/RMCast/RMCast_Membership_Test.cpp @@ -14,7 +14,7 @@ #include "ace/RMCast/RMCast_Proxy.h" #include "ace/RMCast/RMCast_Membership.h" #include "ace/ACE.h" - +#include "ace/OS_NS_time.h" #include "ace/Task.h" ACE_RCSID(tests, RMCast_Membership_Test, "$Id$") diff --git a/tests/RMCast/RMCast_Reassembly_Test.cpp b/tests/RMCast/RMCast_Reassembly_Test.cpp index 1e12fc8af4e..48e49fdd907 100644 --- a/tests/RMCast/RMCast_Reassembly_Test.cpp +++ b/tests/RMCast/RMCast_Reassembly_Test.cpp @@ -14,6 +14,7 @@ #include "ace/Task.h" #include "ace/ACE.h" #include "ace/RMCast/RMCast_Reassembly.h" +#include "ace/OS_NS_time.h" ACE_RCSID(tests, RMCast_Reassembly_Test, "$Id$") diff --git a/tests/RMCast/RMCast_Reordering_Test.cpp b/tests/RMCast/RMCast_Reordering_Test.cpp index e17f8b5cabb..f06ea6477c7 100644 --- a/tests/RMCast/RMCast_Reordering_Test.cpp +++ b/tests/RMCast/RMCast_Reordering_Test.cpp @@ -3,6 +3,7 @@ #include "../test_config.h" #include "ace/RMCast/RMCast_Proxy.h" #include "ace/RMCast/RMCast_Reordering.h" +#include "ace/OS_NS_time.h" #include "ace/Task.h" diff --git a/tests/RMCast/RMCast_Retransmission_Test.cpp b/tests/RMCast/RMCast_Retransmission_Test.cpp index 1fdaaeeb601..f5fc31d5955 100644 --- a/tests/RMCast/RMCast_Retransmission_Test.cpp +++ b/tests/RMCast/RMCast_Retransmission_Test.cpp @@ -3,6 +3,7 @@ #include "../test_config.h" #include "ace/RMCast/RMCast_Proxy.h" #include "ace/RMCast/RMCast_Retransmission.h" +#include "ace/OS_NS_time.h" #include "ace/Task.h" diff --git a/tests/Reactor_Notify_Test.cpp b/tests/Reactor_Notify_Test.cpp index f7bd0c3671e..0136a75f64c 100644 --- a/tests/Reactor_Notify_Test.cpp +++ b/tests/Reactor_Notify_Test.cpp @@ -22,12 +22,13 @@ // ============================================================================ #include "test_config.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" #include "ace/Task.h" #include "ace/Pipe.h" #include "ace/Auto_Ptr.h" #include "ace/Reactor.h" #include "ace/Select_Reactor.h" +#include "ace/Thread_Semaphore.h" ACE_RCSID(tests, Reactor_Notify_Test, "$Id$") diff --git a/tests/Reader_Writer_Test.cpp b/tests/Reader_Writer_Test.cpp index 468bff43479..7e270d646e8 100644 --- a/tests/Reader_Writer_Test.cpp +++ b/tests/Reader_Writer_Test.cpp @@ -24,6 +24,8 @@ #include "ace/Thread_Manager.h" #include "ace/Get_Opt.h" #include "ace/Atomic_Op.h" +#include "ace/OS_NS_unistd.h" +#include "ace/Time_Value.h" ACE_RCSID(tests, Reader_Writer_Test, "$Id$") diff --git a/tests/Reverse_Lock_Test.cpp b/tests/Reverse_Lock_Test.cpp index e69f97ecbd8..7cc83e5e929 100644 --- a/tests/Reverse_Lock_Test.cpp +++ b/tests/Reverse_Lock_Test.cpp @@ -19,7 +19,10 @@ // ============================================================================ #include "test_config.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Mutex.h" +#include "ace/Guard_T.h" +#include "ace/Reverse_Lock_T.h" ACE_RCSID(tests, Reverse_Lock_Test, "$Id$") diff --git a/tests/SOCK_Connector_Test.cpp b/tests/SOCK_Connector_Test.cpp index 45dbac561b0..5f7a5bb1899 100644 --- a/tests/SOCK_Connector_Test.cpp +++ b/tests/SOCK_Connector_Test.cpp @@ -18,10 +18,12 @@ // ========================================================================== #include "test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_string.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Connector.h" #include "ace/SOCK_Stream.h" +#include "ace/OS_NS_sys_utsname.h" +#include "ace/OS_NS_netdb.h" ACE_RCSID(tests, SOCK_Connector_Test, "SOCK_Connector_Test.cpp,v 4.34 2000/04/23 21:29:17 brunsch Exp") diff --git a/tests/SOCK_Send_Recv_Test.cpp b/tests/SOCK_Send_Recv_Test.cpp index c8aa7b059b8..495dff5a494 100644 --- a/tests/SOCK_Send_Recv_Test.cpp +++ b/tests/SOCK_Send_Recv_Test.cpp @@ -25,7 +25,7 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_sys_wait.h" #include "ace/Thread.h" #include "ace/Thread_Manager.h" #include "ace/SOCK_Connector.h" diff --git a/tests/SOCK_Test.cpp b/tests/SOCK_Test.cpp index db2a630a594..bdfa79f2a6a 100644 --- a/tests/SOCK_Test.cpp +++ b/tests/SOCK_Test.cpp @@ -21,7 +21,8 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_sys_select.h" +#include "ace/OS_NS_sys_wait.h" #include "ace/Thread.h" #include "ace/Thread_Manager.h" #include "ace/SOCK_Connector.h" diff --git a/tests/SPIPE_Test.cpp b/tests/SPIPE_Test.cpp index 0f472e9f918..c8ac22b648a 100644 --- a/tests/SPIPE_Test.cpp +++ b/tests/SPIPE_Test.cpp @@ -22,7 +22,6 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" #include "ace/Thread.h" #include "ace/Thread_Manager.h" #include "ace/SPIPE_Addr.h" diff --git a/tests/SSL/Main.cpp b/tests/SSL/Main.cpp index e80f79ca2c2..44b92128394 100644 --- a/tests/SSL/Main.cpp +++ b/tests/SSL/Main.cpp @@ -17,7 +17,7 @@ // // ============================================================================ -#include "ace/OS.h" +#include "ace/OS_main.h" #if defined (ACE_HAS_WINCE) # include "ace/ACE.h" #endif /* ACE_HAS_WINCE */ diff --git a/tests/Semaphore_Test.cpp b/tests/Semaphore_Test.cpp index 8e69393b972..3561fac9e7c 100644 --- a/tests/Semaphore_Test.cpp +++ b/tests/Semaphore_Test.cpp @@ -18,10 +18,13 @@ // ============================================================================ #include "test_config.h" -#include "ace/Synch.h" +#include "ace/Thread_Semaphore.h" #include "ace/Thread.h" #include "ace/Thread_Manager.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Semaphore_Test, "$Id$") diff --git a/tests/Signal_Test.cpp b/tests/Signal_Test.cpp index f0767e2e608..cbb8298c306 100644 --- a/tests/Signal_Test.cpp +++ b/tests/Signal_Test.cpp @@ -25,6 +25,7 @@ #include "ace/Get_Opt.h" #include "ace/ARGV.h" #include "ace/ACE.h" +#include "ace/OS_NS_signal.h" ACE_RCSID(tests, Signal_Test, "$Id$") diff --git a/tests/Sigset_Ops_Test.cpp b/tests/Sigset_Ops_Test.cpp index 45988cfb6d2..3c6f4439fc0 100644 --- a/tests/Sigset_Ops_Test.cpp +++ b/tests/Sigset_Ops_Test.cpp @@ -19,7 +19,8 @@ // ============================================================================ #include "test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_signal.h" +#include "ace/OS_NS_errno.h" ACE_RCSID(tests, Sigset_Ops_Test, "$Id$") diff --git a/tests/Simple_Message_Block_Test.cpp b/tests/Simple_Message_Block_Test.cpp index 2e727410c38..788ab0fff3e 100644 --- a/tests/Simple_Message_Block_Test.cpp +++ b/tests/Simple_Message_Block_Test.cpp @@ -21,7 +21,10 @@ #include "test_config.h" #include "ace/Message_Block.h" -#include "ace/Synch.h" +#include "ace/Synch_Traits.h" +#include "ace/Lock_Adapter_T.h" +#include "ace/OS_NS_string.h" +#include "ace/Thread_Mutex.h" ACE_RCSID(tests, Simple_Message_Block_Test, "$Id$") diff --git a/tests/TP_Reactor_Test.cpp b/tests/TP_Reactor_Test.cpp index bf47bb328d2..61039f41f14 100644 --- a/tests/TP_Reactor_Test.cpp +++ b/tests/TP_Reactor_Test.cpp @@ -61,6 +61,9 @@ #include "ace/Reactor.h" #include "ace/TP_Reactor.h" +#include "ace/OS_NS_signal.h" +#include "ace/Synch_Traits.h" +#include "ace/Thread_Semaphore.h" ACE_RCSID(TPReactor, TPReactor_Test, "TPReactor_Test.cpp,v 1.27 2000/03/07 17:15:56 schmidt Exp") @@ -822,7 +825,7 @@ Sender::initiate_write (void) { if ( this->msg_queue ()->message_count () < 20) // flow control { - size_t nbytes = ACE_OS_String::strlen (send_buf_); + size_t nbytes = ACE_OS::strlen (send_buf_); ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, diff --git a/tests/TP_Reactor_Test.h b/tests/TP_Reactor_Test.h index db6728c3763..a04a6e5ca1a 100644 --- a/tests/TP_Reactor_Test.h +++ b/tests/TP_Reactor_Test.h @@ -20,7 +20,6 @@ #ifndef ACE_TESTS_TP_REACTOR_TEST_H #define ACE_TESTS_TP_REACTOR_TEST_H -#include "ace/OS.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Connector.h" diff --git a/tests/TSS_Test.cpp b/tests/TSS_Test.cpp index 1515af06be4..2da81d0ab3d 100644 --- a/tests/TSS_Test.cpp +++ b/tests/TSS_Test.cpp @@ -21,7 +21,7 @@ // ============================================================================ #include "test_config.h" -#include "ace/Synch.h" +#include "ace/OS_NS_unistd.h" #include "ace/Thread_Manager.h" #include "ace/Signal.h" #include "TSS_Test_Errno.h" diff --git a/tests/Test_Output.cpp b/tests/Test_Output.cpp index 4c5106d5ae8..f67fbd81549 100644 --- a/tests/Test_Output.cpp +++ b/tests/Test_Output.cpp @@ -17,7 +17,9 @@ // ============================================================================ #include "tests/test_config.h" -#include "ace/OS.h" +#include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_sys_stat.h" +#include "ace/Guard_T.h" #include "ace/Object_Manager.h" #include "ace/streams.h" #include "ace/Framework_Component.h" diff --git a/tests/Thread_Manager_Test.cpp b/tests/Thread_Manager_Test.cpp index 7bb10bfe411..ba32ecfc487 100644 --- a/tests/Thread_Manager_Test.cpp +++ b/tests/Thread_Manager_Test.cpp @@ -24,6 +24,7 @@ #include "ace/Thread_Manager.h" #include "ace/Signal.h" #include "ace/Task.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Thread_Manager_Test, "$Id$") diff --git a/tests/Thread_Mutex_Test.cpp b/tests/Thread_Mutex_Test.cpp index 79ec0f26399..f40250d6754 100644 --- a/tests/Thread_Mutex_Test.cpp +++ b/tests/Thread_Mutex_Test.cpp @@ -21,6 +21,9 @@ #include "test_config.h" #include "ace/Thread_Manager.h" #include "ace/Process_Mutex.h" +#include "ace/OS_NS_sys_time.h" +#include "ace/OS_NS_time.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Thread_Mutex_Test, "$Id$") diff --git a/tests/Thread_Pool_Reactor_Resume_Test.cpp b/tests/Thread_Pool_Reactor_Resume_Test.cpp index 711457aecd7..87ea2e1fee9 100644 --- a/tests/Thread_Pool_Reactor_Resume_Test.cpp +++ b/tests/Thread_Pool_Reactor_Resume_Test.cpp @@ -293,7 +293,7 @@ worker (void *) ACE_OS::sleep (3); const ACE_TCHAR *msg = ACE_TEXT ("Message from Connection worker"); ACE_TCHAR buf [BUFSIZ]; - buf[0] = ACE_static_cast (ACE_TCHAR, (ACE_OS_String::strlen (msg) + 1)); + buf[0] = ACE_static_cast (ACE_TCHAR, (ACE_OS::strlen (msg) + 1)); ACE_OS::strcpy (&buf[1], msg); ACE_INET_Addr addr (rendezvous); diff --git a/tests/Thread_Pool_Reactor_Test.cpp b/tests/Thread_Pool_Reactor_Test.cpp index 4e818b1339e..1aeac44f713 100644 --- a/tests/Thread_Pool_Reactor_Test.cpp +++ b/tests/Thread_Pool_Reactor_Test.cpp @@ -251,7 +251,7 @@ worker (void *) ACE_OS::sleep (3); const ACE_TCHAR *msg = ACE_TEXT ("Message from Connection worker"); ACE_TCHAR buf [BUFSIZ]; - buf[0] = ACE_static_cast (ACE_TCHAR, (ACE_OS_String::strlen (msg) + 1)); + buf[0] = ACE_static_cast (ACE_TCHAR, (ACE_OS::strlen (msg) + 1)); ACE_OS::strcpy (&buf[1], msg); ACE_INET_Addr addr (rendezvous); diff --git a/tests/Thread_Pool_Test.cpp b/tests/Thread_Pool_Test.cpp index d26bce9915c..c5bbd4e4aa0 100644 --- a/tests/Thread_Pool_Test.cpp +++ b/tests/Thread_Pool_Test.cpp @@ -31,6 +31,7 @@ ACE_RCSID(tests, Thread_Pool_Test, "$Id$") #if defined (ACE_HAS_THREADS) #include "ace/Lock_Adapter_T.h" +#include "ace/OS_NS_unistd.h" // Number of iterations to run the test. static size_t n_iterations = 100; diff --git a/tests/Time_Service_Test.cpp b/tests/Time_Service_Test.cpp index e4d1fd4e158..94f02605775 100644 --- a/tests/Time_Service_Test.cpp +++ b/tests/Time_Service_Test.cpp @@ -66,7 +66,7 @@ run_main (int, ACE_TCHAR *[]) } // Add the filename to the end - ACE_OS_String::strcat (backing_store, + ACE_OS::strcat (backing_store, ACE_TEXT ("ace-malloc-XXXXXX")); #endif /* ACE_DEFAULT_BACKING_STORE */ diff --git a/tests/Timeprobe_Test.cpp b/tests/Timeprobe_Test.cpp index 83bb71aa4e6..541d4d06bea 100644 --- a/tests/Timeprobe_Test.cpp +++ b/tests/Timeprobe_Test.cpp @@ -25,6 +25,7 @@ #include "ace/Singleton.h" #include "ace/Synch_Traits.h" #include "ace/Recursive_Thread_Mutex.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Timeprobe_Test, "$Id$") diff --git a/tests/Timer_Queue_Reference_Counting_Test.cpp b/tests/Timer_Queue_Reference_Counting_Test.cpp index 9b4b9cf70e5..52c38bc0df5 100644 --- a/tests/Timer_Queue_Reference_Counting_Test.cpp +++ b/tests/Timer_Queue_Reference_Counting_Test.cpp @@ -27,6 +27,7 @@ #include "ace/Reactor.h" #include "ace/Recursive_Thread_Mutex.h" #include "ace/Null_Mutex.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Timer_Queue_Reference_Counting_Test, "$Id$") diff --git a/tests/Timer_Queue_Test.cpp b/tests/Timer_Queue_Test.cpp index 6ca67a9aafd..0ea7e561998 100644 --- a/tests/Timer_Queue_Test.cpp +++ b/tests/Timer_Queue_Test.cpp @@ -33,6 +33,7 @@ #include "ace/Timer_Queue.h" #include "ace/Recursive_Thread_Mutex.h" #include "ace/Null_Mutex.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Timer_Queue_Test, "$Id$") diff --git a/tests/Upgradable_RW_Test.h b/tests/Upgradable_RW_Test.h index cfcee6a0675..41c6c0dba1e 100644 --- a/tests/Upgradable_RW_Test.h +++ b/tests/Upgradable_RW_Test.h @@ -22,7 +22,7 @@ #define ACE_TESTS_UPGRADABLE_RW_TEST_H #include "test_config.h" -#include "ace/Synch.h" +#include "ace/Barrier.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once |