diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 3 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 3 | ||||
| -rw-r--r-- | examples/Threads/future1.cpp | 1 | ||||
| -rw-r--r-- | examples/Threads/future2.cpp | 1 | ||||
| -rw-r--r-- | examples/Threads/manual_event.cpp | 2 | ||||
| -rw-r--r-- | examples/Threads/reader_writer.cpp | 2 | ||||
| -rw-r--r-- | examples/Threads/task_two.cpp | 2 | ||||
| -rw-r--r-- | netsvcs/servers/Makefile | 84 |
9 files changed, 59 insertions, 42 deletions
diff --git a/ChangeLog b/ChangeLog index d636b776289..f994873b53d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,9 @@ Tue Dec 25 09:07:07 2001 Balachandran Natarajan <bala@cs.wustl.edu> Atomic_Op.h. Added template instantiations for ACE_Atomic_Op_Ex in places that was required. + * netsvcs/lib/Makefile: + * netsvcs/servers/makefile: Updated dependencies. + Mon Dec 25 01:05:43 2001 Balachandran Natarajan <bala@cs.wustl.edu> * ace/Atomic_Op.h: Added a #include to get it compiling on win32 diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index d636b776289..f994873b53d 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -13,6 +13,9 @@ Tue Dec 25 09:07:07 2001 Balachandran Natarajan <bala@cs.wustl.edu> Atomic_Op.h. Added template instantiations for ACE_Atomic_Op_Ex in places that was required. + * netsvcs/lib/Makefile: + * netsvcs/servers/makefile: Updated dependencies. + Mon Dec 25 01:05:43 2001 Balachandran Natarajan <bala@cs.wustl.edu> * ace/Atomic_Op.h: Added a #include to get it compiling on win32 diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index d636b776289..f994873b53d 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -13,6 +13,9 @@ Tue Dec 25 09:07:07 2001 Balachandran Natarajan <bala@cs.wustl.edu> Atomic_Op.h. Added template instantiations for ACE_Atomic_Op_Ex in places that was required. + * netsvcs/lib/Makefile: + * netsvcs/servers/makefile: Updated dependencies. + Mon Dec 25 01:05:43 2001 Balachandran Natarajan <bala@cs.wustl.edu> * ace/Atomic_Op.h: Added a #include to get it compiling on win32 diff --git a/examples/Threads/future1.cpp b/examples/Threads/future1.cpp index b4167c79d37..213a3aa151f 100644 --- a/examples/Threads/future1.cpp +++ b/examples/Threads/future1.cpp @@ -394,7 +394,6 @@ main (int, ACE_TCHAR *[]) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>; template class ACE_Atomic_Op<ACE_Thread_Mutex, int>; -template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>; template class ACE_Future<const char *>; template class ACE_Future<u_long>; template class ACE_Future_Rep<const char *>; diff --git a/examples/Threads/future2.cpp b/examples/Threads/future2.cpp index aa25da40b93..7e7339532b2 100644 --- a/examples/Threads/future2.cpp +++ b/examples/Threads/future2.cpp @@ -515,7 +515,6 @@ main (int, ACE_TCHAR *[]) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>; template class ACE_Atomic_Op<ACE_Thread_Mutex, int>; -template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>; template class ACE_Future<char *>; template class ACE_Future<u_long>; template class ACE_Future_Rep<char *>; diff --git a/examples/Threads/manual_event.cpp b/examples/Threads/manual_event.cpp index 4b452d5aaf8..f843df4d614 100644 --- a/examples/Threads/manual_event.cpp +++ b/examples/Threads/manual_event.cpp @@ -104,11 +104,9 @@ main (int argc, ACE_TCHAR **argv) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>; template class ACE_Atomic_Op<ACE_Thread_Mutex, int>; -template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int> #pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int> -#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ #else diff --git a/examples/Threads/reader_writer.cpp b/examples/Threads/reader_writer.cpp index 41f20298863..c5844abac54 100644 --- a/examples/Threads/reader_writer.cpp +++ b/examples/Threads/reader_writer.cpp @@ -178,14 +178,12 @@ int main (int argc, ACE_TCHAR *argv[]) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>; template class ACE_Atomic_Op<ACE_Thread_Mutex, int>; -template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>; template class ACE_Guard<ACE_RW_Mutex>; template class ACE_Read_Guard<ACE_RW_Mutex>; template class ACE_Write_Guard<ACE_RW_Mutex>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int> #pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int> -#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int> #pragma instantiate ACE_Guard<ACE_RW_Mutex> #pragma instantiate ACE_Read_Guard<ACE_RW_Mutex> #pragma instantiate ACE_Write_Guard<ACE_RW_Mutex> diff --git a/examples/Threads/task_two.cpp b/examples/Threads/task_two.cpp index 2e8f3782b69..95ce70f9c03 100644 --- a/examples/Threads/task_two.cpp +++ b/examples/Threads/task_two.cpp @@ -140,11 +140,9 @@ main (int argc, ACE_TCHAR *argv[]) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>; template class ACE_Atomic_Op<ACE_Thread_Mutex, int>; -template class ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int> #pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int> -#pragma instantiate ACE_Atomic_Op_Ex<ACE_Thread_Mutex, int> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/netsvcs/servers/Makefile b/netsvcs/servers/Makefile index bf5aadf1977..00e402b5b2b 100644 --- a/netsvcs/servers/Makefile +++ b/netsvcs/servers/Makefile @@ -65,6 +65,8 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ $(ACE_ROOT)/ace/OS_Memory.inl \ @@ -72,8 +74,6 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ @@ -104,7 +104,6 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ @@ -121,6 +120,31 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib $(ACE_ROOT)/ace/Unbounded_Set.inl \ $(ACE_ROOT)/ace/Unbounded_Set.cpp \ $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/String_Base.h \ + $(ACE_ROOT)/ace/String_Base_Const.h \ + $(ACE_ROOT)/ace/String_Base.i \ + $(ACE_ROOT)/ace/String_Base.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ + $(ACE_ROOT)/ace/Auto_Ptr.i \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ @@ -128,9 +152,6 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Test_and_Set.h \ $(ACE_ROOT)/ace/Test_and_Set.i \ $(ACE_ROOT)/ace/Test_and_Set.cpp \ @@ -160,21 +181,6 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Malloc_Allocator.i \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ @@ -209,7 +215,22 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib $(ACE_ROOT)/ace/Message_Queue_T.h \ $(ACE_ROOT)/ace/Message_Queue_T.i \ $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Notification_Strategy.h \ + $(ACE_ROOT)/ace/Notification_Strategy.inl \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Recyclable.h \ + $(ACE_ROOT)/ace/Recyclable.inl \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Connection_Recycling_Strategy.h \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -220,6 +241,10 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Refcountable.h \ + $(ACE_ROOT)/ace/Refcountable.inl \ + $(ACE_ROOT)/ace/Hashable.h \ + $(ACE_ROOT)/ace/Hashable.inl \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ @@ -230,18 +255,6 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib $(ACE_ROOT)/ace/Process_Mutex.h \ $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/Time_Request_Reply.h \ $(ACE_ROOT)/netsvcs/lib/TS_Server_Handler.h \ @@ -275,6 +288,9 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib $(ACE_ROOT)/ace/TLI_Acceptor.h \ $(ACE_ROOT)/ace/TLI.h \ $(ACE_ROOT)/ace/TLI_Stream.h \ + $(ACE_ROOT)/ace/Atomic_Op.h \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Atomic_Op.cpp \ $(ACE_ROOT)/netsvcs/lib/Server_Logging_Handler_T.cpp \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i |