diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-06-14 11:44:36 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-06-14 11:44:36 +0000 |
commit | daf1f0c5471e618ea85f9d80c291dd73fc0afb21 (patch) | |
tree | 894350f10724f6d21213455109e24aef32c9d381 | |
parent | c17f412685a315c07bbd1034885baed76624f3fd (diff) | |
download | ATCD-daf1f0c5471e618ea85f9d80c291dd73fc0afb21.tar.gz |
ChangeLogTag: Mon Jun 14 11:32:12 2004 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
26 files changed, 36 insertions, 9 deletions
diff --git a/netsvcs/lib/Name_Handler.cpp b/netsvcs/lib/Name_Handler.cpp index 25f8bf1dd2e..63bb145c537 100644 --- a/netsvcs/lib/Name_Handler.cpp +++ b/netsvcs/lib/Name_Handler.cpp @@ -30,7 +30,7 @@ template class ACE_Strategy_Acceptor<ACE_Name_Handler, ACE_SOCK_ACCEPTOR>; #pragma instantiate ACE_Schedule_All_Reactive_Strategy<ACE_Name_Handler> #pragma instantiate ACE_Scheduling_Strategy<ACE_Name_Handler> #pragma instantiate ACE_Strategy_Acceptor<ACE_Name_Handler, ACE_SOCK_ACCEPTOR> -#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux)) +#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<Naming_Context, ACE_SYNCH_NULL_MUTEX> * ACE_Singleton<Naming_Context, ACE_SYNCH_NULL_MUTEX>::singleton_; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/netsvcs/lib/Server_Logging_Handler.cpp b/netsvcs/lib/Server_Logging_Handler.cpp index 1b5766fa870..d8f22a0cbdb 100644 --- a/netsvcs/lib/Server_Logging_Handler.cpp +++ b/netsvcs/lib/Server_Logging_Handler.cpp @@ -236,7 +236,7 @@ template class ACE_Thr_Server_Logging_Handler<Synch_Receiver>; // That specialization is in TS_Server_Handler.cpp, so we don't need it // here. #endif /* ACE_HAS_TLI */ -#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux)) +#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH, diff --git a/tests/Config_Test.cpp b/tests/Config_Test.cpp index 16be84c278a..7774c0be3a7 100644 --- a/tests/Config_Test.cpp +++ b/tests/Config_Test.cpp @@ -25,6 +25,7 @@ #include "ace/OS_NS_errno.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Config_Test, "$Id$") diff --git a/tests/Framework_Component_DLL.cpp b/tests/Framework_Component_DLL.cpp index 894d1af9f4f..d4a141ff3d6 100644 --- a/tests/Framework_Component_DLL.cpp +++ b/tests/Framework_Component_DLL.cpp @@ -80,7 +80,7 @@ template class ACE_Framework_Component_T<ACE_DLL_Singleton_T<FWCT_DLL_Singleton_ ACE_SYNCH_MUTEX > #pragma instantiate ACE_Framework_Component_T<ACE_DLL_Singleton_T<FWCT_DLL_Singleton_Adapter_T<Simple_Service>, ACE_SYNCH_MUTEX> >; -#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux)) +#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_DLL_Singleton_T<FWCT_DLL_Singleton_Adapter_T <Simple_Service>, ACE_SYNCH_MUTEX> * diff --git a/tests/Log_Msg_Test.cpp b/tests/Log_Msg_Test.cpp index 46ce9839b4a..1afdfb6c737 100644 --- a/tests/Log_Msg_Test.cpp +++ b/tests/Log_Msg_Test.cpp @@ -29,6 +29,10 @@ #include "ace/Auto_Ptr.h" #include "ace/Log_Msg_Callback.h" #include "ace/Log_Record.h" +#include "ace/OS_NS_fcntl.h" +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_Memory.h" ACE_RCSID(tests, Log_Msg_Test, "$Id$") diff --git a/tests/MEM_Stream_Test.cpp b/tests/MEM_Stream_Test.cpp index ea85cfd87a9..a5e113e7924 100644 --- a/tests/MEM_Stream_Test.cpp +++ b/tests/MEM_Stream_Test.cpp @@ -520,7 +520,7 @@ template class ACE_Thread_Strategy<Echo_Handler>; # if defined (ACE_HAS_THREADS) #pragma instantiate ACE_Thread_Strategy<Echo_Handler> # endif /* ACE_HAS_THREADS */ -#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux)) +#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_short>, ACE_SYNCH_RECURSIVE_MUTEX> * diff --git a/tests/MM_Shared_Memory_Test.cpp b/tests/MM_Shared_Memory_Test.cpp index 1e530fc1d7e..557c9c38fe5 100644 --- a/tests/MM_Shared_Memory_Test.cpp +++ b/tests/MM_Shared_Memory_Test.cpp @@ -28,6 +28,7 @@ #include "ace/Thread_Manager.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, MM_Shared_Memory_Test, "$Id$") diff --git a/tests/MT_Reactor_Timer_Test.cpp b/tests/MT_Reactor_Timer_Test.cpp index 4d67cd15644..1b83864122e 100644 --- a/tests/MT_Reactor_Timer_Test.cpp +++ b/tests/MT_Reactor_Timer_Test.cpp @@ -22,6 +22,7 @@ #include "test_config.h" #include "MT_Reactor_Timer_Test.h" #include "ace/ACE.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, MT_Reactor_Timer_Test, "$Id$") diff --git a/tests/MT_Reference_Counted_Event_Handler_Test.cpp b/tests/MT_Reference_Counted_Event_Handler_Test.cpp index c5805c49e83..f02daa27c65 100644 --- a/tests/MT_Reference_Counted_Event_Handler_Test.cpp +++ b/tests/MT_Reference_Counted_Event_Handler_Test.cpp @@ -39,6 +39,7 @@ #include "ace/Auto_Event.h" #include "ace/OS_NS_signal.h" #include "ace/OS_NS_time.h" +#include "ace/OS_NS_sys_socket.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 a82d7a19aaa..92ec9e78985 100644 --- a/tests/MT_SOCK_Test.cpp +++ b/tests/MT_SOCK_Test.cpp @@ -31,6 +31,7 @@ #include "ace/SOCK_Connector.h" #include "ace/SOCK_Acceptor.h" #include "ace/Handle_Set.h" +#include "ace/Time_Value.h" ACE_RCSID(tests, MT_SOCK_Test, "$Id$") diff --git a/tests/Mem_Map_Test.cpp b/tests/Mem_Map_Test.cpp index 3f1d694e4dc..8deba91d1a6 100644 --- a/tests/Mem_Map_Test.cpp +++ b/tests/Mem_Map_Test.cpp @@ -23,6 +23,9 @@ #include "ace/Mem_Map.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_fcntl.h" +#include "ace/OS_Memory.h" ACE_RCSID(tests, Mem_Map_Test, "Mem_Map_Test.cpp,v 4.36 2003/11/01 11:15:25 dhinton Exp") @@ -68,7 +71,7 @@ create_test_file (ACE_TCHAR *filename, int line_length, int num_lines) ACE_NEW_RETURN (mybuf, char[line_length + 1], -1); const char *c = ACE_ALPHABET; const char *d = c; -#if defined (__QNXNTO__) +#if defined (__QNXNTO__) // For NTO has to applied to open the file, as Mem_Map can map only shared memory ACE_Mem_Map mmap_4_open; mmap_4_open.open (filename, O_RDWR | O_CREAT | O_TRUNC, ACE_DEFAULT_FILE_PERMS); @@ -116,7 +119,7 @@ create_test_file (ACE_TCHAR *filename, int line_length, int num_lines) -1); } } -#if defined (__QNXNTO__) +#if defined (__QNXNTO__) mmap_4_open.close(); #else ACE_OS::close (file_handle); @@ -180,7 +183,7 @@ run_main (int, ACE_TCHAR *[]) -1); // Now create a temporary file for intermediate processing -#if defined (__QNXNTO__) +#if defined (__QNXNTO__) ACE_Mem_Map mmap_4_open; mmap_4_open.open(temp_file1, O_RDWR | O_TRUNC | O_CREAT, diff --git a/tests/Naming_Test.cpp b/tests/Naming_Test.cpp index b93143e2d3c..04b76992dfc 100644 --- a/tests/Naming_Test.cpp +++ b/tests/Naming_Test.cpp @@ -25,6 +25,7 @@ #include "ace/Profile_Timer.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Naming_Test, "$Id$") diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp index 7495b432026..08e897b99ae 100644 --- a/tests/Pipe_Test.cpp +++ b/tests/Pipe_Test.cpp @@ -22,6 +22,7 @@ #include "ace/Get_Opt.h" #include "ace/ACE.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Pipe_Test, "$Id$") diff --git a/tests/Proactor_Scatter_Gather_Test.cpp b/tests/Proactor_Scatter_Gather_Test.cpp index 078c2c5444c..de281142de2 100644 --- a/tests/Proactor_Scatter_Gather_Test.cpp +++ b/tests/Proactor_Scatter_Gather_Test.cpp @@ -41,6 +41,8 @@ #include "ace/Min_Max.h" #include "ace/OS_NS_math.h" #include "ace/OS_NS_sys_stat.h" +#include "ace/OS_NS_fcntl.h" +#include "ace/OS_NS_unistd.h" #include "ace/SOCK_Connector.h" diff --git a/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp index b385cea7780..a4dfbb6ca44 100644 --- a/tests/Proactor_Test.cpp +++ b/tests/Proactor_Test.cpp @@ -42,6 +42,7 @@ ACE_RCSID (tests, #include "ace/OS_NS_errno.h" #include "ace/OS_NS_signal.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.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 ee2202fb234..98ae4330f82 100644 --- a/tests/Process_Mutex_Test.cpp +++ b/tests/Process_Mutex_Test.cpp @@ -23,6 +23,7 @@ #include "ace/ACE.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_fcntl.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 3c154c66593..3f6be2b615f 100644 --- a/tests/Process_Strategy_Test.cpp +++ b/tests/Process_Strategy_Test.cpp @@ -86,7 +86,7 @@ template class ACE_Write_Guard<ACE_File_Lock>; #pragma instantiate ACE_Strategy_Acceptor<Counting_Service, ACE_SOCK_ACCEPTOR> #pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> #pragma instantiate ACE_Write_Guard<ACE_File_Lock> -#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux)) +#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<Options, ACE_Null_Mutex> * ACE_Singleton<Options, ACE_Null_Mutex>::singleton_; diff --git a/tests/SOCK_Connector_Test.cpp b/tests/SOCK_Connector_Test.cpp index 5f7a5bb1899..10638824d4e 100644 --- a/tests/SOCK_Connector_Test.cpp +++ b/tests/SOCK_Connector_Test.cpp @@ -21,6 +21,7 @@ #include "ace/OS_NS_string.h" #include "ace/INET_Addr.h" #include "ace/SOCK_Connector.h" +#include "ace/Time_Value.h" #include "ace/SOCK_Stream.h" #include "ace/OS_NS_sys_utsname.h" #include "ace/OS_NS_netdb.h" diff --git a/tests/SOCK_Send_Recv_Test.cpp b/tests/SOCK_Send_Recv_Test.cpp index 495dff5a494..8b393e86534 100644 --- a/tests/SOCK_Send_Recv_Test.cpp +++ b/tests/SOCK_Send_Recv_Test.cpp @@ -26,8 +26,10 @@ #include "test_config.h" #include "ace/OS_NS_sys_wait.h" +#include "ace/OS_NS_unistd.h" #include "ace/Thread.h" #include "ace/Thread_Manager.h" +#include "ace/Time_Value.h" #include "ace/SOCK_Connector.h" #include "ace/SOCK_Acceptor.h" #include "ace/SOCK_Stream.h" diff --git a/tests/SOCK_Test.cpp b/tests/SOCK_Test.cpp index bdfa79f2a6a..d67555340f5 100644 --- a/tests/SOCK_Test.cpp +++ b/tests/SOCK_Test.cpp @@ -24,6 +24,7 @@ #include "ace/OS_NS_sys_select.h" #include "ace/OS_NS_sys_wait.h" #include "ace/Thread.h" +#include "ace/Time_Value.h" #include "ace/Thread_Manager.h" #include "ace/SOCK_Connector.h" #include "ace/SOCK_Acceptor.h" diff --git a/tests/SPIPE_Test.cpp b/tests/SPIPE_Test.cpp index d180180dd98..a9b17ab672c 100644 --- a/tests/SPIPE_Test.cpp +++ b/tests/SPIPE_Test.cpp @@ -28,6 +28,7 @@ #include "ace/SPIPE_Connector.h" #include "ace/SPIPE_Acceptor.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, SPIPE_Test, "SPIPE_Test.cpp,v 4.36 2002/03/06 21:48:03 nanbor Exp") diff --git a/tests/Time_Service_Test.cpp b/tests/Time_Service_Test.cpp index 3028295f80a..faaaf4a5501 100644 --- a/tests/Time_Service_Test.cpp +++ b/tests/Time_Service_Test.cpp @@ -25,6 +25,7 @@ #include "ace/Process.h" #include "ace/ACE.h" #include "ace/OS_NS_string.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Time_Service_Test, "$Id$") diff --git a/tests/Time_Value_Test.cpp b/tests/Time_Value_Test.cpp index b20c195b286..bb8d8e0cf49 100644 --- a/tests/Time_Value_Test.cpp +++ b/tests/Time_Value_Test.cpp @@ -48,6 +48,7 @@ ACE_RCSID(tests, Time_Value_Test, "$Id$") #include "test_config.h" #include "ace/ACE.h" +#include "ace/Time_Value.h" #if defined (sun) && !defined (ACE_LACKS_LONGLONG_T) static diff --git a/tests/Timeprobe_Test.cpp b/tests/Timeprobe_Test.cpp index 541d4d06bea..0fac4b94c72 100644 --- a/tests/Timeprobe_Test.cpp +++ b/tests/Timeprobe_Test.cpp @@ -126,7 +126,7 @@ run_main (int, ACE_TCHAR *[]) template class ACE_Singleton <int, ACE_SYNCH_RECURSIVE_MUTEX>; # elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate ACE_Singleton <int, ACE_SYNCH_RECURSIVE_MUTEX> -# elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux)) +# elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) template ACE_Singleton<int, ACE_SYNCH_RECURSIVE_MUTEX> * ACE_Singleton<int, ACE_SYNCH_RECURSIVE_MUTEX>::singleton_; # endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/tests/Tokens_Test.cpp b/tests/Tokens_Test.cpp index 3035402b797..b6c9625f2c6 100644 --- a/tests/Tokens_Test.cpp +++ b/tests/Tokens_Test.cpp @@ -34,6 +34,7 @@ #include "ace/Thread_Manager.h" #include "ace/Token_Invariants.h" #include "ace/Barrier.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, Tokens_Test, "$Id$") diff --git a/tests/UPIPE_SAP_Test.cpp b/tests/UPIPE_SAP_Test.cpp index be1bcb266c5..a8849480a0d 100644 --- a/tests/UPIPE_SAP_Test.cpp +++ b/tests/UPIPE_SAP_Test.cpp @@ -23,6 +23,7 @@ #include "ace/Stream.h" #include "ace/UPIPE_Acceptor.h" #include "ace/UPIPE_Connector.h" +#include "ace/OS_NS_unistd.h" ACE_RCSID(tests, UPIPE_SAP_Test, "$Id$") |