diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-25 23:27:19 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-25 23:27:19 +0000 |
| commit | 07641bf3bda79873da15bd4c551806f230213d43 (patch) | |
| tree | 93c1a7ae2cbb60ad88b4a06ce9b0bd9a41639279 | |
| parent | 2ecfe972ecdaf8e8f5807f22d55c060efe837712 (diff) | |
| download | ATCD-07641bf3bda79873da15bd4c551806f230213d43.tar.gz | |
ChangeLogTag:Fri Aug 25 16:15:50 2000 Carlos O'Ryan <coryan@uci.edu>
92 files changed, 3096 insertions, 1647 deletions
diff --git a/ChangeLog b/ChangeLog index b516fe855f9..de26d5b8083 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,19 +1,58 @@ +Fri Aug 25 16:15:50 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/OS.h: + * ace/OS.i: + * ace/OS.cpp: + * ace/Thread_Adapter.h: + * ace/Thread_Adapter.inl: + * ace/Thread_Adapter.cpp: + * ace/Thread_Control.h: + * ace/Thread_Control.inl: + * ace/Thread_Control.cpp: + * ace/Thread_Exit.h: + * ace/Thread_Exit.cpp: + * ace/Thread_Hook.h: + * ace/Thread_Hook.cpp: + * ace/Thread_Manager.h: + * ace/Thread_Manager.i: + * ace/Thread_Manager.cpp: + Move ACE_Thread_Adapter and its friends to a new directory. + This was important to discover why OS.o depends on + Thread_Manager.o and how we can break that dependency. + I'm commiting the change because it will help the compiler when + linking static libraries and it is easier to maintain this way. + + * ace/OS_String.cpp: + Cosmetic changes. + + * ace/Makefile: + * ace/Makefile.am: + * ace/Makefile.bor: + * ace/ace.icc: + Add all the new files to the system. + + * tests/Task_Test.cpp: + We must #include the Thread_Hook.h file directly + + * */Makefile: + Updated all the dependencies for ace. + Fri Aug 25 15:15:27 2000 Ossama Othman <ossama@uci.edu> - * Makefile.am (EXTRA_DIST): + * Makefile.am (EXTRA_DIST): - Added libtool shell script fragments `ltcf-c.sh' and - `ltcf-cxx.sh' to the list of additional files to be packaged - with the distribution. + Added libtool shell script fragments `ltcf-c.sh' and + `ltcf-cxx.sh' to the list of additional files to be packaged + with the distribution. - * ace/Makefile (TEMPLATE_FILES): + * ace/Makefile (TEMPLATE_FILES): - Added `Hash_Map_With_Allocator_T' to the list of template - source files. It was missing. + Added `Hash_Map_With_Allocator_T' to the list of template + source files. It was missing. - * ace/Makefile.am: + * ace/Makefile.am: - Updated to include all newly added source files. + Updated to include all newly added source files. Fri Aug 25 16:29:51 2000 Steve Huston <shuston@riverace.com> diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index b516fe855f9..de26d5b8083 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,19 +1,58 @@ +Fri Aug 25 16:15:50 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/OS.h: + * ace/OS.i: + * ace/OS.cpp: + * ace/Thread_Adapter.h: + * ace/Thread_Adapter.inl: + * ace/Thread_Adapter.cpp: + * ace/Thread_Control.h: + * ace/Thread_Control.inl: + * ace/Thread_Control.cpp: + * ace/Thread_Exit.h: + * ace/Thread_Exit.cpp: + * ace/Thread_Hook.h: + * ace/Thread_Hook.cpp: + * ace/Thread_Manager.h: + * ace/Thread_Manager.i: + * ace/Thread_Manager.cpp: + Move ACE_Thread_Adapter and its friends to a new directory. + This was important to discover why OS.o depends on + Thread_Manager.o and how we can break that dependency. + I'm commiting the change because it will help the compiler when + linking static libraries and it is easier to maintain this way. + + * ace/OS_String.cpp: + Cosmetic changes. + + * ace/Makefile: + * ace/Makefile.am: + * ace/Makefile.bor: + * ace/ace.icc: + Add all the new files to the system. + + * tests/Task_Test.cpp: + We must #include the Thread_Hook.h file directly + + * */Makefile: + Updated all the dependencies for ace. + Fri Aug 25 15:15:27 2000 Ossama Othman <ossama@uci.edu> - * Makefile.am (EXTRA_DIST): + * Makefile.am (EXTRA_DIST): - Added libtool shell script fragments `ltcf-c.sh' and - `ltcf-cxx.sh' to the list of additional files to be packaged - with the distribution. + Added libtool shell script fragments `ltcf-c.sh' and + `ltcf-cxx.sh' to the list of additional files to be packaged + with the distribution. - * ace/Makefile (TEMPLATE_FILES): + * ace/Makefile (TEMPLATE_FILES): - Added `Hash_Map_With_Allocator_T' to the list of template - source files. It was missing. + Added `Hash_Map_With_Allocator_T' to the list of template + source files. It was missing. - * ace/Makefile.am: + * ace/Makefile.am: - Updated to include all newly added source files. + Updated to include all newly added source files. Fri Aug 25 16:29:51 2000 Steve Huston <shuston@riverace.com> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index b516fe855f9..de26d5b8083 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,19 +1,58 @@ +Fri Aug 25 16:15:50 2000 Carlos O'Ryan <coryan@uci.edu> + + * ace/OS.h: + * ace/OS.i: + * ace/OS.cpp: + * ace/Thread_Adapter.h: + * ace/Thread_Adapter.inl: + * ace/Thread_Adapter.cpp: + * ace/Thread_Control.h: + * ace/Thread_Control.inl: + * ace/Thread_Control.cpp: + * ace/Thread_Exit.h: + * ace/Thread_Exit.cpp: + * ace/Thread_Hook.h: + * ace/Thread_Hook.cpp: + * ace/Thread_Manager.h: + * ace/Thread_Manager.i: + * ace/Thread_Manager.cpp: + Move ACE_Thread_Adapter and its friends to a new directory. + This was important to discover why OS.o depends on + Thread_Manager.o and how we can break that dependency. + I'm commiting the change because it will help the compiler when + linking static libraries and it is easier to maintain this way. + + * ace/OS_String.cpp: + Cosmetic changes. + + * ace/Makefile: + * ace/Makefile.am: + * ace/Makefile.bor: + * ace/ace.icc: + Add all the new files to the system. + + * tests/Task_Test.cpp: + We must #include the Thread_Hook.h file directly + + * */Makefile: + Updated all the dependencies for ace. + Fri Aug 25 15:15:27 2000 Ossama Othman <ossama@uci.edu> - * Makefile.am (EXTRA_DIST): + * Makefile.am (EXTRA_DIST): - Added libtool shell script fragments `ltcf-c.sh' and - `ltcf-cxx.sh' to the list of additional files to be packaged - with the distribution. + Added libtool shell script fragments `ltcf-c.sh' and + `ltcf-cxx.sh' to the list of additional files to be packaged + with the distribution. - * ace/Makefile (TEMPLATE_FILES): + * ace/Makefile (TEMPLATE_FILES): - Added `Hash_Map_With_Allocator_T' to the list of template - source files. It was missing. + Added `Hash_Map_With_Allocator_T' to the list of template + source files. It was missing. - * ace/Makefile.am: + * ace/Makefile.am: - Updated to include all newly added source files. + Updated to include all newly added source files. Fri Aug 25 16:29:51 2000 Steve Huston <shuston@riverace.com> diff --git a/ace/Makefile b/ace/Makefile index 11684bb4595..3170b0cadff 100644 --- a/ace/Makefile +++ b/ace/Makefile @@ -15,6 +15,10 @@ OS_FILES = \ OS_Memory \ OS_String \ OS_TLI \ + Thread_Hook \ + Thread_Adapter \ + Thread_Exit \ + Thread_Control \ Sched_Params UTILS_FILES = \ ACE \ @@ -551,12 +555,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -579,12 +584,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -602,10 +608,11 @@ endif # GHS OS.i \ Sched_Params.h \ Sched_Params.i \ - Log_Msg.h \ - Log_Record.h \ - Log_Priority.h \ - Log_Record.i + Thread_Adapter.h \ + Thread_Adapter.inl \ + Thread_Exit.h \ + Thread_Control.h \ + Thread_Control.inl .obj/OS_Dirent.o .obj/OS_Dirent.so .shobj/OS_Dirent.o .shobj/OS_Dirent.so: OS_Dirent.cpp \ OS_Dirent.h \ @@ -613,12 +620,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Export.h \ OS_Dirent.inl \ OS_String.h \ @@ -630,12 +638,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Export.h \ OS_Memory.inl @@ -645,31 +654,353 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Export.h \ OS_String.inl \ OS_Memory.h \ OS_Memory.inl -.obj/OS_TLI.o .obj/OS_TLI.so .shobj/OS_TLI.o .shobj/OS_TLI.so: OS_TLI.cpp OS_TLI.h \ +.obj/OS_TLI.o .obj/OS_TLI.so .shobj/OS_TLI.o .shobj/OS_TLI.so: OS_TLI.cpp \ + OS_TLI.h \ pre.h \ config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Export.h \ OS_TLI.inl +.obj/Thread_Hook.o .obj/Thread_Hook.so .shobj/Thread_Hook.o .shobj/Thread_Hook.so: Thread_Hook.cpp \ + Thread_Hook.h \ + pre.h \ + config-all.h \ + config.h \ + config-linux-lxpthreads.h \ + config-linux.h \ + config-linux-common.h \ + config-g++-common.h \ + post.h \ + ACE_export.h \ + svc_export.h \ + ace_wchar.h \ + OS.h \ + OS_Dirent.h \ + OS_Export.h \ + OS_Dirent.inl \ + OS_String.h \ + OS_String.inl \ + OS_Memory.h \ + OS_Memory.inl \ + OS_TLI.h \ + OS_TLI.inl \ + Min_Max.h \ + streams.h \ + Basic_Types.h \ + Basic_Types.i \ + Trace.h \ + OS.i \ + Thread_Manager.h \ + Thread.h \ + ACE.h \ + ACE.i \ + Thread.i \ + Thread_Adapter.h \ + Thread_Adapter.inl \ + Synch.h \ + SV_Semaphore_Complex.h \ + SV_Semaphore_Simple.h \ + SV_Semaphore_Simple.i \ + SV_Semaphore_Complex.i \ + Synch.i \ + Synch_T.h \ + Event_Handler.h \ + Event_Handler.i \ + Synch_T.i \ + Atomic_Op.i \ + Synch_T.cpp \ + Log_Msg.h \ + Log_Record.h \ + Log_Priority.h \ + Log_Record.i \ + Containers.h \ + Malloc_Base.h \ + Containers.i \ + Containers_T.h \ + Containers_T.i \ + Containers_T.cpp \ + Malloc.h \ + Based_Pointer_T.h \ + Based_Pointer_T.i \ + Based_Pointer_T.cpp \ + Based_Pointer_Repository.h \ + Singleton.h \ + Singleton.i \ + Singleton.cpp \ + Object_Manager.h \ + Object_Manager.i \ + Managed_Object.h \ + Managed_Object.i \ + Managed_Object.cpp \ + Malloc.i \ + Malloc_T.h \ + Free_List.h \ + Free_List.i \ + Free_List.cpp \ + Malloc_T.i \ + Malloc_T.cpp \ + Memory_Pool.h \ + Signal.h \ + Signal.i \ + Mem_Map.h \ + Mem_Map.i \ + Memory_Pool.i \ + Thread_Manager.i + +.obj/Thread_Adapter.o .obj/Thread_Adapter.so .shobj/Thread_Adapter.o .shobj/Thread_Adapter.so: Thread_Adapter.cpp \ + Thread_Adapter.h \ + pre.h \ + config-all.h \ + config.h \ + config-linux-lxpthreads.h \ + config-linux.h \ + config-linux-common.h \ + config-g++-common.h \ + post.h \ + ACE_export.h \ + svc_export.h \ + ace_wchar.h \ + OS.h \ + OS_Dirent.h \ + OS_Export.h \ + OS_Dirent.inl \ + OS_String.h \ + OS_String.inl \ + OS_Memory.h \ + OS_Memory.inl \ + OS_TLI.h \ + OS_TLI.inl \ + Min_Max.h \ + streams.h \ + Basic_Types.h \ + Basic_Types.i \ + Trace.h \ + OS.i \ + Thread_Adapter.inl \ + Thread_Manager.h \ + Thread.h \ + ACE.h \ + ACE.i \ + Thread.i \ + Synch.h \ + SV_Semaphore_Complex.h \ + SV_Semaphore_Simple.h \ + SV_Semaphore_Simple.i \ + SV_Semaphore_Complex.i \ + Synch.i \ + Synch_T.h \ + Event_Handler.h \ + Event_Handler.i \ + Synch_T.i \ + Atomic_Op.i \ + Synch_T.cpp \ + Log_Msg.h \ + Log_Record.h \ + Log_Priority.h \ + Log_Record.i \ + Containers.h \ + Malloc_Base.h \ + Containers.i \ + Containers_T.h \ + Containers_T.i \ + Containers_T.cpp \ + Malloc.h \ + Based_Pointer_T.h \ + Based_Pointer_T.i \ + Based_Pointer_T.cpp \ + Based_Pointer_Repository.h \ + Singleton.h \ + Singleton.i \ + Singleton.cpp \ + Object_Manager.h \ + Object_Manager.i \ + Managed_Object.h \ + Managed_Object.i \ + Managed_Object.cpp \ + Malloc.i \ + Malloc_T.h \ + Free_List.h \ + Free_List.i \ + Free_List.cpp \ + Malloc_T.i \ + Malloc_T.cpp \ + Memory_Pool.h \ + Signal.h \ + Signal.i \ + Mem_Map.h \ + Mem_Map.i \ + Memory_Pool.i \ + Thread_Manager.i \ + Thread_Exit.h \ + Thread_Control.h \ + Thread_Control.inl \ + Thread_Hook.h + +.obj/Thread_Exit.o .obj/Thread_Exit.so .shobj/Thread_Exit.o .shobj/Thread_Exit.so: Thread_Exit.cpp \ + Thread_Exit.h \ + pre.h \ + config-all.h \ + config.h \ + config-linux-lxpthreads.h \ + config-linux.h \ + config-linux-common.h \ + config-g++-common.h \ + post.h \ + ACE_export.h \ + svc_export.h \ + ace_wchar.h \ + OS.h \ + OS_Dirent.h \ + OS_Export.h \ + OS_Dirent.inl \ + OS_String.h \ + OS_String.inl \ + OS_Memory.h \ + OS_Memory.inl \ + OS_TLI.h \ + OS_TLI.inl \ + Min_Max.h \ + streams.h \ + Basic_Types.h \ + Basic_Types.i \ + Trace.h \ + OS.i \ + Thread_Control.h \ + Thread_Control.inl \ + Synch.h \ + ACE.h \ + ACE.i \ + SV_Semaphore_Complex.h \ + SV_Semaphore_Simple.h \ + SV_Semaphore_Simple.i \ + SV_Semaphore_Complex.i \ + Synch.i \ + Synch_T.h \ + Event_Handler.h \ + Event_Handler.i \ + Synch_T.i \ + Thread.h \ + Thread.i \ + Atomic_Op.i \ + Synch_T.cpp \ + Log_Msg.h \ + Log_Record.h \ + Log_Priority.h \ + Log_Record.i \ + Managed_Object.h \ + Object_Manager.h \ + Object_Manager.i \ + Managed_Object.i \ + Managed_Object.cpp + +.obj/Thread_Control.o .obj/Thread_Control.so .shobj/Thread_Control.o .shobj/Thread_Control.so: Thread_Control.cpp \ + Thread_Control.h \ + pre.h \ + config-all.h \ + config.h \ + config-linux-lxpthreads.h \ + config-linux.h \ + config-linux-common.h \ + config-g++-common.h \ + post.h \ + ACE_export.h \ + svc_export.h \ + ace_wchar.h \ + OS.h \ + OS_Dirent.h \ + OS_Export.h \ + OS_Dirent.inl \ + OS_String.h \ + OS_String.inl \ + OS_Memory.h \ + OS_Memory.inl \ + OS_TLI.h \ + OS_TLI.inl \ + Min_Max.h \ + streams.h \ + Basic_Types.h \ + Basic_Types.i \ + Trace.h \ + OS.i \ + Thread_Control.inl \ + Thread_Manager.h \ + Thread.h \ + ACE.h \ + ACE.i \ + Thread.i \ + Thread_Adapter.h \ + Thread_Adapter.inl \ + Synch.h \ + SV_Semaphore_Complex.h \ + SV_Semaphore_Simple.h \ + SV_Semaphore_Simple.i \ + SV_Semaphore_Complex.i \ + Synch.i \ + Synch_T.h \ + Event_Handler.h \ + Event_Handler.i \ + Synch_T.i \ + Atomic_Op.i \ + Synch_T.cpp \ + Log_Msg.h \ + Log_Record.h \ + Log_Priority.h \ + Log_Record.i \ + Containers.h \ + Malloc_Base.h \ + Containers.i \ + Containers_T.h \ + Containers_T.i \ + Containers_T.cpp \ + Malloc.h \ + Based_Pointer_T.h \ + Based_Pointer_T.i \ + Based_Pointer_T.cpp \ + Based_Pointer_Repository.h \ + Singleton.h \ + Singleton.i \ + Singleton.cpp \ + Object_Manager.h \ + Object_Manager.i \ + Managed_Object.h \ + Managed_Object.i \ + Managed_Object.cpp \ + Malloc.i \ + Malloc_T.h \ + Free_List.h \ + Free_List.i \ + Free_List.cpp \ + Malloc_T.i \ + Malloc_T.cpp \ + Memory_Pool.h \ + Signal.h \ + Signal.i \ + Mem_Map.h \ + Mem_Map.i \ + Memory_Pool.i \ + Thread_Manager.i + .obj/Sched_Params.o .obj/Sched_Params.so .shobj/Sched_Params.o .shobj/Sched_Params.so: Sched_Params.cpp \ Sched_Params.h \ pre.h \ @@ -677,12 +1008,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -706,12 +1038,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -803,12 +1136,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -909,12 +1243,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -931,19 +1266,21 @@ endif # GHS Trace.h \ OS.i -.obj/ARGV.o .obj/ARGV.so .shobj/ARGV.o .shobj/ARGV.so: ARGV.cpp ARGV.h \ +.obj/ARGV.o .obj/ARGV.so .shobj/ARGV.o .shobj/ARGV.so: ARGV.cpp \ + ARGV.h \ pre.h \ ACE.h \ OS.h \ config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -1019,12 +1356,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -1130,12 +1468,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -1212,12 +1551,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -1315,18 +1655,20 @@ endif # GHS Hash_Map_With_Allocator_T.i \ Hash_Map_With_Allocator_T.cpp -.obj/Dirent.o .obj/Dirent.so .shobj/Dirent.o .shobj/Dirent.so: Dirent.cpp Dirent.h \ +.obj/Dirent.o .obj/Dirent.so .shobj/Dirent.o .shobj/Dirent.so: Dirent.cpp \ + Dirent.h \ pre.h \ OS_Dirent.h \ config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Export.h \ OS_Dirent.inl \ Dirent.i \ @@ -1356,12 +1698,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -1415,12 +1758,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -1449,12 +1793,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -1484,12 +1829,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -1592,12 +1938,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -1675,12 +2022,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -1704,12 +2052,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -1836,12 +2185,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -1870,12 +2220,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -1900,12 +2251,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -1993,19 +2345,21 @@ endif # GHS Auto_Ptr.i \ Auto_Ptr.cpp -.obj/Stats.o .obj/Stats.so .shobj/Stats.o .shobj/Stats.so: Stats.cpp Stats.h \ +.obj/Stats.o .obj/Stats.so .shobj/Stats.o .shobj/Stats.so: Stats.cpp \ + Stats.h \ pre.h \ ACE.h \ OS.h \ config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -2081,12 +2435,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -2163,12 +2518,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -2200,12 +2556,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -2232,12 +2589,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -2324,12 +2682,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -2410,12 +2769,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -2493,12 +2853,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -2580,12 +2941,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -2667,12 +3029,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -2766,7 +3129,8 @@ endif # GHS Reactor_Impl.h \ Svc_Conf_Tokens.h -.obj/Dump.o .obj/Dump.so .shobj/Dump.o .shobj/Dump.so: Dump.cpp Synch_T.h \ +.obj/Dump.o .obj/Dump.so .shobj/Dump.o .shobj/Dump.so: Dump.cpp \ + Synch_T.h \ pre.h \ Event_Handler.h \ ACE.h \ @@ -2774,12 +3138,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -2826,12 +3191,13 @@ endif # GHS pre.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ ACE.h \ OS.h \ OS_Dirent.h \ @@ -2853,6 +3219,8 @@ endif # GHS Thread_Manager.h \ Thread.h \ Thread.i \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Synch.h \ SV_Semaphore_Complex.h \ SV_Semaphore_Simple.h \ @@ -2926,12 +3294,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -2961,12 +3330,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -3054,12 +3424,13 @@ endif # GHS pre.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ Trace.h \ OS.h \ OS_Dirent.h \ @@ -3091,12 +3462,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -3194,6 +3566,8 @@ endif # GHS Synch_Options.h \ Synch_Options.i \ Thread_Manager.h \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Thread_Manager.i \ Hash_Map_Manager.h \ Functor.h \ @@ -3217,17 +3591,19 @@ endif # GHS Method_Request.h \ Activation_Queue.i -.obj/Process.o .obj/Process.so .shobj/Process.o .shobj/Process.so: Process.cpp OS.h \ +.obj/Process.o .obj/Process.so .shobj/Process.o .shobj/Process.so: Process.cpp \ + OS.h \ pre.h \ config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -3311,12 +3687,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -3397,19 +3774,21 @@ endif # GHS Reactor_Impl.h \ Process_Manager.i -.obj/Synch.o .obj/Synch.so .shobj/Synch.o .shobj/Synch.so: Synch.cpp Thread.h \ +.obj/Synch.o .obj/Synch.so .shobj/Synch.o .shobj/Synch.so: Synch.cpp \ + Thread.h \ pre.h \ ACE.h \ OS.h \ config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -3452,12 +3831,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -3476,19 +3856,21 @@ endif # GHS ACE.i \ Synch_Options.i -.obj/Thread.o .obj/Thread.so .shobj/Thread.o .shobj/Thread.so: Thread.cpp Thread.h \ +.obj/Thread.o .obj/Thread.so .shobj/Thread.o .shobj/Thread.so: Thread.cpp \ + Thread.h \ pre.h \ ACE.h \ OS.h \ config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -3516,12 +3898,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -3555,6 +3938,8 @@ endif # GHS Log_Priority.h \ Log_Record.i \ Thread_Manager.h \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Containers.h \ Malloc_Base.h \ Containers.i \ @@ -3592,21 +3977,26 @@ endif # GHS Dynamic.i \ Auto_Ptr.h \ Auto_Ptr.i \ - Auto_Ptr.cpp + Auto_Ptr.cpp \ + Thread_Exit.h \ + Thread_Control.h \ + Thread_Control.inl -.obj/Token.o .obj/Token.so .shobj/Token.o .shobj/Token.so: Token.cpp Thread.h \ +.obj/Token.o .obj/Token.so .shobj/Token.o .shobj/Token.so: Token.cpp \ + Thread.h \ pre.h \ ACE.h \ OS.h \ config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -3651,12 +4041,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -3737,6 +4128,8 @@ endif # GHS Reactor.i \ Reactor_Impl.h \ Thread_Manager.h \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Thread_Manager.i .obj/FlReactor.o .obj/FlReactor.so .shobj/FlReactor.o .shobj/FlReactor.so: FlReactor.cpp \ @@ -3752,12 +4145,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -3850,12 +4244,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -3889,12 +4284,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -3992,6 +4388,8 @@ endif # GHS Synch_Options.h \ Synch_Options.i \ Thread_Manager.h \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Thread_Manager.i \ Hash_Map_Manager.h \ Functor.h \ @@ -4021,12 +4419,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -4051,12 +4450,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -4153,12 +4553,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -4261,6 +4662,8 @@ endif # GHS Synch_Options.h \ Synch_Options.i \ Thread_Manager.h \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Thread_Manager.i \ Hash_Map_Manager.h \ Functor.h \ @@ -4300,12 +4703,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -4404,6 +4808,8 @@ endif # GHS Synch_Options.h \ Synch_Options.i \ Thread_Manager.h \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Thread_Manager.i \ Hash_Map_Manager.h \ Functor.h \ @@ -4453,12 +4859,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -4553,12 +4960,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -4668,12 +5076,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -4703,12 +5112,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -4803,12 +5213,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -4925,12 +5336,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -5028,6 +5440,8 @@ endif # GHS Synch_Options.h \ Synch_Options.i \ Thread_Manager.h \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Thread_Manager.i \ Hash_Map_Manager.h \ Functor.h \ @@ -5060,12 +5474,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -5185,12 +5600,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -5282,12 +5698,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -5310,12 +5727,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -5340,12 +5758,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -5371,12 +5790,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -5464,6 +5884,8 @@ endif # GHS Synch_Options.h \ Synch_Options.i \ Thread_Manager.h \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Thread_Manager.i \ Hash_Map_Manager.h \ Functor.h \ @@ -5503,12 +5925,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -5531,7 +5954,8 @@ endif # GHS Log_Priority.h \ Log_Record.i -.obj/LSOCK.o .obj/LSOCK.so .shobj/LSOCK.o .shobj/LSOCK.so: LSOCK.cpp LSOCK.h \ +.obj/LSOCK.o .obj/LSOCK.so .shobj/LSOCK.o .shobj/LSOCK.so: LSOCK.cpp \ + LSOCK.h \ pre.h \ SOCK.h \ ACE.h \ @@ -5539,12 +5963,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -5587,12 +6012,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -5642,12 +6068,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -5695,12 +6122,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -5751,12 +6179,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -5801,12 +6230,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -5843,19 +6273,21 @@ endif # GHS LSOCK.i \ LSOCK_Stream.i -.obj/SOCK.o .obj/SOCK.so .shobj/SOCK.o .shobj/SOCK.so: SOCK.cpp SOCK.h \ +.obj/SOCK.o .obj/SOCK.so .shobj/SOCK.o .shobj/SOCK.so: SOCK.cpp \ + SOCK.h \ pre.h \ ACE.h \ OS.h \ config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -5896,12 +6328,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -5959,12 +6392,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6007,12 +6441,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6055,12 +6490,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6116,12 +6552,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6164,56 +6601,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ - OS_Dirent.h \ - OS_Export.h \ - OS_Dirent.inl \ - OS_String.h \ - OS_String.inl \ - OS_Memory.h \ - OS_Memory.inl \ - OS_TLI.h \ - OS_TLI.inl \ - Min_Max.h \ - streams.h \ - Basic_Types.h \ - Basic_Types.i \ - Trace.h \ - OS.i \ - ACE.i \ - Addr.h \ - Addr.i \ - IPC_SAP.h \ - IPC_SAP.i \ - QoS_Session.h \ - INET_Addr.h \ - INET_Addr.i \ - SOCK.i \ - SOCK_Dgram.i \ - SOCK_Dgram_Mcast.i - -.obj/SOCK_Dgram_Mcast_QoS.o .obj/SOCK_Dgram_Mcast_QoS.so .shobj/SOCK_Dgram_Mcast_QoS.o .shobj/SOCK_Dgram_Mcast_QoS.so: SOCK_Dgram_Mcast_QoS.cpp \ - SOCK_Dgram_Mcast_QoS.h \ - pre.h \ - SOCK_Dgram_Mcast.h \ - SOCK_Dgram.h \ - SOCK.h \ - ACE.h \ - OS.h \ - config-all.h \ - config.h \ - config-linux-lxpthreads.h \ - config-linux-common.h \ - config-g++-common.h \ - post.h \ ace_wchar.h \ - ACE_export.h \ - svc_export.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6239,12 +6633,7 @@ endif # GHS INET_Addr.i \ SOCK.i \ SOCK_Dgram.i \ - SOCK_Dgram_Mcast.i \ - SOCK_Dgram_Mcast_QoS.i \ - Log_Msg.h \ - Log_Record.h \ - Log_Priority.h \ - Log_Record.i + SOCK_Dgram_Mcast.i .obj/SOCK_IO.o .obj/SOCK_IO.so .shobj/SOCK_IO.o .shobj/SOCK_IO.so: SOCK_IO.cpp \ SOCK_IO.h \ @@ -6255,12 +6644,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6299,12 +6689,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6332,18 +6723,20 @@ endif # GHS SOCK_IO.i \ SOCK_Stream.i -.obj/Addr.o .obj/Addr.so .shobj/Addr.o .shobj/Addr.so: Addr.cpp Addr.h \ +.obj/Addr.o .obj/Addr.so .shobj/Addr.o .shobj/Addr.so: Addr.cpp \ + Addr.h \ pre.h \ OS.h \ config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6373,12 +6766,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6411,12 +6805,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6450,12 +6845,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6490,12 +6886,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6521,12 +6918,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6553,12 +6951,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6592,12 +6991,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6634,12 +7034,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6674,12 +7075,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6718,12 +7120,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6756,7 +7159,8 @@ endif # GHS Log_Record.i \ DEV_Connector.i -.obj/DEV_IO.o .obj/DEV_IO.so .shobj/DEV_IO.o .shobj/DEV_IO.so: DEV_IO.cpp DEV_IO.h \ +.obj/DEV_IO.o .obj/DEV_IO.so .shobj/DEV_IO.o .shobj/DEV_IO.so: DEV_IO.cpp \ + DEV_IO.h \ pre.h \ DEV.h \ IO_SAP.h \ @@ -6765,12 +7169,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6802,7 +7207,8 @@ endif # GHS Log_Priority.h \ Log_Record.i -.obj/FIFO.o .obj/FIFO.so .shobj/FIFO.o .shobj/FIFO.so: FIFO.cpp FIFO.h \ +.obj/FIFO.o .obj/FIFO.so .shobj/FIFO.o .shobj/FIFO.so: FIFO.cpp \ + FIFO.h \ pre.h \ IPC_SAP.h \ ACE.h \ @@ -6810,12 +7216,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6849,12 +7256,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6890,12 +7298,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6931,12 +7340,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -6972,12 +7382,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7011,12 +7422,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7044,7 +7456,8 @@ endif # GHS Log_Priority.h \ Log_Record.i -.obj/FILE.o .obj/FILE.so .shobj/FILE.o .shobj/FILE.so: FILE.cpp FILE.h \ +.obj/FILE.o .obj/FILE.so .shobj/FILE.o .shobj/FILE.so: FILE.cpp \ + FILE.h \ pre.h \ IO_SAP.h \ ACE.h \ @@ -7052,12 +7465,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7095,12 +7509,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7143,12 +7558,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7188,12 +7604,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7218,19 +7635,21 @@ endif # GHS Log_Priority.h \ Log_Record.i -.obj/IO_SAP.o .obj/IO_SAP.so .shobj/IO_SAP.o .shobj/IO_SAP.so: IO_SAP.cpp IO_SAP.h \ +.obj/IO_SAP.o .obj/IO_SAP.so .shobj/IO_SAP.o .shobj/IO_SAP.so: IO_SAP.cpp \ + IO_SAP.h \ pre.h \ ACE.h \ OS.h \ config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7260,12 +7679,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7293,19 +7713,21 @@ endif # GHS IOStream_T.i \ IOStream_T.cpp -.obj/Pipe.o .obj/Pipe.so .shobj/Pipe.o .shobj/Pipe.so: Pipe.cpp Pipe.h \ +.obj/Pipe.o .obj/Pipe.so .shobj/Pipe.o .shobj/Pipe.so: Pipe.cpp \ + Pipe.h \ pre.h \ ACE.h \ OS.h \ config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7346,7 +7768,8 @@ endif # GHS Log_Priority.h \ Log_Record.i -.obj/Signal.o .obj/Signal.so .shobj/Signal.o .shobj/Signal.so: Signal.cpp Synch_T.h \ +.obj/Signal.o .obj/Signal.so .shobj/Signal.o .shobj/Signal.so: Signal.cpp \ + Synch_T.h \ pre.h \ Event_Handler.h \ ACE.h \ @@ -7354,12 +7777,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7433,12 +7857,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7462,7 +7887,8 @@ endif # GHS SString.i \ Malloc_Base.h -.obj/SPIPE.o .obj/SPIPE.so .shobj/SPIPE.o .shobj/SPIPE.so: SPIPE.cpp SPIPE.h \ +.obj/SPIPE.o .obj/SPIPE.so .shobj/SPIPE.o .shobj/SPIPE.so: SPIPE.cpp \ + SPIPE.h \ pre.h \ IPC_SAP.h \ ACE.h \ @@ -7470,12 +7896,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7513,12 +7940,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7561,12 +7989,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7609,12 +8038,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7650,12 +8080,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7682,12 +8113,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7721,12 +8153,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7758,12 +8191,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7794,12 +8228,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7830,12 +8265,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7870,12 +8306,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7912,12 +8349,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7959,12 +8397,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -7987,18 +8426,20 @@ endif # GHS INET_Addr.h \ INET_Addr.i -.obj/TTY_IO.o .obj/TTY_IO.so .shobj/TTY_IO.o .shobj/TTY_IO.so: TTY_IO.cpp TTY_IO.h \ - pre.h \ +.obj/TTY_IO.o .obj/TTY_IO.so .shobj/TTY_IO.o .shobj/TTY_IO.so: TTY_IO.cpp \ + TTY_IO.h \ OS.h \ + pre.h \ config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -8044,12 +8485,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -8084,12 +8526,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -8192,6 +8635,8 @@ endif # GHS Synch_Options.h \ Synch_Options.i \ Thread_Manager.h \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Thread_Manager.i \ Hash_Map_Manager.h \ Functor.h \ @@ -8247,12 +8692,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -8355,6 +8801,8 @@ endif # GHS Synch_Options.h \ Synch_Options.i \ Thread_Manager.h \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Thread_Manager.i \ Hash_Map_Manager.h \ Functor.h \ @@ -8408,12 +8856,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -8516,6 +8965,8 @@ endif # GHS Synch_Options.h \ Synch_Options.i \ Thread_Manager.h \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Thread_Manager.i \ Hash_Map_Manager.h \ Functor.h \ @@ -8569,12 +9020,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -8676,12 +9128,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -8720,12 +9173,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -8819,7 +9273,8 @@ endif # GHS MEM_Addr.i \ MEM_Connector.i -.obj/MEM_IO.o .obj/MEM_IO.so .shobj/MEM_IO.o .shobj/MEM_IO.so: MEM_IO.cpp MEM_IO.h \ +.obj/MEM_IO.o .obj/MEM_IO.so .shobj/MEM_IO.o .shobj/MEM_IO.so: MEM_IO.cpp \ + MEM_IO.h \ pre.h \ SOCK.h \ ACE.h \ @@ -8827,12 +9282,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -8927,12 +9383,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -9010,12 +9467,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -9106,12 +9564,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -9144,12 +9603,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -9237,6 +9697,8 @@ endif # GHS Service_Repository.i \ Task.h \ Thread_Manager.h \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Thread_Manager.i \ Task.i \ Task_T.h \ @@ -9289,12 +9751,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -9412,6 +9875,8 @@ endif # GHS Auto_Ptr.cpp \ Proactor.h \ Thread_Manager.h \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Thread_Manager.i \ Process_Manager.h \ Process.h \ @@ -9426,12 +9891,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -9555,6 +10021,8 @@ endif # GHS Synch_Options.h \ Synch_Options.i \ Thread_Manager.h \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Thread_Manager.i \ Hash_Map_Manager.h \ Functor.h \ @@ -9581,12 +10049,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -9636,12 +10105,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -9696,12 +10166,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -9742,6 +10213,8 @@ endif # GHS Stream_Modules.h \ Task.h \ Thread_Manager.h \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Containers.h \ Malloc_Base.h \ Containers.i \ @@ -9841,12 +10314,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -9871,12 +10345,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -9978,12 +10453,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -10093,6 +10569,8 @@ endif # GHS Synch_Options.h \ Synch_Options.i \ Thread_Manager.h \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Thread_Manager.i \ Hash_Map_Manager.h \ Functor.h \ @@ -10133,12 +10611,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -10219,12 +10698,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ - svc_export.h + svc_export.h \ + ace_wchar.h .obj/Message_Block.o .obj/Message_Block.so .shobj/Message_Block.o .shobj/Message_Block.so: Message_Block.cpp \ Message_Block.h \ @@ -10234,12 +10714,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -10321,12 +10802,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -10424,6 +10906,8 @@ endif # GHS Synch_Options.h \ Synch_Options.i \ Thread_Manager.h \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Thread_Manager.i \ Hash_Map_Manager.h \ Functor.h \ @@ -10445,7 +10929,8 @@ endif # GHS Strategies.i \ Message_Queue.i -.obj/Task.o .obj/Task.so .shobj/Task.o .shobj/Task.so: Task.cpp Task.h \ +.obj/Task.o .obj/Task.so .shobj/Task.o .shobj/Task.so: Task.cpp \ + Task.h \ pre.h \ Service_Object.h \ Shared_Object.h \ @@ -10454,12 +10939,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -10483,6 +10969,8 @@ endif # GHS Thread_Manager.h \ Thread.h \ Thread.i \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Synch.h \ SV_Semaphore_Complex.h \ SV_Semaphore_Simple.h \ @@ -10594,12 +11082,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -10688,19 +11177,21 @@ endif # GHS Reactor_Impl.h \ Svc_Conf_Tokens.h -.obj/Malloc.o .obj/Malloc.so .shobj/Malloc.o .shobj/Malloc.so: Malloc.cpp Malloc.h \ +.obj/Malloc.o .obj/Malloc.so .shobj/Malloc.o .shobj/Malloc.so: Malloc.cpp \ + Malloc.h \ pre.h \ ACE.h \ OS.h \ config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -10775,12 +11266,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -10811,12 +11303,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -10895,12 +11388,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -10976,12 +11470,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -11076,12 +11571,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -11108,12 +11604,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -11143,12 +11640,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -11177,12 +11675,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -11285,12 +11784,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -11409,12 +11909,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -11517,12 +12018,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -11623,12 +12125,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -11732,12 +12235,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -11840,12 +12344,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -11930,6 +12435,8 @@ endif # GHS Pipe.h \ Pipe.i \ Thread_Manager.h \ + Thread_Adapter.h \ + Thread_Adapter.inl \ Thread_Manager.i .obj/CORBA_Ref.o .obj/CORBA_Ref.so .shobj/CORBA_Ref.o .shobj/CORBA_Ref.so: CORBA_Ref.cpp \ @@ -11940,12 +12447,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -11975,12 +12483,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -12112,12 +12621,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -12229,12 +12739,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -12268,12 +12779,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -12387,12 +12899,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -12525,12 +13038,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -12555,12 +13069,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -12670,6 +13185,103 @@ endif # GHS Auto_Ptr.i \ Auto_Ptr.cpp +.obj/SOCK_Dgram_Mcast_QoS.o .obj/SOCK_Dgram_Mcast_QoS.so .shobj/SOCK_Dgram_Mcast_QoS.o .shobj/SOCK_Dgram_Mcast_QoS.so: SOCK_Dgram_Mcast_QoS.cpp \ + SOCK_Dgram_Mcast_QoS.h \ + pre.h \ + SOCK_Dgram_Mcast.h \ + SOCK_Dgram.h \ + SOCK.h \ + ACE.h \ + OS.h \ + config-all.h \ + config.h \ + config-linux-lxpthreads.h \ + config-linux.h \ + config-linux-common.h \ + config-g++-common.h \ + post.h \ + ACE_export.h \ + svc_export.h \ + ace_wchar.h \ + OS_Dirent.h \ + OS_Export.h \ + OS_Dirent.inl \ + OS_String.h \ + OS_String.inl \ + OS_Memory.h \ + OS_Memory.inl \ + OS_TLI.h \ + OS_TLI.inl \ + Min_Max.h \ + streams.h \ + Basic_Types.h \ + Basic_Types.i \ + Trace.h \ + OS.i \ + ACE.i \ + Addr.h \ + Addr.i \ + IPC_SAP.h \ + IPC_SAP.i \ + QoS_Session.h \ + INET_Addr.h \ + INET_Addr.i \ + SOCK.i \ + SOCK_Dgram.i \ + SOCK_Dgram_Mcast.i \ + QoS_Manager.h \ + Containers_T.h \ + Containers.h \ + Malloc_Base.h \ + Containers.i \ + Containers_T.i \ + Containers_T.cpp \ + Malloc.h \ + Log_Msg.h \ + Log_Record.h \ + Log_Priority.h \ + Log_Record.i \ + Based_Pointer_T.h \ + Based_Pointer_T.i \ + Based_Pointer_T.cpp \ + Based_Pointer_Repository.h \ + Singleton.h \ + Synch.h \ + SV_Semaphore_Complex.h \ + SV_Semaphore_Simple.h \ + SV_Semaphore_Simple.i \ + SV_Semaphore_Complex.i \ + Synch.i \ + Synch_T.h \ + Event_Handler.h \ + Event_Handler.i \ + Synch_T.i \ + Thread.h \ + Thread.i \ + Atomic_Op.i \ + Synch_T.cpp \ + Singleton.i \ + Singleton.cpp \ + Object_Manager.h \ + Object_Manager.i \ + Managed_Object.h \ + Managed_Object.i \ + Managed_Object.cpp \ + Malloc.i \ + Malloc_T.h \ + Free_List.h \ + Free_List.i \ + Free_List.cpp \ + Malloc_T.i \ + Malloc_T.cpp \ + Memory_Pool.h \ + Signal.h \ + Signal.i \ + Mem_Map.h \ + Mem_Map.i \ + Memory_Pool.i \ + SOCK_Dgram_Mcast_QoS.i + .obj/QoS_Session_Impl.o .obj/QoS_Session_Impl.so .shobj/QoS_Session_Impl.o .shobj/QoS_Session_Impl.so: QoS_Session_Impl.cpp \ SOCK.h \ pre.h \ @@ -12678,12 +13290,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -12772,12 +13385,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -12858,12 +13472,13 @@ endif # GHS config-all.h \ config.h \ config-linux-lxpthreads.h \ + config-linux.h \ config-linux-common.h \ config-g++-common.h \ post.h \ - ace_wchar.h \ ACE_export.h \ svc_export.h \ + ace_wchar.h \ OS_Dirent.h \ OS_Export.h \ OS_Dirent.inl \ @@ -12935,4 +13550,111 @@ endif # GHS Mem_Map.i \ Memory_Pool.i +.obj/QoS_Decorator.o .obj/QoS_Decorator.so .shobj/QoS_Decorator.o .shobj/QoS_Decorator.so: QoS_Decorator.cpp \ + QoS_Decorator.h \ + pre.h \ + Reactor.h \ + Handle_Set.h \ + ACE.h \ + OS.h \ + config-all.h \ + config.h \ + config-linux-lxpthreads.h \ + config-linux.h \ + config-linux-common.h \ + config-g++-common.h \ + post.h \ + ACE_export.h \ + svc_export.h \ + ace_wchar.h \ + OS_Dirent.h \ + OS_Export.h \ + OS_Dirent.inl \ + OS_String.h \ + OS_String.inl \ + OS_Memory.h \ + OS_Memory.inl \ + OS_TLI.h \ + OS_TLI.inl \ + Min_Max.h \ + streams.h \ + Basic_Types.h \ + Basic_Types.i \ + Trace.h \ + OS.i \ + ACE.i \ + Handle_Set.i \ + Timer_Queue.h \ + Synch.h \ + SV_Semaphore_Complex.h \ + SV_Semaphore_Simple.h \ + SV_Semaphore_Simple.i \ + SV_Semaphore_Complex.i \ + Synch.i \ + Synch_T.h \ + Event_Handler.h \ + Event_Handler.i \ + Synch_T.i \ + Thread.h \ + Thread.i \ + Atomic_Op.i \ + Synch_T.cpp \ + Log_Msg.h \ + Log_Record.h \ + Log_Priority.h \ + Log_Record.i \ + Timer_Queue_T.h \ + Free_List.h \ + Free_List.i \ + Free_List.cpp \ + Timer_Queue_T.i \ + Timer_Queue_T.cpp \ + Signal.h \ + Containers.h \ + Malloc_Base.h \ + Containers.i \ + Containers_T.h \ + Containers_T.i \ + Containers_T.cpp \ + Malloc.h \ + Based_Pointer_T.h \ + Based_Pointer_T.i \ + Based_Pointer_T.cpp \ + Based_Pointer_Repository.h \ + Singleton.h \ + Singleton.i \ + Singleton.cpp \ + Object_Manager.h \ + Object_Manager.i \ + Managed_Object.h \ + Managed_Object.i \ + Managed_Object.cpp \ + Malloc.i \ + Malloc_T.h \ + Malloc_T.i \ + Malloc_T.cpp \ + Memory_Pool.h \ + Mem_Map.h \ + Mem_Map.i \ + Memory_Pool.i \ + Signal.i \ + Reactor.i \ + Reactor_Impl.h \ + INET_Addr.h \ + Addr.h \ + Addr.i \ + INET_Addr.i \ + SOCK_Dgram_Mcast_QoS.h \ + SOCK_Dgram_Mcast.h \ + SOCK_Dgram.h \ + SOCK.h \ + IPC_SAP.h \ + IPC_SAP.i \ + QoS_Session.h \ + SOCK.i \ + SOCK_Dgram.i \ + SOCK_Dgram_Mcast.i \ + QoS_Manager.h \ + SOCK_Dgram_Mcast_QoS.i + # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/ace/Makefile.am b/ace/Makefile.am index 2198d5cd736..7bf1d43c883 100644 --- a/ace/Makefile.am +++ b/ace/Makefile.am @@ -138,6 +138,10 @@ libACE_OS_la_SOURCES = \ OS_Memory.cpp \ OS_String.cpp \ OS_TLI.cpp \ + Thread_Hook \ + Thread_Adapter \ + Thread_Exit \ + Thread_Control \ Sched_Params.cpp libACE_Utils_la_SOURCES = \ diff --git a/ace/Makefile.bor b/ace/Makefile.bor index 22660bb16bc..85363a3e121 100644 --- a/ace/Makefile.bor +++ b/ace/Makefile.bor @@ -97,6 +97,10 @@ OBJFILES = \ $(OBJDIR)\OS_Memory.obj \ $(OBJDIR)\OS_String.obj \ $(OBJDIR)\OS_TLI.obj \ + $(OBJDIR)\Thread_Hook.obj \ + $(OBJDIR)\Thread_Adapter.obj \ + $(OBJDIR)\Thread_Exit.obj \ + $(OBJDIR)\Thread_Control.obj \ $(OBJDIR)\Pair.obj \ $(OBJDIR)\Parse_Node.obj \ $(OBJDIR)\Pipe.obj \ diff --git a/ace/OS.cpp b/ace/OS.cpp index 1935b18752a..332fe0d1025 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -2,6 +2,8 @@ #include "ace/OS.h" #include "ace/Sched_Params.h" +#include "ace/Thread_Adapter.h" +#include "ace/Thread_Exit.h" // Perhaps we should *always* include ace/OS.i in order to make sure // we can always link against the OS symbols? @@ -214,12 +216,6 @@ ACE_OS::netdb_release (void) #endif /* ! ACE_MT_SAFE */ ACE_EXIT_HOOK ACE_OS::exit_hook_ = 0; -ACE_INIT_LOG_MSG_HOOK ACE_Thread_Adapter::init_log_msg_hook_ = 0; -ACE_INHERIT_LOG_MSG_HOOK ACE_Thread_Adapter::inherit_log_msg_hook_ = 0; -ACE_CLOSE_LOG_MSG_HOOK ACE_Thread_Adapter::close_log_msg_hook_ = 0; -ACE_SYNC_LOG_MSG_HOOK ACE_Thread_Adapter::sync_log_msg_hook_ = 0; - -u_int ACE_Thread_Exit::is_constructed_ = 0; // Static constant representing `zero-time'. // Note: this object requires static construction. @@ -2342,32 +2338,6 @@ ACE_OS::cleanup_tss (const u_int main_thread) } } -void -ACE_Thread_Adapter::inherit_log_msg (void) -{ - if (ACE_Thread_Adapter::inherit_log_msg_hook_ != 0) - (*ACE_Thread_Adapter::inherit_log_msg_hook_)(this->thr_desc_, - this->log_msg_attributes_); -} - -void -ACE_Thread_Adapter::close_log_msg (void) -{ - if (ACE_Thread_Adapter::close_log_msg_hook_ != 0) - { - (*ACE_Thread_Adapter::close_log_msg_hook_) (); - } -} - -void -ACE_Thread_Adapter::sync_log_msg (const ACE_TCHAR *prg) -{ - if (ACE_Thread_Adapter::sync_log_msg_hook_ != 0) - { - (*ACE_Thread_Adapter::sync_log_msg_hook_) (prg); - } -} - #if !defined(ACE_WIN32) && defined (__IBMCPP__) && (__IBMCPP__ >= 400) #define ACE_ENDTHREADEX(STATUS) ::_endthread () #define ACE_BEGINTHREADEX(STACK, STACKSIZE, ENTRY_POINT, ARGS, FLAGS, THR_ID) \ @@ -2423,220 +2393,6 @@ HANDLE WINAPI __IBMCPP__beginthreadex(void *stack, ::_beginthreadex (STACK, STACKSIZE, (unsigned (__stdcall *) (void *)) ENTRY_POINT, ARGS, FLAGS, (unsigned int *) THR_ID) #endif /* defined (__IBMCPP__) && (__IBMCPP__ >= 400) */ -void * -ACE_Thread_Hook::start (ACE_THR_FUNC func, - void *arg) -{ - return (func) (arg); -} - -ACE_Thread_Hook * -ACE_Thread_Hook::thread_hook (ACE_Thread_Hook *hook) -{ - return ACE_OS_Object_Manager::thread_hook (hook); -} - -ACE_Thread_Hook * -ACE_Thread_Hook::thread_hook (void) -{ - return ACE_OS_Object_Manager::thread_hook (); -} - -void * -ACE_Thread_Adapter::invoke (void) -{ - // Inherit the logging features if the parent thread has an - // ACE_Log_Msg instance in thread-specific storage. - this->inherit_log_msg (); - -#if !defined(ACE_USE_THREAD_MANAGER_ADAPTER) - // NOTE: this preprocessor directive should match the one in - // above ACE_Thread_Exit::instance (). With the Xavier Pthreads - // package, the exit_hook in TSS causes a seg fault. So, this - // works around that by creating exit_hook on the stack. -# if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION) - // Obtain our thread-specific exit hook and make sure that it - // knows how to clean us up! Note that we never use this - // pointer directly (it's stored in thread-specific storage), so - // it's ok to dereference it here and only store it as a - // reference. - if (this->thr_mgr () != 0) - { - ACE_Thread_Exit &exit_hook = *ACE_Thread_Exit::instance (); - // Keep track of the <Thread_Manager> that's associated with this - // <exit_hook>. - exit_hook.thr_mgr (this->thr_mgr ()); - } -# else - // Without TSS, create an <ACE_Thread_Exit> instance. When this - // function returns, its destructor will be called because the - // object goes out of scope. The drawback with this appraoch is - // that the destructor _won't_ get called if <thr_exit> is - // called. So, threads shouldn't exit that way. Instead, they - // should return from <svc>. - ACE_Thread_Exit exit_hook; - exit_hook.thr_mgr (this->thr_mgr ()); -# endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */ - -#endif /* ! ACE_USE_THREAD_MANAGER_ADAPTER */ - - // Extract the arguments. - ACE_THR_FUNC_INTERNAL func = ACE_reinterpret_cast (ACE_THR_FUNC_INTERNAL, - this->user_func_); - void *arg = this->arg_; - -#if defined (ACE_WIN32) && defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0) - ACE_OS_Thread_Descriptor *thr_desc = this->thr_desc_; -#endif /* ACE_WIN32 && ACE_HAS_MFC && (ACE_HAS_MFC != 0) */ - - // Delete ourselves since we don't need <this> anymore. Make sure - // not to access <this> anywhere below this point. - delete this; - -#if defined (ACE_NEEDS_LWP_PRIO_SET) - // On SunOS, the LWP priority needs to be set in order to get - // preemption when running in the RT class. This is the ACE way to - // do that . . . - ACE_hthread_t thr_handle; - ACE_OS::thr_self (thr_handle); - int prio; - - // thr_getprio () on the current thread should never fail. - ACE_OS::thr_getprio (thr_handle, prio); - - // ACE_OS::thr_setprio () has the special logic to set the LWP priority, - // if running in the RT class. - ACE_OS::thr_setprio (prio); - -#endif /* ACE_NEEDS_LWP_PRIO_SET */ - - void *status = 0; - - ACE_SEH_TRY - { - ACE_SEH_TRY - { - ACE_Thread_Hook *hook = - ACE_OS_Object_Manager::thread_hook (); - - if (hook) - // Invoke the start hook to give the user a chance to - // perform some initialization processing before the - // <func> is invoked. - status = hook->start (ACE_reinterpret_cast (ACE_THR_FUNC, func), - arg); - else - { - // Call thread entry point. -#if defined (ACE_PSOS) - (*func) (arg); -#else /* ! ACE_PSOS */ - status = ACE_reinterpret_cast (void *, (*func) (arg)); -#endif /* ACE_PSOS */ - } -#if defined (ACE_PSOS) - // pSOS task functions do not return a value. - status = 0; -#endif /* ACE_PSOS */ - } - -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) - ACE_SEH_EXCEPT (ACE_OS_Object_Manager::seh_except_selector ()( - (void *) GetExceptionInformation ())) - { - ACE_OS_Object_Manager::seh_except_handler ()(0); - } -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - } - - ACE_SEH_FINALLY - { - // If we changed this to 1, change the respective if in - // Task::svc_run to 0. -#if 0 - // Call the <Task->close> hook. - if (func == ACE_reinterpret_cast (ACE_THR_FUNC_INTERNAL, - ACE_Task_Base::svc_run)) - { - ACE_Task_Base *task_ptr = (ACE_Task_Base *) arg; - ACE_Thread_Manager *thr_mgr_ptr = task_ptr->thr_mgr (); - - // This calls the Task->close () hook. - task_ptr->cleanup (task_ptr, 0); - - // This prevents a second invocation of the cleanup code - // (called later by <ACE_Thread_Manager::exit>. - thr_mgr_ptr->at_exit (task_ptr, 0, 0); - } -#endif /* 0 */ - -#if defined (ACE_WIN32) || defined (ACE_HAS_TSS_EMULATION) -# if defined (ACE_WIN32) && defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0) - int using_afx = -1; - if (thr_desc) - using_afx = ACE_BIT_ENABLED (thr_desc->flags (), THR_USE_AFX); -# endif /* ACE_WIN32 && ACE_HAS_MFC && (ACE_HAS_MFC != 0) */ - // Call TSS destructors. - ACE_OS::cleanup_tss (0 /* not main thread */); - -# if defined (ACE_WIN32) - // Exit the thread. Allow CWinThread-destructor to be invoked - // from AfxEndThread. _endthreadex will be called from - // AfxEndThread so don't exit the thread now if we are running - // an MFC thread. -# if defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0) - if (using_afx != -1) - { - if (using_afx) - ::AfxEndThread ((DWORD) status); - else - ACE_ENDTHREADEX (status); - } - else - { - // Not spawned by ACE_Thread_Manager, use the old buggy - // version. You should seriously consider using - // ACE_Thread_Manager to spawn threads. The following code - // is know to cause some problem. - CWinThread *pThread = ::AfxGetThread (); - - if (!pThread || pThread->m_nThreadID != ACE_OS::thr_self ()) - ACE_ENDTHREADEX (status); - else - ::AfxEndThread ((DWORD)status); - } -# else - - ACE_ENDTHREADEX (status); -# endif /* ACE_HAS_MFC && ACE_HAS_MFS != 0*/ -# endif /* ACE_WIN32 */ -#endif /* ACE_WIN32 || ACE_HAS_TSS_EMULATION */ - -#if defined (ACE_PSOS) - // This sequence of calls is documented by ISI as the proper way to - // clean up a pSOS task. They affect different components, so only - // try the ones for components that are built with ACE. -# if defined (SC_PREPC) && (SC_PREPC == YES) - ::fclose (0); // Return pREPC+ resources -# endif /* SC_PREPC */ -# if defined (SC_PHILE) && (SC_PHILE == YES) - ::close_f (0); // Return pHILE+ resources -# endif /* SC_PHILE */ -# if defined (SC_PNA) && (SC_PNA == YES) - ::close (0); // Return pNA+ resources -# endif /* SC_PNA */ -# if defined (SC_SC_PREPC) && (SC_PREPC == YES) - ::free (-1); // Return pREPC+ memory -# endif /* SC_PREPC */ - status = ::t_delete (0); // Suicide - only returns on error -#endif /* ACE_PSOS */ - - return status; - } - - ACE_NOTREACHED (return status); -} - #if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) int ACE_SEH_Default_Exception_Selector (void *) { @@ -7048,6 +6804,8 @@ ACE_OS_Object_Manager::fini (void) # endif /* ACE_MT_SAFE */ #endif /* ! ACE_HAS_STATIC_PREALLOCATION */ + // @@ Shouldn't this be done in the ACE_Thread_Exit cleanup + // function? ACE_Thread_Exit::is_constructed_ = 0; // All TSS objects have been destroyed. Reset this flag so // ACE_Thread_Exit singleton can be created again. @@ -4451,272 +4451,8 @@ private: // ACE_Cleanup_Info). }; -// Run the thread entry point for the <ACE_Thread_Adapter>. This must -// be an extern "C" to make certain compilers happy... -#if defined (ACE_PSOS) -extern "C" void ace_thread_adapter (unsigned long args); -#else /* ! defined (ACE_PSOS) */ -extern "C" ACE_Export void *ace_thread_adapter (void *args); -#endif /* ACE_PSOS */ - -class ACE_OS_Thread_Descriptor -{ - // = TITLE - // Parent class of all ACE_Thread_Descriptor classes. - // - // = - // Container for ACE_Thread_Descriptor members that are - // used in ACE_OS. -public: - long flags (void) const; - // Get the thread creation flags. - -protected: - ACE_OS_Thread_Descriptor (long flags = 0); - // For use by ACE_Thread_Descriptor. - - long flags_; - // Keeps track of whether this thread was created "detached" or not. - // If a thread is *not* created detached then if someone calls - // <ACE_Thread_Manager::wait>, we need to join with that thread (and - // close down the handle). -}; - -// Forward decl. -class ACE_Thread_Manager; -class ACE_Thread_Descriptor; - -class ACE_Export ACE_Thread_Adapter -{ - // = TITLE - // Converts a C++ function into a function <ace_thread_adapter> - // function that can be called from a thread creation routine - // (e.g., <pthread_create> or <_beginthreadex>) that expects an - // extern "C" entry point. This class also makes it possible to - // transparently provide hooks to register a thread with an - // <ACE_Thread_Manager>. - // - // = DESCRIPTION - // This class is used in <ACE_OS::thr_create>. In general, the - // thread that creates an object of this class is different from - // the thread that calls <invoke> on this object. Therefore, - // the <invoke> method is responsible for deleting itself. -public: - ACE_Thread_Adapter (ACE_THR_FUNC user_func, - void *arg, - ACE_THR_C_FUNC entry_point = (ACE_THR_C_FUNC) ace_thread_adapter, - ACE_Thread_Manager *thr_mgr = 0, - ACE_Thread_Descriptor *td = 0 -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) - , ACE_SEH_EXCEPT_HANDLER selector = 0, - ACE_SEH_EXCEPT_HANDLER handler = 0 -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - ); - // Constructor. - - void *invoke (void); - // Execute the <user_func_> with the <arg>. This function deletes - // <this>, thereby rendering the object useless after the call - // returns. - - ACE_Thread_Manager *thr_mgr (void); - // Accessor for the optional <Thread_Manager>. - - ACE_THR_C_FUNC entry_point (void); - // Accessor for the C entry point function to the OS thread creation - // routine. - - static void close_log_msg (void); - // Invoke the close_log_msg_hook, if it is present - - static void sync_log_msg (const ACE_TCHAR *prog_name); - // Invoke the sync_log_msg_hook, if it is present - -private: - ~ACE_Thread_Adapter (void); - // Ensure that this object must be allocated on the heap. - - void inherit_log_msg (void); - // Inherit the logging features if the parent thread has an - // <ACE_Log_Msg>. - - static ACE_INIT_LOG_MSG_HOOK init_log_msg_hook_; - static ACE_INHERIT_LOG_MSG_HOOK inherit_log_msg_hook_; - static ACE_CLOSE_LOG_MSG_HOOK close_log_msg_hook_; - static ACE_SYNC_LOG_MSG_HOOK sync_log_msg_hook_; - // The hooks to inherit and cleanup the Log_Msg attributes - - static void set_log_msg_hooks (ACE_INIT_LOG_MSG_HOOK init_hook, - ACE_INHERIT_LOG_MSG_HOOK inherit_hook, - ACE_CLOSE_LOG_MSG_HOOK close_hook, - ACE_SYNC_LOG_MSG_HOOK sync_hook); - // Set the Log_Msg hooks - - friend class ACE_Log_Msg; - // Allow the ACE_Log_Msg class to set its hooks. - -private: - ACE_THR_FUNC user_func_; - // Thread startup function passed in by the user (C++ linkage). - - void *arg_; - // Argument to thread startup function. - - ACE_THR_C_FUNC entry_point_; - // Entry point to the underlying OS thread creation call (C - // linkage). - - ACE_Thread_Manager *thr_mgr_; - // Optional thread manager. - - ACE_OS_Thread_Descriptor *thr_desc_; - // Optional thread descriptor. Passing this pointer in will force - // the spawned thread to cache this location in <Log_Msg> and wait - // until <Thread_Manager> fills in all information in thread - // descriptor. - - void *log_msg_attributes_; - // The ACE_Log_Msg attributes. - - friend class ACE_Thread_Adapter_Has_Private_Destructor; - // Friend declaration to avoid compiler warning: only defines a private - // destructor and has no friends. -}; - -class ACE_Export ACE_Thread_Hook -{ - // = TITLE - // This class makes it possible to provide user-defined "start" - // hooks that are called before the thread entry point function - // is invoked. - -public: - virtual void *start (ACE_THR_FUNC func, - void *arg); - // This method can be overridden in a subclass to customize this - // pre-function call "hook" invocation that can perform - // initialization processing before the thread entry point <func> - // method is called back. The <func> and <arg> passed into the - // start hook are the same as those passed by the application that - // spawned the thread. - - static ACE_Thread_Hook *thread_hook (ACE_Thread_Hook *hook); - // sets the system wide thread hook, returns the previous thread - // hook or 0 if none is set. - - static ACE_Thread_Hook *thread_hook (void); - // Returns the current system thread hook. -}; - -class ACE_Export ACE_Thread_Control -{ - // = TITLE - // Used to keep track of a thread's activities within its entry - // point function. - // - // = DESCRIPTION - // A <ACE_Thread_Manager> uses this class to ensure that threads - // it spawns automatically register and unregister themselves - // with it. - // - // This class can be stored in thread-specific storage using the - // <ACE_TSS> wrapper. When a thread exits the - // <ACE_TSS::cleanup> function deletes this object, thereby - // ensuring that it gets removed from its associated - // <ACE_Thread_Manager>. -public: - ACE_Thread_Control (ACE_Thread_Manager *tm = 0, - int insert = 0); - // Initialize the thread control object. If <insert> != 0, then - // register the thread with the Thread_Manager. - - ~ACE_Thread_Control (void); - // Remove the thread from its associated <Thread_Manager> and exit - // the thread if <do_thr_exit> is enabled. - - void *exit (void *status, - int do_thr_exit); - // Remove this thread from its associated <Thread_Manager> and exit - // the thread if <do_thr_exit> is enabled. - - int insert (ACE_Thread_Manager *tm, int insert = 0); - // Store the <Thread_Manager> and use it to register ourselves for - // correct shutdown. - - ACE_Thread_Manager *thr_mgr (void); - // Returns the current <Thread_Manager>. - - ACE_Thread_Manager *thr_mgr (ACE_Thread_Manager *); - // Atomically set a new <Thread_Manager> and return the old - // <Thread_Manager>. - - void *status (void *status); - // Set the exit status (and return existing status). - - void *status (void); - // Get the current exit status. - - void dump (void) const; - // Dump the state of an object. - - ACE_ALLOC_HOOK_DECLARE; - // Declare the dynamic allocation hooks. - -private: - ACE_Thread_Manager *tm_; - // Pointer to the thread manager for this block of code. - - void *status_; - // Keeps track of the exit status for the thread. -}; - -class ACE_Export ACE_Thread_Exit -{ - // = TITLE - // Keep exit information for a Thread in thread specific storage. - // so that the thread-specific exit hooks will get called no - // matter how the thread exits (e.g., via <ACE_Thread::exit>, C++ - // or Win32 exception, "falling off the end" of the thread entry - // point function, etc.). - // - // = DESCRIPTION - // This clever little helper class is stored in thread-specific - // storage using the <ACE_TSS> wrapper. When a thread exits the - // <ACE_TSS::cleanup> function deletes this object, thereby - // closing it down gracefully. -public: - ACE_Thread_Exit (void); - // Capture the Thread that will be cleaned up automatically. - - void thr_mgr (ACE_Thread_Manager *tm); - // Set the <ACE_Thread_Manager>. - - ~ACE_Thread_Exit (void); - // Destructor calls the thread-specific exit hooks when a thread - // exits. - - static ACE_Thread_Exit *instance (void); - // Singleton access point. - - static void cleanup (void *instance, void *); - // Cleanup method, used by the <ACE_Object_Manager> to destroy the - // singleton. - -private: - friend class ACE_OS_Object_Manager; - // Allow OS_Object_Manager to reset the status of <is_constructed_>. - - ACE_Thread_Control thread_control_; - // Automatically add/remove the thread from the - // <ACE_Thread_Manager>. - - static u_int is_constructed_; - // Used to detect whether we should create a new instance (or not) - // within the instance method -- we don't trust the instance_ ptr - // because the destructor may have run (if ACE::fini() was called). - // See bug #526. - // We don't follow the singleton pattern due to dependency issues. -}; +class ACE_Thread_Adapter; +class ACE_Thread_Hook; # if defined (ACE_HAS_PHARLAP_RT) #define ACE_IPPROTO_TCP SOL_SOCKET @@ -7544,6 +7280,10 @@ typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_LPTRANSMIT_FILE_BUFFERS; #if !defined (ACE_ONLY_LATEST_AND_GREATEST) # include "ace/Log_Msg.h" +# include "ace/Thread_Hook.h" +# include "ace/Thread_Adapter.h" +# include "ace/Thread_Exit.h" +# include "ace/Thread_Control.h" #endif /* ACE_ONLY_LATEST_AND_GREATEST */ #include "ace/post.h" @@ -11326,51 +11326,8 @@ ACE_OS::pthread_sigmask (int how, const sigset_t *nsp, sigset_t *osp) #endif /* ACE_HAS_PACE */ } -ACE_INLINE long -ACE_OS_Thread_Descriptor::flags (void) const -{ - ACE_OS_TRACE ("ACE_OS_Thread_Descriptor::flags"); - return flags_; -} - - -ACE_INLINE -ACE_OS_Thread_Descriptor::ACE_OS_Thread_Descriptor (long flags) - : flags_ (flags) -{ -} - // **************************************************************** -ACE_INLINE void -ACE_Thread_Adapter::set_log_msg_hooks (ACE_INIT_LOG_MSG_HOOK init_hook, - ACE_INHERIT_LOG_MSG_HOOK inherit_hook, - ACE_CLOSE_LOG_MSG_HOOK close_hook, - ACE_SYNC_LOG_MSG_HOOK sync_hook) -{ - ACE_Thread_Adapter::init_log_msg_hook_ = init_hook; - ACE_Thread_Adapter::inherit_log_msg_hook_ = inherit_hook; - ACE_Thread_Adapter::close_log_msg_hook_ = close_hook; - ACE_Thread_Adapter::sync_log_msg_hook_ = sync_hook; -} - -ACE_INLINE ACE_Thread_Manager * -ACE_Thread_Adapter::thr_mgr (void) -{ - return this->thr_mgr_; -} - -ACE_INLINE -ACE_Thread_Adapter::~ACE_Thread_Adapter (void) -{ -} - -ACE_INLINE ACE_THR_C_FUNC -ACE_Thread_Adapter::entry_point (void) -{ - return this->entry_point_; -} - #if defined (ACE_PSOS) ACE_INLINE int isatty (int h) diff --git a/ace/OS_String.cpp b/ace/OS_String.cpp index 82b8d4b767f..c77165ed4a6 100644 --- a/ace/OS_String.cpp +++ b/ace/OS_String.cpp @@ -10,7 +10,7 @@ ACE_RCSID(ace, OS_String, "$Id$") #endif /* ACE_HAS_INLINED_OS_CALLS */ #if defined (ACE_LACKS_WCSDUP_PROTOTYPE) -extern "C" wchar_t *wcsdup __P ((__const wchar_t *__s)); +extern "C" wchar_t *wcsdup __P ((__const wchar_t *__s)); #endif /* ACE_LACKS_WCSDUP_PROTOTYPE */ const char * @@ -248,7 +248,7 @@ ACE_OS_String::strcasecmp_emulation (const char *s, const char *t) const char *scan2 = t; while (*scan1 != 0 - && ACE_OS_String::to_lower (*scan1) + && ACE_OS_String::to_lower (*scan1) == ACE_OS_String::to_lower (*scan2)) { ++scan1; @@ -277,7 +277,7 @@ ACE_OS_String::strcasecmp_emulation (const wchar_t *s, const wchar_t *t) const wchar_t *scan2 = t; while (*scan1 != 0 - && ACE_OS_String::to_lower (*scan1) + && ACE_OS_String::to_lower (*scan1) == ACE_OS_String::to_lower (*scan2)) { ++scan1; @@ -300,8 +300,8 @@ ACE_OS_String::strcasecmp_emulation (const wchar_t *s, const wchar_t *t) #endif /* ACE_HAS_WCHAR */ int -ACE_OS_String::strncasecmp_emulation (const char *s, - const char *t, +ACE_OS_String::strncasecmp_emulation (const char *s, + const char *t, size_t len) { const char *scan1 = s; @@ -310,7 +310,7 @@ ACE_OS_String::strncasecmp_emulation (const char *s, while (count++ < len && *scan1 != 0 - && ACE_OS_String::to_lower (*scan1) + && ACE_OS_String::to_lower (*scan1) == ACE_OS_String::to_lower (*scan2)) { ++scan1; @@ -336,8 +336,8 @@ ACE_OS_String::strncasecmp_emulation (const char *s, #if defined (ACE_HAS_WCHAR) int -ACE_OS_String::strncasecmp_emulation (const wchar_t *s, - const wchar_t *t, +ACE_OS_String::strncasecmp_emulation (const wchar_t *s, + const wchar_t *t, size_t len) { const wchar_t *scan1 = s; @@ -346,7 +346,7 @@ ACE_OS_String::strncasecmp_emulation (const wchar_t *s, while (count++ > len && *scan1 != 0 - && ACE_OS_String::to_lower (*scan1) + && ACE_OS_String::to_lower (*scan1) == ACE_OS_String::to_lower (*scan2)) { ++scan1; @@ -420,7 +420,7 @@ ACE_OS_String::itoa_emulation (int value, char *string, int radix) } // If negative and base 10, print a - and then do the - // number. + // number. if (value < 0 && radix == 10) { @@ -441,13 +441,13 @@ ACE_OS_String::itoa_emulation (int value, char *string, int radix) *e-- = 0; // Now reverse the string to get the correct result - + while (e > b) { char temp = *e; *e = *b; *b = temp; - ++b; + ++b; --e; } @@ -471,7 +471,7 @@ ACE_OS_String::itoa_emulation (int value, wchar_t *string, int radix) } // If negative and base 10, print a - and then do the - // number. + // number. if (value < 0 && radix == 10) { @@ -492,13 +492,13 @@ ACE_OS_String::itoa_emulation (int value, wchar_t *string, int radix) *e-- = 0; // Now reverse the string to get the correct result - + while (e > b) { wchar_t temp = *e; *e = *b; *b = temp; - ++b; + ++b; --e; } diff --git a/ace/Thread_Adapter.cpp b/ace/Thread_Adapter.cpp new file mode 100644 index 00000000000..361909a8545 --- /dev/null +++ b/ace/Thread_Adapter.cpp @@ -0,0 +1,239 @@ +// $Id$ + +#include "ace/Thread_Adapter.h" +#include "ace/Thread_Manager.h" +#include "ace/Thread_Exit.h" +#include "ace/Thread_Hook.h" + +ACE_RCSID(ace, Thread_Adapter, "$Id$") + +#if !defined (ACE_HAS_INLINED_OSCALLS) +# include "ace/Thread_Adapter.inl" +#endif /* ACE_HAS_INLINED_OS_CALLS */ + +ACE_INIT_LOG_MSG_HOOK ACE_Thread_Adapter::init_log_msg_hook_ = 0; +ACE_INHERIT_LOG_MSG_HOOK ACE_Thread_Adapter::inherit_log_msg_hook_ = 0; +ACE_CLOSE_LOG_MSG_HOOK ACE_Thread_Adapter::close_log_msg_hook_ = 0; +ACE_SYNC_LOG_MSG_HOOK ACE_Thread_Adapter::sync_log_msg_hook_ = 0; + +void +ACE_Thread_Adapter::inherit_log_msg (void) +{ + if (ACE_Thread_Adapter::inherit_log_msg_hook_ != 0) + (*ACE_Thread_Adapter::inherit_log_msg_hook_)(this->thr_desc_, + this->log_msg_attributes_); +} + +void +ACE_Thread_Adapter::close_log_msg (void) +{ + if (ACE_Thread_Adapter::close_log_msg_hook_ != 0) + { + (*ACE_Thread_Adapter::close_log_msg_hook_) (); + } +} + +void +ACE_Thread_Adapter::sync_log_msg (const ACE_TCHAR *prg) +{ + if (ACE_Thread_Adapter::sync_log_msg_hook_ != 0) + { + (*ACE_Thread_Adapter::sync_log_msg_hook_) (prg); + } +} + + +void * +ACE_Thread_Adapter::invoke (void) +{ + // Inherit the logging features if the parent thread has an + // ACE_Log_Msg instance in thread-specific storage. + this->inherit_log_msg (); + +#if !defined(ACE_USE_THREAD_MANAGER_ADAPTER) + // NOTE: this preprocessor directive should match the one in + // above ACE_Thread_Exit::instance (). With the Xavier Pthreads + // package, the exit_hook in TSS causes a seg fault. So, this + // works around that by creating exit_hook on the stack. +# if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION) + // Obtain our thread-specific exit hook and make sure that it + // knows how to clean us up! Note that we never use this + // pointer directly (it's stored in thread-specific storage), so + // it's ok to dereference it here and only store it as a + // reference. + if (this->thr_mgr () != 0) + { + ACE_Thread_Exit &exit_hook = *ACE_Thread_Exit::instance (); + // Keep track of the <Thread_Manager> that's associated with this + // <exit_hook>. + exit_hook.thr_mgr (this->thr_mgr ()); + } +# else + // Without TSS, create an <ACE_Thread_Exit> instance. When this + // function returns, its destructor will be called because the + // object goes out of scope. The drawback with this appraoch is + // that the destructor _won't_ get called if <thr_exit> is + // called. So, threads shouldn't exit that way. Instead, they + // should return from <svc>. + ACE_Thread_Exit exit_hook; + exit_hook.thr_mgr (this->thr_mgr ()); +# endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */ + +#endif /* ! ACE_USE_THREAD_MANAGER_ADAPTER */ + + // Extract the arguments. + ACE_THR_FUNC_INTERNAL func = ACE_reinterpret_cast (ACE_THR_FUNC_INTERNAL, + this->user_func_); + void *arg = this->arg_; + +#if defined (ACE_WIN32) && defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0) + ACE_OS_Thread_Descriptor *thr_desc = this->thr_desc_; +#endif /* ACE_WIN32 && ACE_HAS_MFC && (ACE_HAS_MFC != 0) */ + + // Delete ourselves since we don't need <this> anymore. Make sure + // not to access <this> anywhere below this point. + delete this; + +#if defined (ACE_NEEDS_LWP_PRIO_SET) + // On SunOS, the LWP priority needs to be set in order to get + // preemption when running in the RT class. This is the ACE way to + // do that . . . + ACE_hthread_t thr_handle; + ACE_OS::thr_self (thr_handle); + int prio; + + // thr_getprio () on the current thread should never fail. + ACE_OS::thr_getprio (thr_handle, prio); + + // ACE_OS::thr_setprio () has the special logic to set the LWP priority, + // if running in the RT class. + ACE_OS::thr_setprio (prio); + +#endif /* ACE_NEEDS_LWP_PRIO_SET */ + + void *status = 0; + + ACE_SEH_TRY + { + ACE_SEH_TRY + { + ACE_Thread_Hook *hook = + ACE_OS_Object_Manager::thread_hook (); + + if (hook) + // Invoke the start hook to give the user a chance to + // perform some initialization processing before the + // <func> is invoked. + status = hook->start (ACE_reinterpret_cast (ACE_THR_FUNC, func), + arg); + else + { + // Call thread entry point. +#if defined (ACE_PSOS) + (*func) (arg); +#else /* ! ACE_PSOS */ + status = ACE_reinterpret_cast (void *, (*func) (arg)); +#endif /* ACE_PSOS */ + } +#if defined (ACE_PSOS) + // pSOS task functions do not return a value. + status = 0; +#endif /* ACE_PSOS */ + } + +#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) + ACE_SEH_EXCEPT (ACE_OS_Object_Manager::seh_except_selector ()( + (void *) GetExceptionInformation ())) + { + ACE_OS_Object_Manager::seh_except_handler ()(0); + } +#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ + } + + ACE_SEH_FINALLY + { + // If we changed this to 1, change the respective if in + // Task::svc_run to 0. +#if 0 + // Call the <Task->close> hook. + if (func == ACE_reinterpret_cast (ACE_THR_FUNC_INTERNAL, + ACE_Task_Base::svc_run)) + { + ACE_Task_Base *task_ptr = (ACE_Task_Base *) arg; + ACE_Thread_Manager *thr_mgr_ptr = task_ptr->thr_mgr (); + + // This calls the Task->close () hook. + task_ptr->cleanup (task_ptr, 0); + + // This prevents a second invocation of the cleanup code + // (called later by <ACE_Thread_Manager::exit>. + thr_mgr_ptr->at_exit (task_ptr, 0, 0); + } +#endif /* 0 */ + +#if defined (ACE_WIN32) || defined (ACE_HAS_TSS_EMULATION) +# if defined (ACE_WIN32) && defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0) + int using_afx = -1; + if (thr_desc) + using_afx = ACE_BIT_ENABLED (thr_desc->flags (), THR_USE_AFX); +# endif /* ACE_WIN32 && ACE_HAS_MFC && (ACE_HAS_MFC != 0) */ + // Call TSS destructors. + ACE_OS::cleanup_tss (0 /* not main thread */); + +# if defined (ACE_WIN32) + // Exit the thread. Allow CWinThread-destructor to be invoked + // from AfxEndThread. _endthreadex will be called from + // AfxEndThread so don't exit the thread now if we are running + // an MFC thread. +# if defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0) + if (using_afx != -1) + { + if (using_afx) + ::AfxEndThread ((DWORD) status); + else + ACE_ENDTHREADEX (status); + } + else + { + // Not spawned by ACE_Thread_Manager, use the old buggy + // version. You should seriously consider using + // ACE_Thread_Manager to spawn threads. The following code + // is know to cause some problem. + CWinThread *pThread = ::AfxGetThread (); + + if (!pThread || pThread->m_nThreadID != ACE_OS::thr_self ()) + ACE_ENDTHREADEX (status); + else + ::AfxEndThread ((DWORD)status); + } +# else + + ACE_ENDTHREADEX (status); +# endif /* ACE_HAS_MFC && ACE_HAS_MFS != 0*/ +# endif /* ACE_WIN32 */ +#endif /* ACE_WIN32 || ACE_HAS_TSS_EMULATION */ + +#if defined (ACE_PSOS) + // This sequence of calls is documented by ISI as the proper way to + // clean up a pSOS task. They affect different components, so only + // try the ones for components that are built with ACE. +# if defined (SC_PREPC) && (SC_PREPC == YES) + ::fclose (0); // Return pREPC+ resources +# endif /* SC_PREPC */ +# if defined (SC_PHILE) && (SC_PHILE == YES) + ::close_f (0); // Return pHILE+ resources +# endif /* SC_PHILE */ +# if defined (SC_PNA) && (SC_PNA == YES) + ::close (0); // Return pNA+ resources +# endif /* SC_PNA */ +# if defined (SC_SC_PREPC) && (SC_PREPC == YES) + ::free (-1); // Return pREPC+ memory +# endif /* SC_PREPC */ + status = ::t_delete (0); // Suicide - only returns on error +#endif /* ACE_PSOS */ + + return status; + } + + ACE_NOTREACHED (return status); +} diff --git a/ace/Thread_Adapter.h b/ace/Thread_Adapter.h new file mode 100644 index 00000000000..9da861cb5d3 --- /dev/null +++ b/ace/Thread_Adapter.h @@ -0,0 +1,169 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// ace +// +// = FILENAME +// Thread_Adapter.h +// +// = AUTHOR +// Carlos O'Ryan <coryan@uci.edu> +// +// ============================================================================ + +#ifndef ACE_THREAD_ADAPTER_H +#define ACE_THREAD_ADAPTER_H +#include "ace/pre.h" + +#include "ace/config-all.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ace/OS.h" + +// Run the thread entry point for the <ACE_Thread_Adapter>. This must +// be an extern "C" to make certain compilers happy... +#if defined (ACE_PSOS) +extern "C" void ace_thread_adapter (unsigned long args); +#else /* ! defined (ACE_PSOS) */ +extern "C" ACE_Export void *ace_thread_adapter (void *args); +#endif /* ACE_PSOS */ + +class ACE_OS_Thread_Descriptor +{ + // = TITLE + // Parent class of all ACE_Thread_Descriptor classes. + // + // = + // Container for ACE_Thread_Descriptor members that are + // used in ACE_OS. +public: + long flags (void) const; + // Get the thread creation flags. + +protected: + ACE_OS_Thread_Descriptor (long flags = 0); + // For use by ACE_Thread_Descriptor. + + long flags_; + // Keeps track of whether this thread was created "detached" or not. + // If a thread is *not* created detached then if someone calls + // <ACE_Thread_Manager::wait>, we need to join with that thread (and + // close down the handle). +}; + +// Forward decl. +class ACE_Thread_Manager; +class ACE_Thread_Descriptor; + +class ACE_Export ACE_Thread_Adapter +{ + // = TITLE + // Converts a C++ function into a function <ace_thread_adapter> + // function that can be called from a thread creation routine + // (e.g., <pthread_create> or <_beginthreadex>) that expects an + // extern "C" entry point. This class also makes it possible to + // transparently provide hooks to register a thread with an + // <ACE_Thread_Manager>. + // + // = DESCRIPTION + // This class is used in <ACE_OS::thr_create>. In general, the + // thread that creates an object of this class is different from + // the thread that calls <invoke> on this object. Therefore, + // the <invoke> method is responsible for deleting itself. +public: + ACE_Thread_Adapter (ACE_THR_FUNC user_func, + void *arg, + ACE_THR_C_FUNC entry_point = (ACE_THR_C_FUNC) ace_thread_adapter, + ACE_Thread_Manager *thr_mgr = 0, + ACE_Thread_Descriptor *td = 0 +# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) + , ACE_SEH_EXCEPT_HANDLER selector = 0, + ACE_SEH_EXCEPT_HANDLER handler = 0 +# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ + ); + // Constructor. + + void *invoke (void); + // Execute the <user_func_> with the <arg>. This function deletes + // <this>, thereby rendering the object useless after the call + // returns. + + ACE_Thread_Manager *thr_mgr (void); + // Accessor for the optional <Thread_Manager>. + + ACE_THR_C_FUNC entry_point (void); + // Accessor for the C entry point function to the OS thread creation + // routine. + + static void close_log_msg (void); + // Invoke the close_log_msg_hook, if it is present + + static void sync_log_msg (const ACE_TCHAR *prog_name); + // Invoke the sync_log_msg_hook, if it is present + +private: + ~ACE_Thread_Adapter (void); + // Ensure that this object must be allocated on the heap. + + void inherit_log_msg (void); + // Inherit the logging features if the parent thread has an + // <ACE_Log_Msg>. + + static ACE_INIT_LOG_MSG_HOOK init_log_msg_hook_; + static ACE_INHERIT_LOG_MSG_HOOK inherit_log_msg_hook_; + static ACE_CLOSE_LOG_MSG_HOOK close_log_msg_hook_; + static ACE_SYNC_LOG_MSG_HOOK sync_log_msg_hook_; + // The hooks to inherit and cleanup the Log_Msg attributes + + static void set_log_msg_hooks (ACE_INIT_LOG_MSG_HOOK init_hook, + ACE_INHERIT_LOG_MSG_HOOK inherit_hook, + ACE_CLOSE_LOG_MSG_HOOK close_hook, + ACE_SYNC_LOG_MSG_HOOK sync_hook); + // Set the Log_Msg hooks + + friend class ACE_Log_Msg; + // Allow the ACE_Log_Msg class to set its hooks. + +private: + ACE_THR_FUNC user_func_; + // Thread startup function passed in by the user (C++ linkage). + + void *arg_; + // Argument to thread startup function. + + ACE_THR_C_FUNC entry_point_; + // Entry point to the underlying OS thread creation call (C + // linkage). + + ACE_Thread_Manager *thr_mgr_; + // Optional thread manager. + + ACE_OS_Thread_Descriptor *thr_desc_; + // Optional thread descriptor. Passing this pointer in will force + // the spawned thread to cache this location in <Log_Msg> and wait + // until <Thread_Manager> fills in all information in thread + // descriptor. + + void *log_msg_attributes_; + // The ACE_Log_Msg attributes. + + friend class ACE_Thread_Adapter_Has_Private_Destructor; + // Friend declaration to avoid compiler warning: only defines a private + // destructor and has no friends. +}; + +# if defined (ACE_HAS_INLINED_OSCALLS) +# if defined (ACE_INLINE) +# undef ACE_INLINE +# endif /* ACE_INLINE */ +# define ACE_INLINE inline +# include "ace/Thread_Adapter.inl" +# endif /* ACE_HAS_INLINED_OSCALLS */ + +#include "ace/post.h" +#endif /* ACE_THREAD_ADAPTER_H */ diff --git a/ace/Thread_Adapter.inl b/ace/Thread_Adapter.inl new file mode 100644 index 00000000000..715e267a1d2 --- /dev/null +++ b/ace/Thread_Adapter.inl @@ -0,0 +1,44 @@ +// $Id$ + +ACE_INLINE long +ACE_OS_Thread_Descriptor::flags (void) const +{ + ACE_OS_TRACE ("ACE_OS_Thread_Descriptor::flags"); + return flags_; +} + + +ACE_INLINE +ACE_OS_Thread_Descriptor::ACE_OS_Thread_Descriptor (long flags) + : flags_ (flags) +{ +} + +ACE_INLINE void +ACE_Thread_Adapter::set_log_msg_hooks (ACE_INIT_LOG_MSG_HOOK init_hook, + ACE_INHERIT_LOG_MSG_HOOK inherit_hook, + ACE_CLOSE_LOG_MSG_HOOK close_hook, + ACE_SYNC_LOG_MSG_HOOK sync_hook) +{ + ACE_Thread_Adapter::init_log_msg_hook_ = init_hook; + ACE_Thread_Adapter::inherit_log_msg_hook_ = inherit_hook; + ACE_Thread_Adapter::close_log_msg_hook_ = close_hook; + ACE_Thread_Adapter::sync_log_msg_hook_ = sync_hook; +} + +ACE_INLINE ACE_Thread_Manager * +ACE_Thread_Adapter::thr_mgr (void) +{ + return this->thr_mgr_; +} + +ACE_INLINE +ACE_Thread_Adapter::~ACE_Thread_Adapter (void) +{ +} + +ACE_INLINE ACE_THR_C_FUNC +ACE_Thread_Adapter::entry_point (void) +{ + return this->entry_point_; +} diff --git a/ace/Thread_Control.cpp b/ace/Thread_Control.cpp new file mode 100644 index 00000000000..13a4c063795 --- /dev/null +++ b/ace/Thread_Control.cpp @@ -0,0 +1,81 @@ +// $Id$ + +#include "ace/Thread_Control.h" +#include "ace/Thread_Manager.h" + +ACE_RCSID(ace, Thread_Control, "$Id$") + +#if !defined (ACE_HAS_INLINED_OSCALLS) +# include "ace/Thread_Control.inl" +#endif /* ACE_HAS_INLINED_OS_CALLS */ + +void +ACE_Thread_Control::dump (void) const +{ + ACE_OS_TRACE ("ACE_Thread_Control::dump"); +} + +int +ACE_Thread_Control::insert (ACE_Thread_Manager *tm, int insert) +{ + ACE_OS_TRACE ("ACE_Thread_Control::insert"); + + ACE_hthread_t t_id; + ACE_OS::thr_self (t_id); + this->tm_ = tm; + + if (insert) + return this->tm_->insert_thr (ACE_OS::thr_self (), t_id); + else + return 0; +} + +// Initialize the thread controller. + +ACE_Thread_Control::ACE_Thread_Control (ACE_Thread_Manager *t, + int insert) + : tm_ (t), + status_ (0) +{ + ACE_OS_TRACE ("ACE_Thread_Control::ACE_Thread_Control"); + + if (this->tm_ != 0 && insert) + { + ACE_hthread_t t_id; + ACE_OS::thr_self (t_id); + this->tm_->insert_thr (ACE_OS::thr_self (), t_id); + } +} + +// Automatically kill thread on exit. + +ACE_Thread_Control::~ACE_Thread_Control (void) +{ + ACE_OS_TRACE ("ACE_Thread_Control::~ACE_Thread_Control"); + +#if defined (ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS) || defined (ACE_HAS_TSS_EMULATION) || defined (ACE_WIN32) + this->exit (this->status_, 0); +#else + this->exit (this->status_, 1); +#endif /* ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS */ +} + +// Exit from thread (but clean up first). + +void * +ACE_Thread_Control::exit (void *exit_status, int do_thr_exit) +{ + ACE_OS_TRACE ("ACE_Thread_Control::exit"); + + if (this->tm_ != 0) + return this->tm_->exit (exit_status, do_thr_exit); + else + { +#if !defined (ACE_HAS_TSS_EMULATION) + // With ACE_HAS_TSS_EMULATION, we let ACE_Thread_Adapter::invoke () + // exit the thread after cleaning up TSS. + ACE_OS::thr_exit (exit_status); +#endif /* ! ACE_HAS_TSS_EMULATION */ + return 0; + } +} diff --git a/ace/Thread_Control.h b/ace/Thread_Control.h new file mode 100644 index 00000000000..4fcce7cd770 --- /dev/null +++ b/ace/Thread_Control.h @@ -0,0 +1,101 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// ace +// +// = FILENAME +// Thread_Control.h +// +// = AUTHOR +// Carlos O'Ryan <coryan@uci.edu> +// +// ============================================================================ + +#ifndef ACE_THREAD_CONTROL_H +#define ACE_THREAD_CONTROL_H +#include "ace/pre.h" + +#include "ace/config-all.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ace/OS.h" + +class ACE_Thread_Manager; + +class ACE_Export ACE_Thread_Control +{ + // = TITLE + // Used to keep track of a thread's activities within its entry + // point function. + // + // = DESCRIPTION + // A <ACE_Thread_Manager> uses this class to ensure that threads + // it spawns automatically register and unregister themselves + // with it. + // + // This class can be stored in thread-specific storage using the + // <ACE_TSS> wrapper. When a thread exits the + // <ACE_TSS::cleanup> function deletes this object, thereby + // ensuring that it gets removed from its associated + // <ACE_Thread_Manager>. +public: + ACE_Thread_Control (ACE_Thread_Manager *tm = 0, + int insert = 0); + // Initialize the thread control object. If <insert> != 0, then + // register the thread with the Thread_Manager. + + ~ACE_Thread_Control (void); + // Remove the thread from its associated <Thread_Manager> and exit + // the thread if <do_thr_exit> is enabled. + + void *exit (void *status, + int do_thr_exit); + // Remove this thread from its associated <Thread_Manager> and exit + // the thread if <do_thr_exit> is enabled. + + int insert (ACE_Thread_Manager *tm, int insert = 0); + // Store the <Thread_Manager> and use it to register ourselves for + // correct shutdown. + + ACE_Thread_Manager *thr_mgr (void); + // Returns the current <Thread_Manager>. + + ACE_Thread_Manager *thr_mgr (ACE_Thread_Manager *); + // Atomically set a new <Thread_Manager> and return the old + // <Thread_Manager>. + + void *status (void *status); + // Set the exit status (and return existing status). + + void *status (void); + // Get the current exit status. + + void dump (void) const; + // Dump the state of an object. + + ACE_ALLOC_HOOK_DECLARE; + // Declare the dynamic allocation hooks. + +private: + ACE_Thread_Manager *tm_; + // Pointer to the thread manager for this block of code. + + void *status_; + // Keeps track of the exit status for the thread. +}; + +# if defined (ACE_HAS_INLINED_OSCALLS) +# if defined (ACE_INLINE) +# undef ACE_INLINE +# endif /* ACE_INLINE */ +# define ACE_INLINE inline +# include "ace/Thread_Control.inl" +# endif /* ACE_HAS_INLINED_OSCALLS */ + +#include "ace/post.h" +#endif /* ACE_THREAD_CONTROL_H */ diff --git a/ace/Thread_Control.inl b/ace/Thread_Control.inl new file mode 100644 index 00000000000..29cb24b1df3 --- /dev/null +++ b/ace/Thread_Control.inl @@ -0,0 +1,42 @@ +// -*- C++ -*- +// $Id$ + +// Set the exit status. + +ACE_INLINE void * +ACE_Thread_Control::status (void *s) +{ + ACE_OS_TRACE ("ACE_Thread_Control::status"); + return this->status_ = s; +} + +// Get the exit status. + +ACE_INLINE void * +ACE_Thread_Control::status (void) +{ + ACE_OS_TRACE ("ACE_Thread_Control::status"); + return this->status_; +} + +// Returns the current <Thread_Manager>. + +ACE_INLINE ACE_Thread_Manager * +ACE_Thread_Control::thr_mgr (void) +{ + ACE_OS_TRACE ("ACE_Thread_Control::thr_mgr"); + return this->tm_; +} + +// Atomically set a new <Thread_Manager> and return the old +// <Thread_Manager>. + +ACE_INLINE ACE_Thread_Manager * +ACE_Thread_Control::thr_mgr (ACE_Thread_Manager *tm) +{ + ACE_OS_TRACE ("ACE_Thread_Control::thr_mgr"); + ACE_Thread_Manager *o_tm = this->tm_; + this->tm_ = tm; + return o_tm; +} + diff --git a/ace/Thread_Exit.cpp b/ace/Thread_Exit.cpp new file mode 100644 index 00000000000..bd6efdd6282 --- /dev/null +++ b/ace/Thread_Exit.cpp @@ -0,0 +1,104 @@ +// $Id$ + +#include "ace/Thread_Exit.h" +#include "ace/OS.h" +#include "ace/Synch.h" +#include "ace/Managed_Object.h" + +ACE_RCSID(ace, Thread_Exit, "$Id$") + +u_int ACE_Thread_Exit::is_constructed_ = 0; + +#if defined (ACE_HAS_SIG_C_FUNC) +extern "C" void +ACE_Thread_Exit_cleanup (void *instance, void *) +{ + ACE_OS_TRACE ("ACE_Thread_Exit_cleanup"); + + delete (ACE_TSS_TYPE (ACE_Thread_Exit) *) instance; +} +#else +void +ACE_Thread_Exit::cleanup (void *instance, void *) +{ + ACE_OS_TRACE ("ACE_Thread_Exit::cleanup"); + + delete (ACE_TSS_TYPE (ACE_Thread_Exit) *) instance; +} +#endif /* ACE_HAS_SIG_C_FUNC */ + +// NOTE: this preprocessor directive should match the one in +// ACE_Task_Base::svc_run () below. This prevents the two statics +// from being defined. + +ACE_Thread_Exit * +ACE_Thread_Exit::instance (void) +{ +#if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION) + ACE_OS_TRACE ("ACE_Thread_Exit::instance"); + + // Determines if we were dynamically allocated. + static ACE_TSS_TYPE (ACE_Thread_Exit) *instance_; + + // Implement the Double Check pattern. + + if (ACE_Thread_Exit::is_constructed_ == 0) + { + ACE_MT (ACE_Thread_Mutex *lock = + ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object + (ACE_Object_Manager::ACE_THREAD_EXIT_LOCK); + ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, 0)); + + if (ACE_Thread_Exit::is_constructed_ == 0) + { + ACE_NEW_RETURN (instance_, + ACE_TSS_TYPE (ACE_Thread_Exit), + 0); + + ACE_Thread_Exit::is_constructed_ = 1; + + // Register for destruction with ACE_Object_Manager. +#if defined ACE_HAS_SIG_C_FUNC + ACE_Object_Manager::at_exit (instance_, + ACE_Thread_Exit_cleanup, + 0); +#else + ACE_Object_Manager::at_exit (instance_, + ACE_Thread_Exit::cleanup, + 0); +#endif /* ACE_HAS_SIG_C_FUNC */ + } + } + + return ACE_TSS_GET (instance_, ACE_Thread_Exit); +#else + return 0; +#endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */ +} + +// Grab hold of the Task * so that we can close() it in the +// destructor. + +ACE_Thread_Exit::ACE_Thread_Exit (void) +{ + ACE_OS_TRACE ("ACE_Thread_Exit::ACE_Thread_Exit"); +} + +// Set the this pointer... + +void +ACE_Thread_Exit::thr_mgr (ACE_Thread_Manager *tm) +{ + ACE_OS_TRACE ("ACE_Thread_Exit::thr_mgr"); + + if (tm != 0) + this->thread_control_.insert (tm, 0); +} + +// When this object is destroyed the Task is automatically closed +// down! + +ACE_Thread_Exit::~ACE_Thread_Exit (void) +{ + ACE_OS_TRACE ("ACE_Thread_Exit::~ACE_Thread_Exit"); +} diff --git a/ace/Thread_Exit.h b/ace/Thread_Exit.h new file mode 100644 index 00000000000..1df6538dc9e --- /dev/null +++ b/ace/Thread_Exit.h @@ -0,0 +1,78 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// ace +// +// = FILENAME +// Thread_Exit.h +// +// = AUTHOR +// Carlos O'Ryan <coryan@uci.edu> +// +// ============================================================================ + +#ifndef ACE_THREAD_EXIT_H +#define ACE_THREAD_EXIT_H +#include "ace/pre.h" + +#include "ace/config-all.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ace/OS.h" +#include "ace/Thread_Control.h" + +class ACE_Export ACE_Thread_Exit +{ + // = TITLE + // Keep exit information for a Thread in thread specific storage. + // so that the thread-specific exit hooks will get called no + // matter how the thread exits (e.g., via <ACE_Thread::exit>, C++ + // or Win32 exception, "falling off the end" of the thread entry + // point function, etc.). + // + // = DESCRIPTION + // This clever little helper class is stored in thread-specific + // storage using the <ACE_TSS> wrapper. When a thread exits the + // <ACE_TSS::cleanup> function deletes this object, thereby + // closing it down gracefully. +public: + ACE_Thread_Exit (void); + // Capture the Thread that will be cleaned up automatically. + + void thr_mgr (ACE_Thread_Manager *tm); + // Set the <ACE_Thread_Manager>. + + ~ACE_Thread_Exit (void); + // Destructor calls the thread-specific exit hooks when a thread + // exits. + + static ACE_Thread_Exit *instance (void); + // Singleton access point. + + static void cleanup (void *instance, void *); + // Cleanup method, used by the <ACE_Object_Manager> to destroy the + // singleton. + +private: + friend class ACE_OS_Object_Manager; + // Allow OS_Object_Manager to reset the status of <is_constructed_>. + + ACE_Thread_Control thread_control_; + // Automatically add/remove the thread from the + // <ACE_Thread_Manager>. + + static u_int is_constructed_; + // Used to detect whether we should create a new instance (or not) + // within the instance method -- we don't trust the instance_ ptr + // because the destructor may have run (if ACE::fini() was called). + // See bug #526. + // We don't follow the singleton pattern due to dependency issues. +}; + +#include "ace/post.h" +#endif /* ACE_THREAD_EXIT_H */ diff --git a/ace/Thread_Hook.cpp b/ace/Thread_Hook.cpp new file mode 100644 index 00000000000..37fc54a4a66 --- /dev/null +++ b/ace/Thread_Hook.cpp @@ -0,0 +1,25 @@ +// $Id$ + +#include "ace/Thread_Hook.h" +#include "ace/Thread_Manager.h" + +ACE_RCSID(ace, Thread_Hook, "$Id$") + +void * +ACE_Thread_Hook::start (ACE_THR_FUNC func, + void *arg) +{ + return (func) (arg); +} + +ACE_Thread_Hook * +ACE_Thread_Hook::thread_hook (ACE_Thread_Hook *hook) +{ + return ACE_OS_Object_Manager::thread_hook (hook); +} + +ACE_Thread_Hook * +ACE_Thread_Hook::thread_hook (void) +{ + return ACE_OS_Object_Manager::thread_hook (); +} diff --git a/ace/Thread_Hook.h b/ace/Thread_Hook.h new file mode 100644 index 00000000000..a1312e1ec8d --- /dev/null +++ b/ace/Thread_Hook.h @@ -0,0 +1,54 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// ace +// +// = FILENAME +// Thread_Hook.h +// +// = AUTHOR +// Carlos O'Ryan <coryan@uci.edu> +// +// ============================================================================ + +#ifndef ACE_THREAD_HOOK_H +#define ACE_THREAD_HOOK_H +#include "ace/pre.h" + +#include "ace/config-all.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "ace/OS.h" + +class ACE_Export ACE_Thread_Hook +{ + // = TITLE + // This class makes it possible to provide user-defined "start" + // hooks that are called before the thread entry point function + // is invoked. + +public: + virtual void *start (ACE_THR_FUNC func, + void *arg); + // This method can be overridden in a subclass to customize this + // pre-function call "hook" invocation that can perform + // initialization processing before the thread entry point <func> + // method is called back. The <func> and <arg> passed into the + // start hook are the same as those passed by the application that + // spawned the thread. + + static ACE_Thread_Hook *thread_hook (ACE_Thread_Hook *hook); + // sets the system wide thread hook, returns the previous thread + // hook or 0 if none is set. + + static ACE_Thread_Hook *thread_hook (void); + // Returns the current system thread hook. +}; + +#include "ace/post.h" +#endif /* ACE_THREAD_HOOK_H */ diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp index dacae3cb8db..a212b247237 100644 --- a/ace/Thread_Manager.cpp +++ b/ace/Thread_Manager.cpp @@ -6,6 +6,7 @@ #include "ace/Object_Manager.h" #include "ace/Singleton.h" #include "ace/Auto_Ptr.h" +#include "ace/Thread_Exit.h" #if !defined (__ACE_INLINE__) #include "ace/Thread_Manager.i" @@ -408,99 +409,6 @@ ACE_Thread_Manager::~ACE_Thread_Manager (void) this->close (); } -#if defined (ACE_HAS_SIG_C_FUNC) -extern "C" void -ACE_Thread_Exit_cleanup (void *instance, void *) -{ - ACE_TRACE ("ACE_Thread_Exit_cleanup"); - - delete (ACE_TSS_TYPE (ACE_Thread_Exit) *) instance; -} -#else -void -ACE_Thread_Exit::cleanup (void *instance, void *) -{ - ACE_TRACE ("ACE_Thread_Exit::cleanup"); - - delete (ACE_TSS_TYPE (ACE_Thread_Exit) *) instance; -} -#endif /* ACE_HAS_SIG_C_FUNC */ - -// NOTE: this preprocessor directive should match the one in -// ACE_Task_Base::svc_run () below. This prevents the two statics -// from being defined. - -ACE_Thread_Exit * -ACE_Thread_Exit::instance (void) -{ -#if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION) - ACE_TRACE ("ACE_Thread_Exit::instance"); - - // Determines if we were dynamically allocated. - static ACE_TSS_TYPE (ACE_Thread_Exit) *instance_; - - // Implement the Double Check pattern. - - if (ACE_Thread_Exit::is_constructed_ == 0) - { - ACE_MT (ACE_Thread_Mutex *lock = - ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object - (ACE_Object_Manager::ACE_THREAD_EXIT_LOCK); - ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, 0)); - - if (ACE_Thread_Exit::is_constructed_ == 0) - { - ACE_NEW_RETURN (instance_, - ACE_TSS_TYPE (ACE_Thread_Exit), - 0); - - ACE_Thread_Exit::is_constructed_ = 1; - - // Register for destruction with ACE_Object_Manager. -#if defined ACE_HAS_SIG_C_FUNC - ACE_Object_Manager::at_exit (instance_, - ACE_Thread_Exit_cleanup, - 0); -#else - ACE_Object_Manager::at_exit (instance_, - ACE_Thread_Exit::cleanup, - 0); -#endif /* ACE_HAS_SIG_C_FUNC */ - } - } - - return ACE_TSS_GET (instance_, ACE_Thread_Exit); -#else - return 0; -#endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */ -} - -// Grab hold of the Task * so that we can close() it in the -// destructor. - -ACE_Thread_Exit::ACE_Thread_Exit (void) -{ - ACE_TRACE ("ACE_Thread_Exit::ACE_Thread_Exit"); -} - -// Set the this pointer... - -void -ACE_Thread_Exit::thr_mgr (ACE_Thread_Manager *tm) -{ - ACE_TRACE ("ACE_Thread_Exit::thr_mgr"); - - if (tm != 0) - this->thread_control_.insert (tm, 0); -} - -// When this object is destroyed the Task is automatically closed -// down! - -ACE_Thread_Exit::~ACE_Thread_Exit (void) -{ - ACE_TRACE ("ACE_Thread_Exit::~ACE_Thread_Exit"); -} // Run the entry point for thread spawned under the control of the // <ACE_Thread_Manager>. This must be an extern "C" to make certain @@ -2298,77 +2206,6 @@ ACE_Thread_Manager::get_grp (ACE_Task_Base *task, int &grp_id) return 0; } -void -ACE_Thread_Control::dump (void) const -{ - ACE_TRACE ("ACE_Thread_Control::dump"); -} - -int -ACE_Thread_Control::insert (ACE_Thread_Manager *tm, int insert) -{ - ACE_TRACE ("ACE_Thread_Control::insert"); - - ACE_hthread_t t_id; - ACE_Thread::self (t_id); - this->tm_ = tm; - - if (insert) - return this->tm_->insert_thr (ACE_Thread::self (), t_id); - else - return 0; -} - -// Initialize the thread controller. - -ACE_Thread_Control::ACE_Thread_Control (ACE_Thread_Manager *t, - int insert) - : tm_ (t), - status_ (0) -{ - ACE_TRACE ("ACE_Thread_Control::ACE_Thread_Control"); - - if (this->tm_ != 0 && insert) - { - ACE_hthread_t t_id; - ACE_Thread::self (t_id); - this->tm_->insert_thr (ACE_Thread::self (), t_id); - } -} - -// Automatically kill thread on exit. - -ACE_Thread_Control::~ACE_Thread_Control (void) -{ - ACE_TRACE ("ACE_Thread_Control::~ACE_Thread_Control"); - -#if defined (ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS) || defined (ACE_HAS_TSS_EMULATION) || defined (ACE_WIN32) - this->exit (this->status_, 0); -#else - this->exit (this->status_, 1); -#endif /* ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS */ -} - -// Exit from thread (but clean up first). - -void * -ACE_Thread_Control::exit (void *exit_status, int do_thr_exit) -{ - ACE_TRACE ("ACE_Thread_Control::exit"); - - if (this->tm_ != 0) - return this->tm_->exit (exit_status, do_thr_exit); - else - { -#if !defined (ACE_HAS_TSS_EMULATION) - // With ACE_HAS_TSS_EMULATION, we let ACE_Thread_Adapter::invoke () - // exit the thread after cleaning up TSS. - ACE_Thread::exit (exit_status); -#endif /* ! ACE_HAS_TSS_EMULATION */ - return 0; - } -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) # if defined (ACE_THREAD_MANAGER_LACKS_STATICS) template class ACE_Singleton<ACE_Thread_Manager, ACE_SYNCH_MUTEX>; diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h index 1ff256197f4..d725f41bac7 100644 --- a/ace/Thread_Manager.h +++ b/ace/Thread_Manager.h @@ -19,6 +19,7 @@ #include "ace/pre.h" #include "ace/Thread.h" +#include "ace/Thread_Adapter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Thread_Manager.i b/ace/Thread_Manager.i index c1017f816bc..604f99aba40 100644 --- a/ace/Thread_Manager.i +++ b/ace/Thread_Manager.i @@ -220,45 +220,6 @@ ACE_Thread_Descriptor::reset (ACE_Thread_Manager *tm) #endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */ } -// Set the exit status. - -ACE_INLINE void * -ACE_Thread_Control::status (void *s) -{ - ACE_TRACE ("ACE_Thread_Control::status"); - return this->status_ = s; -} - -// Get the exit status. - -ACE_INLINE void * -ACE_Thread_Control::status (void) -{ - ACE_TRACE ("ACE_Thread_Control::status"); - return this->status_; -} - -// Returns the current <Thread_Manager>. - -ACE_INLINE ACE_Thread_Manager * -ACE_Thread_Control::thr_mgr (void) -{ - ACE_TRACE ("ACE_Thread_Control::thr_mgr"); - return this->tm_; -} - -// Atomically set a new <Thread_Manager> and return the old -// <Thread_Manager>. - -ACE_INLINE ACE_Thread_Manager * -ACE_Thread_Control::thr_mgr (ACE_Thread_Manager *tm) -{ - ACE_TRACE ("ACE_Thread_Control::thr_mgr"); - ACE_Thread_Manager *o_tm = this->tm_; - this->tm_ = tm; - return o_tm; -} - ACE_INLINE ACE_Thread_Descriptor * ACE_Thread_Manager::thread_desc_self (void) { diff --git a/ace/ace.icc b/ace/ace.icc index cbcc4f325b8..8fd443ac052 100755 --- a/ace/ace.icc +++ b/ace/ace.icc @@ -80,6 +80,10 @@ option source type (cpp) "OS_Memory.cpp" source type (cpp) "OS_String.cpp" source type (cpp) "OS_TLI.cpp" + source type (cpp) "Thread_Hook.cpp" + source type (cpp) "Thread_Adapter.cpp" + source type (cpp) "Thread_Exit.cpp" + source type (cpp) "Thread_Control.cpp" source type (cpp) "Parse_Node.cpp" source type (cpp) "Pipe.cpp" source type (cpp) "Proactor.cpp" diff --git a/apps/Gateway/Gateway/Makefile b/apps/Gateway/Gateway/Makefile index 9a1bd1895b1..6c7429a36c1 100644 --- a/apps/Gateway/Gateway/Makefile +++ b/apps/Gateway/Gateway/Makefile @@ -64,9 +64,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -156,6 +156,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -230,9 +232,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -247,8 +249,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i File_Parser.cpp Event.h \ - Options.h $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/OS.i File_Parser.cpp \ + Event.h Options.h \ + $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -273,9 +276,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -301,9 +304,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -396,6 +399,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -473,9 +478,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -565,6 +570,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -640,9 +647,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -729,8 +736,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h Event.h \ - Consumer_Dispatch_Set.h + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + Event.h Consumer_Dispatch_Set.h .obj/Options.o .obj/Options.so .shobj/Options.o .shobj/Options.so: Options.cpp \ $(ACE_ROOT)/ace/Get_Opt.h \ @@ -738,9 +745,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -757,8 +764,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Get_Opt.i Event.h Options.h \ - $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Get_Opt.i Event.h \ + Options.h $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ @@ -787,9 +794,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -879,6 +886,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -959,9 +968,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1051,6 +1060,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -1130,9 +1141,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1222,6 +1233,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ diff --git a/apps/Gateway/Peer/Makefile b/apps/Gateway/Peer/Makefile index 14481e68132..829ff9d06fd 100644 --- a/apps/Gateway/Peer/Makefile +++ b/apps/Gateway/Peer/Makefile @@ -54,9 +54,9 @@ INCLDIRS += -I../Gateway $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -77,8 +77,8 @@ INCLDIRS += -I../Gateway $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i Options.h \ - ../Gateway/Event.h + $(ACE_ROOT)/ace/Log_Record.i \ + Options.h ../Gateway/Event.h .obj/Peer.o .obj/Peer.so .shobj/Peer.o .shobj/Peer.so: Peer.cpp Peer.h \ $(ACE_ROOT)/ace/Service_Config.h \ @@ -88,9 +88,9 @@ INCLDIRS += -I../Gateway $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -178,6 +178,8 @@ INCLDIRS += -I../Gateway $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -245,7 +247,7 @@ INCLDIRS += -I../Gateway $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i Options.h \ - ../Gateway/Event.h + $(ACE_ROOT)/ace/SOCK_Connector.i \ + Options.h ../Gateway/Event.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/apps/JAWS/clients/Blobby/Makefile b/apps/JAWS/clients/Blobby/Makefile index f462bbe54fa..396c7c7d558 100644 --- a/apps/JAWS/clients/Blobby/Makefile +++ b/apps/JAWS/clients/Blobby/Makefile @@ -41,12 +41,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/Blob.o .obj/Blob.so .shobj/Blob.o .shobj/Blob.so: Blob.cpp Blob.h $(ACE_ROOT)/ace/OS.h \ +.obj/Blob.o .obj/Blob.so .shobj/Blob.o .shobj/Blob.so: Blob.cpp Blob.h \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -141,6 +142,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -208,9 +211,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -254,6 +257,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -365,9 +370,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -464,6 +469,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ diff --git a/apps/JAWS/clients/Caching/Makefile b/apps/JAWS/clients/Caching/Makefile index 6e38cb745b5..d79b97f7dca 100644 --- a/apps/JAWS/clients/Caching/Makefile +++ b/apps/JAWS/clients/Caching/Makefile @@ -54,9 +54,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -149,7 +149,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - http_handler.h $(ACE_ROOT)/ace/Connector.h \ + http_handler.h \ + $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -158,6 +159,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ diff --git a/apps/JAWS/server/Makefile b/apps/JAWS/server/Makefile index 761f24be391..d139050441d 100644 --- a/apps/JAWS/server/Makefile +++ b/apps/JAWS/server/Makefile @@ -74,9 +74,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -132,12 +132,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Proactor.h IO.h \ - $(ACE_ROOT)/ace/Asynch_IO.h HTTP_Server.h \ + $(ACE_ROOT)/ace/Asynch_IO.h \ + HTTP_Server.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -233,16 +236,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Acceptor.cpp HTTP_Handler.h \ - HTTP_Request.h Parse_Headers.h HTTP_Response.h + $(ACE_ROOT)/ace/Acceptor.cpp \ + HTTP_Handler.h HTTP_Request.h Parse_Headers.h HTTP_Response.h .obj/HTTP_Config.o .obj/HTTP_Config.so .shobj/HTTP_Config.o .shobj/HTTP_Config.so: HTTP_Config.cpp \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -265,9 +268,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -366,7 +369,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - HTTP_Handler.h $(ACE_ROOT)/ace/Asynch_IO.h \ + HTTP_Handler.h \ + $(ACE_ROOT)/ace/Asynch_IO.h \ HTTP_Request.h Parse_Headers.h HTTP_Response.h IO.h HTTP_Helpers.h .obj/HTTP_Helpers.o .obj/HTTP_Helpers.so .shobj/HTTP_Helpers.o .shobj/HTTP_Helpers.so: HTTP_Helpers.cpp HTTP_Helpers.h \ @@ -375,9 +379,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -418,9 +422,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -523,6 +527,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -561,9 +567,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -603,6 +609,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -691,8 +699,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp IO.h \ - $(ACE_ROOT)/ace/Asynch_IO.h + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + IO.h $(ACE_ROOT)/ace/Asynch_IO.h .obj/HTTP_Request.o .obj/HTTP_Request.so .shobj/HTTP_Request.o .shobj/HTTP_Request.so: HTTP_Request.cpp \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -700,9 +708,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -780,9 +788,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -809,8 +817,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i HTTP_Response.h \ - HTTP_Request.h Parse_Headers.h HTTP_Helpers.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + HTTP_Response.h HTTP_Request.h Parse_Headers.h HTTP_Helpers.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -824,8 +832,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp HTTP_Config.h \ - IO.h $(ACE_ROOT)/ace/Asynch_IO.h + $(ACE_ROOT)/ace/Synch_T.cpp \ + HTTP_Config.h IO.h \ + $(ACE_ROOT)/ace/Asynch_IO.h .obj/Parse_Headers.o .obj/Parse_Headers.so .shobj/Parse_Headers.o .shobj/Parse_Headers.so: Parse_Headers.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -833,9 +842,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -852,16 +861,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i Parse_Headers.h + $(ACE_ROOT)/ace/Log_Record.i \ + Parse_Headers.h -.obj/IO.o .obj/IO.so .shobj/IO.o .shobj/IO.so: IO.cpp $(ACE_ROOT)/ace/Message_Block.h \ +.obj/IO.o .obj/IO.so .shobj/IO.o .shobj/IO.so: IO.cpp \ + $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -972,8 +983,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h IO.h \ - $(ACE_ROOT)/ace/Asynch_IO.h HTTP_Helpers.h + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + IO.h $(ACE_ROOT)/ace/Asynch_IO.h \ + HTTP_Helpers.h .obj/main.o .obj/main.so .shobj/main.o .shobj/main.so: main.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ @@ -983,9 +995,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1079,6 +1091,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ HTTP_Server.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ @@ -1138,7 +1152,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp \ - $(ACE_ROOT)/ace/Asynch_IO.h HTTP_Handler.h \ - HTTP_Request.h Parse_Headers.h HTTP_Response.h IO.h + $(ACE_ROOT)/ace/Asynch_IO.h \ + HTTP_Handler.h HTTP_Request.h Parse_Headers.h HTTP_Response.h IO.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/apps/drwho/Makefile b/apps/drwho/Makefile index 274d80abe73..96cad0fecb6 100644 --- a/apps/drwho/Makefile +++ b/apps/drwho/Makefile @@ -95,14 +95,15 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/Log_Msg.h \ +.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -119,19 +120,19 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i Options.h \ - global.h SML_Client.h SM_Client.h PM_Client.h Protocol_Manager.h \ - Search_Struct.h Protocol_Record.h Drwho_Node.h CM_Client.h \ - Comm_Manager.h Select_Manager.h SML_Server.h SM_Server.h PM_Server.h \ - CM_Server.h SMR_Client.h + $(ACE_ROOT)/ace/Log_Record.i \ + Options.h global.h SML_Client.h SM_Client.h PM_Client.h \ + Protocol_Manager.h Search_Struct.h Protocol_Record.h Drwho_Node.h \ + CM_Client.h Comm_Manager.h Select_Manager.h SML_Server.h SM_Server.h \ + PM_Server.h CM_Server.h SMR_Client.h .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Options.h global.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -146,9 +147,10 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i SMR_Server.h SM_Server.h \ - PM_Server.h Protocol_Manager.h Search_Struct.h Protocol_Record.h \ - Drwho_Node.h CM_Server.h Comm_Manager.h Select_Manager.h \ + $(ACE_ROOT)/ace/OS.i SMR_Server.h \ + SM_Server.h PM_Server.h Protocol_Manager.h Search_Struct.h \ + Protocol_Record.h Drwho_Node.h CM_Server.h Comm_Manager.h \ + Select_Manager.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -162,9 +164,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -181,17 +183,17 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i Options.h \ - global.h Protocol_Manager.h Search_Struct.h Protocol_Record.h \ - Drwho_Node.h + $(ACE_ROOT)/ace/Log_Record.i \ + Options.h global.h Protocol_Manager.h Search_Struct.h \ + Protocol_Record.h Drwho_Node.h .obj/Drwho_Node.o .obj/Drwho_Node.so .shobj/Drwho_Node.o .shobj/Drwho_Node.so: Drwho_Node.cpp Drwho_Node.h global.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -212,9 +214,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -230,7 +232,8 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i Options.h \ - Rwho_DB_Manager.h $(ACE_ROOT)/ace/Dirent.h \ + Rwho_DB_Manager.h \ + $(ACE_ROOT)/ace/Dirent.h \ $(ACE_ROOT)/ace/Dirent.i \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ @@ -242,9 +245,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB global.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -273,9 +276,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -290,8 +293,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i Protocol_Record.h \ - Drwho_Node.h $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/OS.i \ + Protocol_Record.h Drwho_Node.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i @@ -300,9 +304,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -317,7 +321,8 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i Multicast_Manager.h \ + $(ACE_ROOT)/ace/OS.i \ + Multicast_Manager.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ @@ -331,9 +336,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -384,9 +389,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -412,9 +417,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -440,9 +445,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -468,9 +473,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -495,12 +500,13 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Log_Record.i .obj/SML_Server.o .obj/SML_Server.so .shobj/SML_Server.o .shobj/SML_Server.so: SML_Server.cpp SML_Server.h SM_Server.h PM_Server.h \ - Protocol_Manager.h $(ACE_ROOT)/ace/OS.h \ + Protocol_Manager.h \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -515,17 +521,17 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i Options.h global.h \ - Search_Struct.h Protocol_Record.h Drwho_Node.h CM_Server.h \ + $(ACE_ROOT)/ace/OS.i Options.h \ + global.h Search_Struct.h Protocol_Record.h Drwho_Node.h CM_Server.h \ Comm_Manager.h Select_Manager.h .obj/SM_Server.o .obj/SM_Server.so .shobj/SM_Server.o .shobj/SM_Server.so: SM_Server.cpp Options.h global.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -540,9 +546,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i PMS_All.h PM_Server.h \ - Protocol_Manager.h Search_Struct.h Protocol_Record.h Drwho_Node.h \ - PMS_Flo.h PMS_Usr.h PMS_Ruser.h SM_Server.h CM_Server.h \ + $(ACE_ROOT)/ace/OS.i PMS_All.h \ + PM_Server.h Protocol_Manager.h Search_Struct.h Protocol_Record.h \ + Drwho_Node.h PMS_Flo.h PMS_Usr.h PMS_Ruser.h SM_Server.h CM_Server.h \ Comm_Manager.h Select_Manager.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ @@ -553,9 +559,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -584,9 +590,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -609,9 +615,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -640,9 +646,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -657,7 +663,8 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i Rwho_DB_Manager.h \ + $(ACE_ROOT)/ace/OS.i \ + Rwho_DB_Manager.h \ $(ACE_ROOT)/ace/Dirent.h \ $(ACE_ROOT)/ace/Dirent.i \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -665,7 +672,8 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ Protocol_Record.h Drwho_Node.h PM_Server.h Protocol_Manager.h \ - Search_Struct.h $(ACE_ROOT)/ace/ACE.h \ + Search_Struct.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i .obj/HT_Server.o .obj/HT_Server.so .shobj/HT_Server.o .shobj/HT_Server.so: HT_Server.cpp HT_Server.h Hash_Table.h Search_Struct.h \ @@ -673,9 +681,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -699,9 +707,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -722,9 +730,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -739,9 +747,10 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i HT_Server.h Hash_Table.h \ - Search_Struct.h Protocol_Record.h Drwho_Node.h PMS_All.h PM_Server.h \ - Protocol_Manager.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.i HT_Server.h \ + Hash_Table.h Search_Struct.h Protocol_Record.h Drwho_Node.h PMS_All.h \ + PM_Server.h Protocol_Manager.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ @@ -752,9 +761,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -769,9 +778,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i HT_Server.h Hash_Table.h \ - Search_Struct.h Protocol_Record.h Drwho_Node.h PMS_Ruser.h \ - PM_Server.h Protocol_Manager.h \ + $(ACE_ROOT)/ace/OS.i HT_Server.h \ + Hash_Table.h Search_Struct.h Protocol_Record.h Drwho_Node.h \ + PMS_Ruser.h PM_Server.h Protocol_Manager.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -783,9 +792,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -800,9 +809,10 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i SMR_Server.h SM_Server.h \ - PM_Server.h Protocol_Manager.h Search_Struct.h Protocol_Record.h \ - Drwho_Node.h CM_Server.h Comm_Manager.h Select_Manager.h \ + $(ACE_ROOT)/ace/OS.i SMR_Server.h \ + SM_Server.h PM_Server.h Protocol_Manager.h Search_Struct.h \ + Protocol_Record.h Drwho_Node.h CM_Server.h Comm_Manager.h \ + Select_Manager.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ @@ -812,9 +822,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -829,8 +839,8 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i Multicast_Manager.h \ - CM_Client.h Comm_Manager.h \ + $(ACE_ROOT)/ace/OS.i \ + Multicast_Manager.h CM_Client.h Comm_Manager.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ @@ -840,9 +850,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -857,9 +867,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i PMC_All.h PM_Client.h \ - Protocol_Manager.h Search_Struct.h Protocol_Record.h Drwho_Node.h \ - PMC_Flo.h PMC_Usr.h PMC_Ruser.h SM_Client.h CM_Client.h \ + $(ACE_ROOT)/ace/OS.i PMC_All.h \ + PM_Client.h Protocol_Manager.h Search_Struct.h Protocol_Record.h \ + Drwho_Node.h PMC_Flo.h PMC_Usr.h PMC_Ruser.h SM_Client.h CM_Client.h \ Comm_Manager.h Select_Manager.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ @@ -870,9 +880,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -887,10 +897,10 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i PMC_All.h PM_Client.h \ - Protocol_Manager.h Search_Struct.h Protocol_Record.h Drwho_Node.h \ - PMC_Flo.h PMC_Usr.h PMC_Ruser.h SMR_Client.h SM_Client.h CM_Client.h \ - Comm_Manager.h Select_Manager.h \ + $(ACE_ROOT)/ace/OS.i PMC_All.h \ + PM_Client.h Protocol_Manager.h Search_Struct.h Protocol_Record.h \ + Drwho_Node.h PMC_Flo.h PMC_Usr.h PMC_Ruser.h SMR_Client.h SM_Client.h \ + CM_Client.h Comm_Manager.h Select_Manager.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ @@ -900,9 +910,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -931,9 +941,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -956,9 +966,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1003,16 +1013,17 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i BS_Client.h \ - Binary_Search.h Search_Struct.h Protocol_Record.h Drwho_Node.h + $(ACE_ROOT)/ace/Mem_Map.i \ + BS_Client.h Binary_Search.h Search_Struct.h Protocol_Record.h \ + Drwho_Node.h .obj/PMC_All.o .obj/PMC_All.so .shobj/PMC_All.o .shobj/PMC_All.so: PMC_All.cpp global.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1027,9 +1038,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i Options.h HT_Client.h \ - Hash_Table.h Search_Struct.h Protocol_Record.h Drwho_Node.h PMC_All.h \ - PM_Client.h Protocol_Manager.h \ + $(ACE_ROOT)/ace/OS.i Options.h \ + HT_Client.h Hash_Table.h Search_Struct.h Protocol_Record.h \ + Drwho_Node.h PMC_All.h PM_Client.h Protocol_Manager.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1041,9 +1052,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1072,9 +1083,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1103,9 +1114,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1127,9 +1138,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1144,9 +1155,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i Options.h HT_Client.h \ - Hash_Table.h Search_Struct.h Protocol_Record.h Drwho_Node.h \ - PMC_Ruser.h PM_Client.h Protocol_Manager.h \ + $(ACE_ROOT)/ace/OS.i Options.h \ + HT_Client.h Hash_Table.h Search_Struct.h Protocol_Record.h \ + Drwho_Node.h PMC_Ruser.h PM_Client.h Protocol_Manager.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -1158,9 +1169,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1175,10 +1186,10 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i PMC_All.h PM_Client.h \ - Protocol_Manager.h Search_Struct.h Protocol_Record.h Drwho_Node.h \ - PMC_Flo.h PMC_Usr.h PMC_Ruser.h SMR_Client.h SM_Client.h CM_Client.h \ - Comm_Manager.h Select_Manager.h \ + $(ACE_ROOT)/ace/OS.i PMC_All.h \ + PM_Client.h Protocol_Manager.h Search_Struct.h Protocol_Record.h \ + Drwho_Node.h PMC_Flo.h PMC_Usr.h PMC_Ruser.h SMR_Client.h SM_Client.h \ + CM_Client.h Comm_Manager.h Select_Manager.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ @@ -1188,9 +1199,9 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1205,18 +1216,18 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i SML_Client.h SM_Client.h \ - PM_Client.h Protocol_Manager.h Search_Struct.h Protocol_Record.h \ - Drwho_Node.h CM_Client.h Comm_Manager.h Select_Manager.h SML_Server.h \ - SM_Server.h PM_Server.h CM_Server.h + $(ACE_ROOT)/ace/OS.i SML_Client.h \ + SM_Client.h PM_Client.h Protocol_Manager.h Search_Struct.h \ + Protocol_Record.h Drwho_Node.h CM_Client.h Comm_Manager.h \ + Select_Manager.h SML_Server.h SM_Server.h PM_Server.h CM_Server.h .obj/CM_Server.o .obj/CM_Server.so .shobj/CM_Server.o .shobj/CM_Server.so: CM_Server.cpp global.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1231,22 +1242,24 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i Options.h CM_Server.h \ - Comm_Manager.h $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.i Options.h \ + CM_Server.h Comm_Manager.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i -.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/Log_Msg.h \ +.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1263,19 +1276,19 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i Options.h \ - global.h SML_Client.h SM_Client.h PM_Client.h Protocol_Manager.h \ - Search_Struct.h Protocol_Record.h Drwho_Node.h CM_Client.h \ - Comm_Manager.h Select_Manager.h SML_Server.h SM_Server.h PM_Server.h \ - CM_Server.h SMR_Client.h + $(ACE_ROOT)/ace/Log_Record.i \ + Options.h global.h SML_Client.h SM_Client.h PM_Client.h \ + Protocol_Manager.h Search_Struct.h Protocol_Record.h Drwho_Node.h \ + CM_Client.h Comm_Manager.h Select_Manager.h SML_Server.h SM_Server.h \ + PM_Server.h CM_Server.h SMR_Client.h .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Options.h global.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1290,9 +1303,10 @@ drwho-server: $(addprefix $(VDIR),$(SERVER-OBJ)) $(addprefix $(VDIR),$(SHARED-OB $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i SMR_Server.h SM_Server.h \ - PM_Server.h Protocol_Manager.h Search_Struct.h Protocol_Record.h \ - Drwho_Node.h CM_Server.h Comm_Manager.h Select_Manager.h \ + $(ACE_ROOT)/ace/OS.i SMR_Server.h \ + SM_Server.h PM_Server.h Protocol_Manager.h Search_Struct.h \ + Protocol_Record.h Drwho_Node.h CM_Server.h Comm_Manager.h \ + Select_Manager.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Msg.h \ diff --git a/apps/gperf/src/Makefile b/apps/gperf/src/Makefile index fa9779b6378..68e53757b11 100644 --- a/apps/gperf/src/Makefile +++ b/apps/gperf/src/Makefile @@ -50,9 +50,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -79,9 +79,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -108,9 +108,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -127,8 +127,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i Key_List.h \ - List_Node.h Vectors.h Bool_Array.h + $(ACE_ROOT)/ace/Log_Record.i \ + Key_List.h List_Node.h Vectors.h Bool_Array.h .obj/Key_List.o .obj/Key_List.so .shobj/Key_List.o .shobj/Key_List.so: Key_List.cpp Key_List.h Options.h \ $(ACE_ROOT)/ace/Log_Msg.h \ @@ -136,9 +136,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -155,8 +155,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i List_Node.h \ - Vectors.h $(ACE_ROOT)/ace/Read_Buffer.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + List_Node.h Vectors.h \ + $(ACE_ROOT)/ace/Read_Buffer.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Malloc.h \ @@ -205,15 +206,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Read_Buffer.i Hash_Table.h + $(ACE_ROOT)/ace/Read_Buffer.i \ + Hash_Table.h .obj/List_Node.o .obj/List_Node.so .shobj/List_Node.o .shobj/List_Node.so: List_Node.cpp List_Node.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -232,15 +234,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i Vectors.h + $(ACE_ROOT)/ace/Log_Record.i \ + Vectors.h .obj/Hash_Table.o .obj/Hash_Table.so .shobj/Hash_Table.o .shobj/Hash_Table.so: Hash_Table.cpp Hash_Table.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -259,17 +262,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i List_Node.h \ - $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + List_Node.h $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i .obj/Bool_Array.o .obj/Bool_Array.so .shobj/Bool_Array.o .shobj/Bool_Array.so: Bool_Array.cpp Bool_Array.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -294,9 +297,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -313,13 +316,14 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i -.obj/Version.o .obj/Version.so .shobj/Version.o .shobj/Version.so: Version.cpp $(ACE_ROOT)/ace/ACE.h \ +.obj/Version.o .obj/Version.so .shobj/Version.o .shobj/Version.so: Version.cpp \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/apps/gperf/tests/Makefile b/apps/gperf/tests/Makefile index 847d03e2b77..02053013d48 100644 --- a/apps/gperf/tests/Makefile +++ b/apps/gperf/tests/Makefile @@ -222,13 +222,12 @@ realclean: # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/test.o .obj/test.so .shobj/test.o .shobj/test.so: test.cpp \ - $(ACE_ROOT)/ace/OS.h \ +.obj/test.o .obj/test.so .shobj/test.o .shobj/test.so: test.cpp $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -243,10 +242,6 @@ realclean: $(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/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i + $(ACE_ROOT)/ace/OS.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/ASX/CCM_App/Makefile b/examples/ASX/CCM_App/Makefile index 324609233c8..c595aa10815 100644 --- a/examples/ASX/CCM_App/Makefile +++ b/examples/ASX/CCM_App/Makefile @@ -53,9 +53,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -158,6 +158,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ diff --git a/examples/ASX/Event_Server/Event_Server/Makefile b/examples/ASX/Event_Server/Event_Server/Makefile index ff365857d7b..1c4217e55ab 100644 --- a/examples/ASX/Event_Server/Event_Server/Makefile +++ b/examples/ASX/Event_Server/Event_Server/Makefile @@ -50,9 +50,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -87,12 +87,14 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i Options.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + Options.h \ $(ACE_ROOT)/ace/Profile_Timer.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ - $(ACE_ROOT)/ace/Profile_Timer.i Options.i + $(ACE_ROOT)/ace/Profile_Timer.i \ + Options.i .obj/Supplier_Router.o .obj/Supplier_Router.so .shobj/Supplier_Router.o .shobj/Supplier_Router.so: Supplier_Router.cpp Supplier_Router.h \ $(ACE_ROOT)/ace/INET_Addr.h \ @@ -100,9 +102,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -210,6 +212,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -253,21 +257,24 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i Peer_Router.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + Peer_Router.h \ $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.cpp Options.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + Options.h \ $(ACE_ROOT)/ace/Profile_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ - $(ACE_ROOT)/ace/Profile_Timer.i Options.i + $(ACE_ROOT)/ace/Profile_Timer.i \ + Options.i .obj/Event_Analyzer.o .obj/Event_Analyzer.so .shobj/Event_Analyzer.o .shobj/Event_Analyzer.so: Event_Analyzer.cpp Options.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -289,8 +296,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ - $(ACE_ROOT)/ace/Profile_Timer.i Options.i \ - Event_Analyzer.h $(ACE_ROOT)/ace/Stream.h \ + $(ACE_ROOT)/ace/Profile_Timer.i \ + Options.i Event_Analyzer.h \ + $(ACE_ROOT)/ace/Stream.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Malloc.h \ @@ -376,6 +384,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -416,9 +426,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -535,6 +545,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -578,16 +590,19 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i Peer_Router.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + Peer_Router.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp Options.h \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + Options.h \ $(ACE_ROOT)/ace/Profile_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ - $(ACE_ROOT)/ace/Profile_Timer.i Options.i + $(ACE_ROOT)/ace/Profile_Timer.i \ + Options.i .obj/Peer_Router.o .obj/Peer_Router.so .shobj/Peer_Router.o .shobj/Peer_Router.so: Peer_Router.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ @@ -597,9 +612,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -687,13 +702,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ - $(ACE_ROOT)/ace/Profile_Timer.i Options.i \ - Peer_Router.h $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Profile_Timer.i \ + Options.i Peer_Router.h \ + $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ diff --git a/examples/ASX/Event_Server/Transceiver/Makefile b/examples/ASX/Event_Server/Transceiver/Makefile index 55a7ac6547b..602e01557f6 100644 --- a/examples/ASX/Event_Server/Transceiver/Makefile +++ b/examples/ASX/Event_Server/Transceiver/Makefile @@ -49,9 +49,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -142,6 +142,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -204,6 +206,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Connector.i \ $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i transceiver.h + $(ACE_ROOT)/ace/Get_Opt.i \ + transceiver.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/ASX/Message_Queue/Makefile b/examples/ASX/Message_Queue/Makefile index 461aece43a0..ddf8e9f154f 100644 --- a/examples/ASX/Message_Queue/Makefile +++ b/examples/ASX/Message_Queue/Makefile @@ -44,9 +44,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -149,6 +149,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -187,9 +189,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -287,6 +289,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -315,9 +319,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -415,6 +419,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ diff --git a/examples/ASX/UPIPE_Event_Server/Makefile b/examples/ASX/UPIPE_Event_Server/Makefile index bc4227b9fad..dc90379da3e 100644 --- a/examples/ASX/UPIPE_Event_Server/Makefile +++ b/examples/ASX/UPIPE_Event_Server/Makefile @@ -50,9 +50,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -87,20 +87,22 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i Options.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + Options.h \ $(ACE_ROOT)/ace/Profile_Timer.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ - $(ACE_ROOT)/ace/Profile_Timer.i Options.i + $(ACE_ROOT)/ace/Profile_Timer.i \ + Options.i .obj/Supplier_Router.o .obj/Supplier_Router.so .shobj/Supplier_Router.o .shobj/Supplier_Router.so: Supplier_Router.cpp Options.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -122,8 +124,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ - $(ACE_ROOT)/ace/Profile_Timer.i Options.i \ - Supplier_Router.h \ + $(ACE_ROOT)/ace/Profile_Timer.i \ + Options.i Supplier_Router.h \ $(ACE_ROOT)/ace/UPIPE_Addr.h \ $(ACE_ROOT)/ace/SPIPE_Addr.h \ $(ACE_ROOT)/ace/Addr.h \ @@ -217,6 +219,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -262,9 +266,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i Peer_Router.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + Peer_Router.h \ $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.cpp Peer_Router.cpp \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + Peer_Router.cpp \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i @@ -274,9 +280,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -379,6 +385,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -417,9 +425,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -437,6 +445,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -570,18 +580,21 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i Peer_Router.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + Peer_Router.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.cpp \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ - Peer_Router.cpp $(ACE_ROOT)/ace/Get_Opt.h \ + Peer_Router.cpp \ + $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i Options.h \ $(ACE_ROOT)/ace/Profile_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ - $(ACE_ROOT)/ace/Profile_Timer.i Options.i + $(ACE_ROOT)/ace/Profile_Timer.i \ + Options.i .obj/Peer_Router.o .obj/Peer_Router.so .shobj/Peer_Router.o .shobj/Peer_Router.so: Peer_Router.cpp \ $(ACE_ROOT)/ace/Get_Opt.h \ @@ -589,9 +602,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -677,12 +690,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - Peer_Router.h $(ACE_ROOT)/ace/Acceptor.h \ + Peer_Router.h \ + $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -755,6 +771,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Profile_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ - $(ACE_ROOT)/ace/Profile_Timer.i Options.i + $(ACE_ROOT)/ace/Profile_Timer.i \ + Options.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/Connection/misc/Makefile b/examples/Connection/misc/Makefile index 600f9dad6fb..816b60846df 100644 --- a/examples/Connection/misc/Makefile +++ b/examples/Connection/misc/Makefile @@ -55,9 +55,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -144,6 +144,8 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -227,9 +229,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -316,6 +318,8 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ diff --git a/examples/Connection/non_blocking/Makefile b/examples/Connection/non_blocking/Makefile index a892d38bc79..49b9d52cf72 100644 --- a/examples/Connection/non_blocking/Makefile +++ b/examples/Connection/non_blocking/Makefile @@ -67,9 +67,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -160,6 +160,8 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -215,9 +217,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -299,12 +301,15 @@ endif $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - CPP-acceptor.h $(ACE_ROOT)/ace/Acceptor.h \ + CPP-acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -349,7 +354,8 @@ endif $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Acceptor.cpp CPP-acceptor.cpp + $(ACE_ROOT)/ace/Acceptor.cpp \ + CPP-acceptor.cpp .obj/test_sock_connector.o .obj/test_sock_connector.so .shobj/test_sock_connector.o .shobj/test_sock_connector.so: test_sock_connector.cpp \ $(ACE_ROOT)/ace/SOCK_Connector.h \ @@ -360,9 +366,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -475,6 +481,8 @@ endif $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -494,7 +502,8 @@ endif $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ - CPP-connector.h $(ACE_ROOT)/ace/Connector.h \ + CPP-connector.h \ + $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -524,9 +533,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -555,7 +564,8 @@ endif $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - CPP-acceptor.h $(ACE_ROOT)/ace/Acceptor.h \ + CPP-acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ @@ -629,6 +639,8 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -673,7 +685,8 @@ endif $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Acceptor.cpp CPP-acceptor.cpp + $(ACE_ROOT)/ace/Acceptor.cpp \ + CPP-acceptor.cpp .obj/test_lsock_connector.o .obj/test_lsock_connector.so .shobj/test_lsock_connector.o .shobj/test_lsock_connector.so: test_lsock_connector.cpp \ $(ACE_ROOT)/ace/LSOCK_Connector.h \ @@ -685,9 +698,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -801,6 +814,8 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -858,9 +873,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -898,7 +913,8 @@ endif $(ACE_ROOT)/ace/LSOCK_Stream.h \ $(ACE_ROOT)/ace/LSOCK.h \ $(ACE_ROOT)/ace/LSOCK.i \ - $(ACE_ROOT)/ace/LSOCK_Stream.i CPP-acceptor.h \ + $(ACE_ROOT)/ace/LSOCK_Stream.i \ + CPP-acceptor.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -969,6 +985,8 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -1013,7 +1031,8 @@ endif $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Acceptor.cpp CPP-acceptor.cpp + $(ACE_ROOT)/ace/Acceptor.cpp \ + CPP-acceptor.cpp .obj/test_tli_connector.o .obj/test_tli_connector.so .shobj/test_tli_connector.o .shobj/test_tli_connector.so: test_tli_connector.cpp \ $(ACE_ROOT)/ace/TLI_Connector.h \ @@ -1024,9 +1043,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1051,7 +1070,8 @@ endif $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i CPP-connector.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + CPP-connector.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ @@ -1125,6 +1145,8 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -1180,9 +1202,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1205,7 +1227,8 @@ endif $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/TLI_Stream.h \ $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i CPP-acceptor.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + CPP-acceptor.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -1280,6 +1303,8 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -1324,7 +1349,8 @@ endif $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Acceptor.cpp CPP-acceptor.cpp + $(ACE_ROOT)/ace/Acceptor.cpp \ + CPP-acceptor.cpp .obj/test_spipe_connector.o .obj/test_spipe_connector.so .shobj/test_spipe_connector.o .shobj/test_spipe_connector.so: test_spipe_connector.cpp \ $(ACE_ROOT)/ace/SPIPE_Connector.h \ @@ -1335,9 +1361,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1440,6 +1466,8 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -1496,9 +1524,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1524,7 +1552,8 @@ endif $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/SPIPE.i \ - $(ACE_ROOT)/ace/SPIPE_Stream.i CPP-acceptor.h \ + $(ACE_ROOT)/ace/SPIPE_Stream.i \ + CPP-acceptor.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -1596,6 +1625,8 @@ endif $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -1640,6 +1671,7 @@ endif $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Acceptor.cpp CPP-acceptor.cpp + $(ACE_ROOT)/ace/Acceptor.cpp \ + CPP-acceptor.cpp # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/IOStream/client/Makefile b/examples/IOStream/client/Makefile index 823df1d7e7d..74d704c4318 100644 --- a/examples/IOStream/client/Makefile +++ b/examples/IOStream/client/Makefile @@ -48,9 +48,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/IOStream/server/Makefile b/examples/IOStream/server/Makefile index a6aa8291fab..f2d0cfec5ed 100644 --- a/examples/IOStream/server/Makefile +++ b/examples/IOStream/server/Makefile @@ -48,9 +48,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -137,6 +137,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -198,7 +200,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - iostream_server.h $(ACE_ROOT)/ace/IOStream.h \ + iostream_server.h \ + $(ACE_ROOT)/ace/IOStream.h \ $(ACE_ROOT)/ace/IOStream_T.h \ $(ACE_ROOT)/ace/IOStream_T.i \ $(ACE_ROOT)/ace/IOStream_T.cpp diff --git a/examples/IPC_SAP/DEV_SAP/reader/Makefile b/examples/IPC_SAP/DEV_SAP/reader/Makefile index eee999d7530..252552c7b8c 100644 --- a/examples/IPC_SAP/DEV_SAP/reader/Makefile +++ b/examples/IPC_SAP/DEV_SAP/reader/Makefile @@ -44,12 +44,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/reader.o .obj/reader.so .shobj/reader.o .shobj/reader.so: reader.cpp $(ACE_ROOT)/ace/OS.h \ +.obj/reader.o .obj/reader.so .shobj/reader.o .shobj/reader.so: reader.cpp \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/IPC_SAP/DEV_SAP/writer/Makefile b/examples/IPC_SAP/DEV_SAP/writer/Makefile index 1c302129d1e..aa927e7bac3 100644 --- a/examples/IPC_SAP/DEV_SAP/writer/Makefile +++ b/examples/IPC_SAP/DEV_SAP/writer/Makefile @@ -53,9 +53,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/IPC_SAP/FIFO_SAP/Makefile b/examples/IPC_SAP/FIFO_SAP/Makefile index 358634bfc95..2910eb1945d 100644 --- a/examples/IPC_SAP/FIFO_SAP/Makefile +++ b/examples/IPC_SAP/FIFO_SAP/Makefile @@ -52,9 +52,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -85,9 +85,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -117,9 +117,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -152,9 +152,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -187,9 +187,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/IPC_SAP/FILE_SAP/Makefile b/examples/IPC_SAP/FILE_SAP/Makefile index fc5f1f8d487..f4d96f71bdd 100644 --- a/examples/IPC_SAP/FILE_SAP/Makefile +++ b/examples/IPC_SAP/FILE_SAP/Makefile @@ -38,12 +38,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \ +.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/IPC_SAP/SOCK_SAP/Makefile b/examples/IPC_SAP/SOCK_SAP/Makefile index d5151dd20c1..ef3db048560 100644 --- a/examples/IPC_SAP/SOCK_SAP/Makefile +++ b/examples/IPC_SAP/SOCK_SAP/Makefile @@ -66,9 +66,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -100,6 +100,8 @@ endif $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -165,9 +167,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -217,9 +219,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -251,6 +253,8 @@ endif $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -316,9 +320,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -360,6 +364,8 @@ endif $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -481,9 +487,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -527,9 +533,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -571,6 +577,8 @@ endif $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -627,9 +635,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -680,9 +688,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -726,9 +734,9 @@ endif $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -749,9 +757,9 @@ endif $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/IPC_SAP/SPIPE_SAP/Makefile b/examples/IPC_SAP/SPIPE_SAP/Makefile index bfeb8db2f92..9a13235cc11 100644 --- a/examples/IPC_SAP/SPIPE_SAP/Makefile +++ b/examples/IPC_SAP/SPIPE_SAP/Makefile @@ -51,9 +51,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -91,9 +91,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -130,9 +130,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -169,9 +169,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -208,9 +208,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -248,9 +248,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -292,9 +292,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -336,9 +336,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/IPC_SAP/TLI_SAP/Makefile b/examples/IPC_SAP/TLI_SAP/Makefile index adf9fd8baf6..a64265a09e2 100644 --- a/examples/IPC_SAP/TLI_SAP/Makefile +++ b/examples/IPC_SAP/TLI_SAP/Makefile @@ -57,9 +57,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -93,9 +93,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -113,6 +113,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -182,9 +184,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -219,9 +221,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -248,6 +250,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -307,9 +311,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -344,9 +348,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -384,9 +388,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -424,9 +428,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/IPC_SAP/UPIPE_SAP/Makefile b/examples/IPC_SAP/UPIPE_SAP/Makefile index 5b722da0da1..4ed95d4bc57 100644 --- a/examples/IPC_SAP/UPIPE_SAP/Makefile +++ b/examples/IPC_SAP/UPIPE_SAP/Makefile @@ -40,14 +40,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/ex1.o .obj/ex1.so .shobj/ex1.o .shobj/ex1.so: ex1.cpp $(ACE_ROOT)/ace/Stream.h \ +.obj/ex1.o .obj/ex1.so .shobj/ex1.o .shobj/ex1.so: ex1.cpp \ + $(ACE_ROOT)/ace/Stream.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -150,6 +151,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -207,9 +210,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -312,6 +315,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -370,9 +375,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -475,6 +480,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ diff --git a/examples/Log_Msg/Makefile b/examples/Log_Msg/Makefile index 90cdd62162f..079fc0feee0 100644 --- a/examples/Log_Msg/Makefile +++ b/examples/Log_Msg/Makefile @@ -45,9 +45,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -72,9 +72,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -99,9 +99,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/Logger/Acceptor-server/Makefile b/examples/Logger/Acceptor-server/Makefile index b8830ac6040..098b3a38fec 100644 --- a/examples/Logger/Acceptor-server/Makefile +++ b/examples/Logger/Acceptor-server/Makefile @@ -46,9 +46,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -140,6 +140,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ diff --git a/examples/Logger/client/Makefile b/examples/Logger/client/Makefile index abaf34a7f20..a5a435f881d 100644 --- a/examples/Logger/client/Makefile +++ b/examples/Logger/client/Makefile @@ -48,9 +48,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/Logger/simple-server/Makefile b/examples/Logger/simple-server/Makefile index c67b32a9a1b..7417fef1518 100644 --- a/examples/Logger/simple-server/Makefile +++ b/examples/Logger/simple-server/Makefile @@ -49,9 +49,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -149,6 +149,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -193,9 +195,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/Map_Manager/Makefile b/examples/Map_Manager/Makefile index b7c68c36499..d587dac399e 100644 --- a/examples/Map_Manager/Makefile +++ b/examples/Map_Manager/Makefile @@ -42,9 +42,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/Mem_Map/IO-tests/Makefile b/examples/Mem_Map/IO-tests/Makefile index db51d65ea30..8554819e705 100644 --- a/examples/Mem_Map/IO-tests/Makefile +++ b/examples/Mem_Map/IO-tests/Makefile @@ -41,12 +41,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/IO_Test.o .obj/IO_Test.so .shobj/IO_Test.o .shobj/IO_Test.so: IO_Test.cpp $(ACE_ROOT)/ace/OS.h \ +.obj/IO_Test.o .obj/IO_Test.so .shobj/IO_Test.o .shobj/IO_Test.so: IO_Test.cpp \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -69,7 +70,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i IO_Test.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + IO_Test.h \ $(ACE_ROOT)/ace/Profile_Timer.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/High_Res_Timer.h \ diff --git a/examples/Mem_Map/file-reverse/Makefile b/examples/Mem_Map/file-reverse/Makefile index b00a4f4e157..4495981304b 100644 --- a/examples/Mem_Map/file-reverse/Makefile +++ b/examples/Mem_Map/file-reverse/Makefile @@ -49,9 +49,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/Misc/Makefile b/examples/Misc/Makefile index a5e1c95e3cc..2640513422b 100644 --- a/examples/Misc/Makefile +++ b/examples/Misc/Makefile @@ -65,9 +65,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -102,7 +102,8 @@ endif $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Dump_T.h \ - $(ACE_ROOT)/ace/Dump_T.cpp test_dump.h \ + $(ACE_ROOT)/ace/Dump_T.cpp \ + test_dump.h \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/Handle_Set.i \ @@ -151,9 +152,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -182,9 +183,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -218,9 +219,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -310,9 +311,9 @@ endif $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -386,9 +387,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -419,9 +420,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -492,6 +493,8 @@ endif $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ diff --git a/examples/Naming/Makefile b/examples/Naming/Makefile index 06f054e7263..31904f9273e 100644 --- a/examples/Naming/Makefile +++ b/examples/Naming/Makefile @@ -52,9 +52,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -167,9 +167,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -282,9 +282,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/Reactor/Dgram/Makefile b/examples/Reactor/Dgram/Makefile index 9ac1e30d8a4..c19a18c1701 100644 --- a/examples/Reactor/Dgram/Makefile +++ b/examples/Reactor/Dgram/Makefile @@ -49,9 +49,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -143,15 +143,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i -.obj/Dgram.o .obj/Dgram.so .shobj/Dgram.o .shobj/Dgram.so: Dgram.cpp $(ACE_ROOT)/ace/Reactor.h \ +.obj/Dgram.o .obj/Dgram.so .shobj/Dgram.o .shobj/Dgram.so: Dgram.cpp \ + $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/Reactor/FIFO/Makefile b/examples/Reactor/FIFO/Makefile index 15490111a6f..355b05b7066 100644 --- a/examples/Reactor/FIFO/Makefile +++ b/examples/Reactor/FIFO/Makefile @@ -49,9 +49,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -85,9 +85,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/Reactor/Misc/Makefile b/examples/Reactor/Misc/Makefile index 4ebc87feba1..10f4a5dd855 100644 --- a/examples/Reactor/Misc/Makefile +++ b/examples/Reactor/Misc/Makefile @@ -53,9 +53,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -141,9 +141,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -226,6 +226,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i .obj/test_demuxing.o .obj/test_demuxing.so .shobj/test_demuxing.o .shobj/test_demuxing.so: test_demuxing.cpp \ @@ -236,9 +238,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -322,6 +324,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -373,9 +377,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -403,9 +407,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -490,6 +494,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -542,9 +548,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -634,9 +640,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -735,6 +741,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -772,9 +780,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -801,9 +809,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -836,9 +844,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/Reactor/Multicast/Makefile b/examples/Reactor/Multicast/Makefile index 84fb130b587..21e7662d74f 100644 --- a/examples/Reactor/Multicast/Makefile +++ b/examples/Reactor/Multicast/Makefile @@ -48,9 +48,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/Reactor/Ntalker/Makefile b/examples/Reactor/Ntalker/Makefile index 9763f40067c..de6ba3a0a52 100644 --- a/examples/Reactor/Ntalker/Makefile +++ b/examples/Reactor/Ntalker/Makefile @@ -47,9 +47,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -140,6 +140,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ diff --git a/examples/Service_Configurator/IPC-tests/client/Makefile b/examples/Service_Configurator/IPC-tests/client/Makefile index 28640ea8f5b..2e004244cb8 100644 --- a/examples/Service_Configurator/IPC-tests/client/Makefile +++ b/examples/Service_Configurator/IPC-tests/client/Makefile @@ -59,9 +59,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -115,9 +115,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -170,9 +170,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -221,9 +221,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -272,9 +272,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -314,9 +314,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -358,9 +358,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -399,9 +399,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -443,9 +443,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -494,9 +494,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/Service_Configurator/IPC-tests/server/Makefile b/examples/Service_Configurator/IPC-tests/server/Makefile index 63c03ace20c..e3bb5a9600b 100644 --- a/examples/Service_Configurator/IPC-tests/server/Makefile +++ b/examples/Service_Configurator/IPC-tests/server/Makefile @@ -63,9 +63,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -165,7 +165,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/LSOCK.i \ $(ACE_ROOT)/ace/LSOCK_Dgram.i \ $(ACE_ROOT)/ace/UNIX_Addr.h \ - $(ACE_ROOT)/ace/UNIX_Addr.i Handle_L_Dgram.i \ + $(ACE_ROOT)/ace/UNIX_Addr.i \ + Handle_L_Dgram.i \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i @@ -177,9 +178,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -282,7 +283,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/LSOCK_CODgram.i \ $(ACE_ROOT)/ace/UNIX_Addr.h \ $(ACE_ROOT)/ace/UNIX_Addr.i \ - Handle_L_CODgram.i $(ACE_ROOT)/ace/Get_Opt.h \ + Handle_L_CODgram.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i .obj/Handle_L_FIFO.o .obj/Handle_L_FIFO.so .shobj/Handle_L_FIFO.o .shobj/Handle_L_FIFO.so: Handle_L_FIFO.cpp Handle_L_FIFO.h \ @@ -293,9 +295,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -387,7 +389,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/FIFO.i \ $(ACE_ROOT)/ace/FIFO_Recv.i \ $(ACE_ROOT)/ace/FIFO_Recv_Msg.i \ - Handle_L_FIFO.i $(ACE_ROOT)/ace/Get_Opt.h \ + Handle_L_FIFO.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i .obj/Handle_L_Pipe.o .obj/Handle_L_Pipe.so .shobj/Handle_L_Pipe.o .shobj/Handle_L_Pipe.so: Handle_L_Pipe.cpp Handle_L_Pipe.h \ @@ -398,9 +401,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -507,7 +510,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/LSOCK.h \ $(ACE_ROOT)/ace/LSOCK.i \ $(ACE_ROOT)/ace/LSOCK_Stream.i \ - Handle_L_Pipe.i $(ACE_ROOT)/ace/Get_Opt.h \ + Handle_L_Pipe.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i .obj/Handle_L_Stream.o .obj/Handle_L_Stream.so .shobj/Handle_L_Stream.o .shobj/Handle_L_Stream.so: Handle_L_Stream.cpp Handle_L_Stream.h \ @@ -518,9 +522,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -627,7 +631,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/LSOCK.h \ $(ACE_ROOT)/ace/LSOCK.i \ $(ACE_ROOT)/ace/LSOCK_Stream.i \ - Handle_L_Stream.i $(ACE_ROOT)/ace/Get_Opt.h \ + Handle_L_Stream.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i .obj/Handle_R_Dgram.o .obj/Handle_R_Dgram.so .shobj/Handle_R_Dgram.o .shobj/Handle_R_Dgram.so: Handle_R_Dgram.cpp Handle_R_Dgram.h \ @@ -638,9 +643,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -734,7 +739,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/IPC_SAP.i \ $(ACE_ROOT)/ace/QoS_Session.h \ $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_Dgram.i Handle_R_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + Handle_R_Dgram.i \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i @@ -746,9 +752,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -848,7 +854,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - Handle_R_Stream.i $(ACE_ROOT)/ace/Get_Opt.h \ + Handle_R_Stream.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -866,6 +873,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -892,9 +901,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -978,7 +987,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ - Handle_Timeout.i $(ACE_ROOT)/ace/Get_Opt.h \ + Handle_Timeout.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i .obj/Handle_Broadcast.o .obj/Handle_Broadcast.so .shobj/Handle_Broadcast.o .shobj/Handle_Broadcast.so: Handle_Broadcast.cpp Handle_Broadcast.h \ @@ -989,9 +999,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1086,7 +1096,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/QoS_Session.h \ $(ACE_ROOT)/ace/SOCK.i \ $(ACE_ROOT)/ace/SOCK_Dgram.i \ - Handle_Broadcast.i $(ACE_ROOT)/ace/Get_Opt.h \ + Handle_Broadcast.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i .obj/Handle_L_SPIPE.o .obj/Handle_L_SPIPE.so .shobj/Handle_L_SPIPE.o .shobj/Handle_L_SPIPE.so: Handle_L_SPIPE.cpp Handle_L_SPIPE.h \ @@ -1097,9 +1108,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1201,9 +1212,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1306,6 +1317,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -1370,9 +1383,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/Service_Configurator/Misc/Makefile b/examples/Service_Configurator/Misc/Makefile index 3fbbd07b87a..d45c384f012 100644 --- a/examples/Service_Configurator/Misc/Makefile +++ b/examples/Service_Configurator/Misc/Makefile @@ -55,9 +55,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -148,9 +148,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -233,6 +233,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/ARGV.h \ - $(ACE_ROOT)/ace/ARGV.i Timer_Service.h + $(ACE_ROOT)/ace/ARGV.i \ + Timer_Service.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/examples/Shared_Malloc/Makefile b/examples/Shared_Malloc/Makefile index 8cd1212e00e..1ede64dc713 100644 --- a/examples/Shared_Malloc/Makefile +++ b/examples/Shared_Malloc/Makefile @@ -50,9 +50,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -127,9 +127,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -158,9 +158,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -179,6 +179,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -227,8 +229,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Thread_Manager.i Malloc.h \ - Options.h + $(ACE_ROOT)/ace/Thread_Manager.i \ + Malloc.h Options.h .obj/test_persistence.o .obj/test_persistence.so .shobj/test_persistence.o .shobj/test_persistence.so: test_persistence.cpp \ $(ACE_ROOT)/ace/Malloc.h \ @@ -236,9 +238,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -312,9 +314,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -393,9 +395,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -469,9 +471,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -546,9 +548,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/Shared_Memory/Makefile b/examples/Shared_Memory/Makefile index bce99578ef9..2c68e6a85cc 100644 --- a/examples/Shared_Memory/Makefile +++ b/examples/Shared_Memory/Makefile @@ -52,9 +52,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -86,9 +86,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/System_V_IPC/SV_Message_Queues/Makefile b/examples/System_V_IPC/SV_Message_Queues/Makefile index 89d45a2c321..7eff51ee36d 100644 --- a/examples/System_V_IPC/SV_Message_Queues/Makefile +++ b/examples/System_V_IPC/SV_Message_Queues/Makefile @@ -51,9 +51,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -121,7 +121,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/SV_Message_Queue.h \ $(ACE_ROOT)/ace/SV_Message.h \ $(ACE_ROOT)/ace/SV_Message.i \ - $(ACE_ROOT)/ace/SV_Message_Queue.i test.h + $(ACE_ROOT)/ace/SV_Message_Queue.i \ + test.h .obj/MQ_Client.o .obj/MQ_Client.so .shobj/MQ_Client.o .shobj/MQ_Client.so: MQ_Client.cpp \ $(ACE_ROOT)/ace/SV_Message_Queue.h \ @@ -129,9 +130,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -150,7 +151,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/SV_Message.h \ $(ACE_ROOT)/ace/SV_Message.i \ - $(ACE_ROOT)/ace/SV_Message_Queue.i test.h + $(ACE_ROOT)/ace/SV_Message_Queue.i \ + test.h .obj/TMQ_Server.o .obj/TMQ_Server.so .shobj/TMQ_Server.o .shobj/TMQ_Server.so: TMQ_Server.cpp \ $(ACE_ROOT)/ace/Signal.h \ @@ -159,9 +161,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -245,9 +247,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/System_V_IPC/SV_Semaphores/Makefile b/examples/System_V_IPC/SV_Semaphores/Makefile index 06bcbfbc186..a251942a9a0 100644 --- a/examples/System_V_IPC/SV_Semaphores/Makefile +++ b/examples/System_V_IPC/SV_Semaphores/Makefile @@ -46,9 +46,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -123,9 +123,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/System_V_IPC/SV_Shared_Memory/Makefile b/examples/System_V_IPC/SV_Shared_Memory/Makefile index 8366544cebc..6d80a8001dc 100644 --- a/examples/System_V_IPC/SV_Shared_Memory/Makefile +++ b/examples/System_V_IPC/SV_Shared_Memory/Makefile @@ -49,9 +49,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/examples/Threads/Makefile b/examples/Threads/Makefile index 5844d1962c2..9af9946363d 100644 --- a/examples/Threads/Makefile +++ b/examples/Threads/Makefile @@ -74,9 +74,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -159,6 +159,8 @@ endif $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i .obj/barrier1.o .obj/barrier1.so .shobj/barrier1.o .shobj/barrier1.so: barrier1.cpp \ @@ -167,9 +169,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -204,6 +206,8 @@ endif $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -264,9 +268,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -290,6 +294,8 @@ endif $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -394,13 +400,14 @@ endif $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp -.obj/future1.o .obj/future1.so .shobj/future1.o .shobj/future1.so: future1.cpp $(ACE_ROOT)/ace/ACE.h \ +.obj/future1.o .obj/future1.so .shobj/future1.o .shobj/future1.so: future1.cpp \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -427,6 +434,8 @@ endif $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -539,13 +548,14 @@ endif $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp -.obj/future2.o .obj/future2.so .shobj/future2.o .shobj/future2.so: future2.cpp $(ACE_ROOT)/ace/ACE.h \ +.obj/future2.o .obj/future2.so .shobj/future2.o .shobj/future2.so: future2.cpp \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -572,6 +582,8 @@ endif $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -692,9 +704,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -777,6 +789,8 @@ endif $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i .obj/process_manager.o .obj/process_manager.so .shobj/process_manager.o .shobj/process_manager.so: process_manager.cpp \ @@ -787,9 +801,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -872,6 +886,8 @@ endif $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Process_Manager.h \ $(ACE_ROOT)/ace/Process.h \ @@ -886,9 +902,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -961,9 +977,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1036,9 +1052,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1073,6 +1089,8 @@ endif $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -1117,9 +1135,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1202,6 +1220,8 @@ endif $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i @@ -1214,9 +1234,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1240,6 +1260,8 @@ endif $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1352,9 +1374,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1378,6 +1400,8 @@ endif $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1489,9 +1513,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1576,6 +1600,8 @@ endif $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -1628,9 +1654,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1654,6 +1680,8 @@ endif $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1765,9 +1793,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1785,6 +1813,8 @@ endif $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1904,9 +1934,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1989,6 +2019,8 @@ endif $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i .obj/thread_pool.o .obj/thread_pool.so .shobj/thread_pool.o .shobj/thread_pool.so: thread_pool.cpp \ @@ -1999,9 +2031,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -2025,6 +2057,8 @@ endif $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -2137,9 +2171,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -2222,6 +2256,8 @@ endif $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ thread_specific.h @@ -2233,9 +2269,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -2319,6 +2355,8 @@ endif $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -2364,14 +2402,15 @@ endif $(ACE_ROOT)/ace/Stream_Modules.cpp \ thread_specific.h -.obj/tss2.o .obj/tss2.so .shobj/tss2.o .shobj/tss2.so: tss2.cpp $(ACE_ROOT)/ace/Thread.h \ +.obj/tss2.o .obj/tss2.so .shobj/tss2.o .shobj/tss2.so: tss2.cpp \ + $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -2392,7 +2431,8 @@ endif $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i TSS_Data.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + TSS_Data.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -2412,19 +2452,21 @@ endif $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp TSS_Obj.h \ - TSS_Task.h $(ACE_ROOT)/ace/Token.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + TSS_Obj.h TSS_Task.h \ + $(ACE_ROOT)/ace/Token.h \ $(ACE_ROOT)/ace/Token.i -.obj/token.o .obj/token.so .shobj/token.o .shobj/token.so: token.cpp $(ACE_ROOT)/ace/Token.h \ +.obj/token.o .obj/token.so .shobj/token.o .shobj/token.so: token.cpp \ + $(ACE_ROOT)/ace/Token.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -2465,6 +2507,8 @@ endif $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ diff --git a/examples/Timer_Queue/Makefile b/examples/Timer_Queue/Makefile index dd45ceedb31..3262408abb4 100644 --- a/examples/Timer_Queue/Makefile +++ b/examples/Timer_Queue/Makefile @@ -59,9 +59,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -139,6 +139,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -207,9 +209,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -227,6 +229,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -297,8 +301,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Heap.h \ $(ACE_ROOT)/ace/Timer_Heap_T.h \ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ - $(ACE_ROOT)/ace/Select_Reactor_T.i Driver.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Select_Reactor_T.i \ + Driver.h $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -353,7 +357,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue_Adapters.h \ $(ACE_ROOT)/ace/Timer_Queue_Adapters.i \ $(ACE_ROOT)/ace/Timer_Queue_Adapters.cpp \ - Driver.cpp $(ACE_ROOT)/ace/Auto_Ptr.h \ + Driver.cpp \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ Reactor_Timer_Queue_Test.h @@ -366,9 +371,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -392,6 +397,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -510,9 +517,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -529,8 +536,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp Driver.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + Driver.h $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -542,6 +549,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -657,9 +666,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -676,8 +685,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp Driver.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + Driver.h $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -689,6 +698,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -805,9 +816,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -824,8 +835,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp Driver.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + Driver.h $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -837,6 +848,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -953,9 +966,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -972,8 +985,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp Driver.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + Driver.h $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -985,6 +998,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ diff --git a/netsvcs/clients/Logger/Makefile b/netsvcs/clients/Logger/Makefile index 6a162966e7f..c6470613f7f 100644 --- a/netsvcs/clients/Logger/Makefile +++ b/netsvcs/clients/Logger/Makefile @@ -55,9 +55,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -95,9 +95,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/netsvcs/clients/Naming/Client/Makefile b/netsvcs/clients/Naming/Client/Makefile index 716dd76fd5b..926b136701f 100644 --- a/netsvcs/clients/Naming/Client/Makefile +++ b/netsvcs/clients/Naming/Client/Makefile @@ -76,9 +76,9 @@ endif # BIN $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -189,6 +189,8 @@ endif # BIN $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ Client_Test.h @@ -200,9 +202,9 @@ endif # BIN $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile b/netsvcs/clients/Naming/Dump_Restore/Makefile index e3a716c0df1..c0a1a703671 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Makefile +++ b/netsvcs/clients/Naming/Dump_Restore/Makefile @@ -76,9 +76,9 @@ endif # BIN $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -163,6 +163,8 @@ endif # BIN $(ACE_ROOT)/ace/Read_Buffer.h \ $(ACE_ROOT)/ace/Read_Buffer.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ Dump_Restore.h \ $(ACE_ROOT)/ace/Naming_Context.h \ @@ -196,9 +198,9 @@ endif # BIN $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/netsvcs/clients/Tokens/collection/Makefile b/netsvcs/clients/Tokens/collection/Makefile index 66fbd43b1dc..d6a5bd49f5b 100644 --- a/netsvcs/clients/Tokens/collection/Makefile +++ b/netsvcs/clients/Tokens/collection/Makefile @@ -52,9 +52,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -172,6 +172,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Token_Request_Reply.i \ $(ACE_ROOT)/ace/Remote_Tokens.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/netsvcs/clients/Tokens/deadlock/Makefile b/netsvcs/clients/Tokens/deadlock/Makefile index 695e4d30694..ff2b2c01e2a 100644 --- a/netsvcs/clients/Tokens/deadlock/Makefile +++ b/netsvcs/clients/Tokens/deadlock/Makefile @@ -52,9 +52,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -170,6 +170,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Token_Request_Reply.i \ $(ACE_ROOT)/ace/Remote_Tokens.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ diff --git a/netsvcs/clients/Tokens/invariant/Makefile b/netsvcs/clients/Tokens/invariant/Makefile index 330f50d4523..72e1e8af9e3 100644 --- a/netsvcs/clients/Tokens/invariant/Makefile +++ b/netsvcs/clients/Tokens/invariant/Makefile @@ -52,9 +52,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -101,6 +101,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ diff --git a/netsvcs/clients/Tokens/mutex/Makefile b/netsvcs/clients/Tokens/mutex/Makefile index ad78ed98f69..f4553a70db2 100644 --- a/netsvcs/clients/Tokens/mutex/Makefile +++ b/netsvcs/clients/Tokens/mutex/Makefile @@ -52,9 +52,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -170,6 +170,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Token_Request_Reply.i \ $(ACE_ROOT)/ace/Remote_Tokens.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/netsvcs/clients/Tokens/rw_lock/Makefile b/netsvcs/clients/Tokens/rw_lock/Makefile index 1fbbd830f0b..62cc4f34df2 100644 --- a/netsvcs/clients/Tokens/rw_lock/Makefile +++ b/netsvcs/clients/Tokens/rw_lock/Makefile @@ -48,12 +48,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/rw_locks.o .obj/rw_locks.so .shobj/rw_locks.o .shobj/rw_locks.so: rw_locks.cpp $(ACE_ROOT)/ace/OS.h \ +.obj/rw_locks.o .obj/rw_locks.so .shobj/rw_locks.o .shobj/rw_locks.so: rw_locks.cpp \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -169,6 +170,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Token_Request_Reply.i \ $(ACE_ROOT)/ace/Remote_Tokens.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Token_Invariants.h diff --git a/netsvcs/lib/Makefile b/netsvcs/lib/Makefile index 7bbf23977d3..b392d0a23dd 100644 --- a/netsvcs/lib/Makefile +++ b/netsvcs/lib/Makefile @@ -58,9 +58,9 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -129,7 +129,8 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i TS_Server_Handler.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + TS_Server_Handler.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -152,6 +153,8 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -221,9 +224,9 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -240,7 +243,8 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Get_Opt.i TS_Clerk_Handler.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + TS_Clerk_Handler.h \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -318,6 +322,8 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -387,9 +393,9 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -481,6 +487,8 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -558,9 +566,9 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -631,7 +639,8 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp Name_Handler.h \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + Name_Handler.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -656,6 +665,8 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -728,9 +739,9 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -844,6 +855,8 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -897,9 +910,9 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -941,9 +954,9 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1054,6 +1067,8 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -1109,9 +1124,9 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1128,7 +1143,8 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Get_Opt.i Token_Handler.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + Token_Handler.h \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ @@ -1203,6 +1219,8 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -1278,9 +1296,9 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1295,6 +1313,7 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i Base_Optimizer.cpp + $(ACE_ROOT)/ace/OS.i \ + Base_Optimizer.cpp # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/netsvcs/servers/Makefile b/netsvcs/servers/Makefile index 1d62b385002..48b4de68785 100644 --- a/netsvcs/servers/Makefile +++ b/netsvcs/servers/Makefile @@ -55,9 +55,9 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -150,6 +150,8 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ diff --git a/performance-tests/Misc/Makefile b/performance-tests/Misc/Makefile index 3063b04a3ef..9edce7cfda3 100644 --- a/performance-tests/Misc/Makefile +++ b/performance-tests/Misc/Makefile @@ -76,9 +76,9 @@ PSRC = $(addsuffix .cpp, $(BIN)) $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -101,9 +101,9 @@ PSRC = $(addsuffix .cpp, $(BIN)) $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -133,9 +133,9 @@ PSRC = $(addsuffix .cpp, $(BIN)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -168,6 +168,8 @@ PSRC = $(addsuffix .cpp, $(BIN)) $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -225,9 +227,9 @@ PSRC = $(addsuffix .cpp, $(BIN)) $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -251,6 +253,8 @@ PSRC = $(addsuffix .cpp, $(BIN)) $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -363,16 +367,17 @@ PSRC = $(addsuffix .cpp, $(BIN)) $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i -.obj/preempt.o .obj/preempt.o .obj/preempt.o .obj/preempt.o: preempt.cpp $(ACE_ROOT)/ace/Task.h \ +.obj/preempt.o .obj/preempt.o .obj/preempt.o .obj/preempt.o: preempt.cpp \ + $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -396,6 +401,8 @@ PSRC = $(addsuffix .cpp, $(BIN)) $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -510,9 +517,9 @@ PSRC = $(addsuffix .cpp, $(BIN)) $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -544,9 +551,9 @@ PSRC = $(addsuffix .cpp, $(BIN)) $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -601,9 +608,9 @@ PSRC = $(addsuffix .cpp, $(BIN)) $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/performance-tests/Server_Concurrency/Leader_Follower/Makefile b/performance-tests/Server_Concurrency/Leader_Follower/Makefile index 95bba50b540..c7094308a2c 100644 --- a/performance-tests/Server_Concurrency/Leader_Follower/Makefile +++ b/performance-tests/Server_Concurrency/Leader_Follower/Makefile @@ -43,9 +43,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -69,6 +69,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile b/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile index 0dd85dcc1f9..a51145be5ef 100644 --- a/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile +++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/Makefile @@ -35,16 +35,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/workers.o .obj/workers.so .shobj/workers.o .shobj/workers.so: workers.cpp $(ACE_ROOT)/ace/Task.h \ +.obj/workers.o .obj/workers.so .shobj/workers.o .shobj/workers.so: workers.cpp \ + $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -68,6 +69,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ diff --git a/performance-tests/TCP/Makefile b/performance-tests/TCP/Makefile index ce156adcb5c..648dedbea50 100644 --- a/performance-tests/TCP/Makefile +++ b/performance-tests/TCP/Makefile @@ -47,9 +47,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -163,6 +163,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Stats.h \ $(ACE_ROOT)/ace/Stats.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Sched_Params.h \ $(ACE_ROOT)/ace/Sched_Params.i diff --git a/performance-tests/UDP/Makefile b/performance-tests/UDP/Makefile index 465c76f4566..426d957e8ac 100644 --- a/performance-tests/UDP/Makefile +++ b/performance-tests/UDP/Makefile @@ -47,9 +47,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ diff --git a/tests/Makefile b/tests/Makefile index f0d57eb9f24..6e93cbfeb89 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -190,9 +190,9 @@ realclean: clean .obj/Aio_Platform_Test.o .obj/Aio_Platform_Test.so .shobj/Aio_Platform_Test.o .shobj/Aio_Platform_Test.so: Aio_Platform_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -244,9 +244,9 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -319,9 +319,9 @@ realclean: clean test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -372,9 +372,9 @@ realclean: clean $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -401,6 +401,8 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -451,9 +453,9 @@ realclean: clean .obj/Barrier_Test.o .obj/Barrier_Test.so .shobj/Barrier_Test.o .shobj/Barrier_Test.so: Barrier_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -499,6 +501,8 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -529,9 +533,9 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -547,7 +551,8 @@ realclean: clean $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Version.h test_config.h \ + $(ACE_ROOT)/ace/Version.h \ + test_config.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -580,9 +585,9 @@ realclean: clean .obj/Buffer_Stream_Test.o .obj/Buffer_Stream_Test.so .shobj/Buffer_Stream_Test.o .shobj/Buffer_Stream_Test.so: Buffer_Stream_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -688,6 +693,8 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -723,9 +730,9 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -842,6 +849,8 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Strategies_T.i \ @@ -873,9 +882,9 @@ realclean: clean .obj/Cached_Accept_Conn_Test.o .obj/Cached_Accept_Conn_Test.so .shobj/Cached_Accept_Conn_Test.o .shobj/Cached_Accept_Conn_Test.so: Cached_Accept_Conn_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -968,6 +977,8 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -1064,9 +1075,9 @@ realclean: clean .obj/Cached_Conn_Test.o .obj/Cached_Conn_Test.so .shobj/Cached_Conn_Test.o .shobj/Cached_Conn_Test.so: Cached_Conn_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -1134,6 +1145,8 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -1257,9 +1270,9 @@ realclean: clean $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1354,7 +1367,8 @@ realclean: clean $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Capabilities.i test_config.h + $(ACE_ROOT)/ace/Capabilities.i \ + test_config.h .obj/CDR_File_Test.o .obj/CDR_File_Test.so .shobj/CDR_File_Test.o .shobj/CDR_File_Test.so: CDR_File_Test.cpp \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -1363,9 +1377,9 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -1455,14 +1469,15 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i test_config.h + $(ACE_ROOT)/ace/Get_Opt.i \ + test_config.h .obj/CDR_Test.o .obj/CDR_Test.so .shobj/CDR_Test.o .shobj/CDR_Test.so: CDR_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -1549,9 +1564,9 @@ realclean: clean .obj/Collection_Test.o .obj/Collection_Test.so .shobj/Collection_Test.o .shobj/Collection_Test.so: Collection_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -1624,9 +1639,9 @@ realclean: clean .obj/Conn_Test.o .obj/Conn_Test.so .shobj/Conn_Test.o .shobj/Conn_Test.so: Conn_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -1739,6 +1754,8 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -1793,14 +1810,15 @@ realclean: clean $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i Conn_Test.h + $(ACE_ROOT)/ace/Get_Opt.i \ + Conn_Test.h .obj/DLList_Test.o .obj/DLList_Test.so .shobj/DLList_Test.o .shobj/DLList_Test.so: DLList_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -1875,9 +1893,9 @@ realclean: clean .obj/DLL_Test.o .obj/DLL_Test.so .shobj/DLL_Test.o .shobj/DLL_Test.so: DLL_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -1921,8 +1939,8 @@ realclean: clean $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp DLL_Test.h \ - $(ACE_ROOT)/ace/DLL.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + DLL_Test.h $(ACE_ROOT)/ace/DLL.h \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp @@ -1930,9 +1948,9 @@ realclean: clean .obj/Enum_Interfaces_Test.o .obj/Enum_Interfaces_Test.so .shobj/Enum_Interfaces_Test.o .shobj/Enum_Interfaces_Test.so: Enum_Interfaces_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -1985,9 +2003,9 @@ realclean: clean .obj/Env_Value_Test.o .obj/Env_Value_Test.so .shobj/Env_Value_Test.o .shobj/Env_Value_Test.so: Env_Value_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -2044,9 +2062,9 @@ realclean: clean .obj/Future_Test.o .obj/Future_Test.so .shobj/Future_Test.o .shobj/Future_Test.so: Future_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -2097,6 +2115,8 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -2190,9 +2210,9 @@ realclean: clean .obj/Future_Set_Test.o .obj/Future_Set_Test.so .shobj/Future_Set_Test.o .shobj/Future_Set_Test.so: Future_Set_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -2243,6 +2263,8 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -2338,9 +2360,9 @@ realclean: clean .obj/Handle_Set_Test.o .obj/Handle_Set_Test.so .shobj/Handle_Set_Test.o .shobj/Handle_Set_Test.so: Handle_Set_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -2420,9 +2442,9 @@ realclean: clean .obj/High_Res_Timer_Test.o .obj/High_Res_Timer_Test.so .shobj/High_Res_Timer_Test.o .shobj/High_Res_Timer_Test.so: High_Res_Timer_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -2477,10 +2499,10 @@ realclean: clean .obj/OrdMultiSet_Test.o .obj/OrdMultiSet_Test.so .shobj/OrdMultiSet_Test.o .shobj/OrdMultiSet_Test.so: OrdMultiSet_Test.cpp \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h test_config.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + test_config.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -2552,9 +2574,9 @@ realclean: clean .obj/Hash_Map_Manager_Test.o .obj/Hash_Map_Manager_Test.so .shobj/Hash_Map_Manager_Test.o .shobj/Hash_Map_Manager_Test.so: Hash_Map_Manager_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -2652,11 +2674,12 @@ realclean: clean $(ACE_ROOT)/ace/Svc_Conf_Tokens.h .obj/Hash_Map_Bucket_Iterator_Test.o .obj/Hash_Map_Bucket_Iterator_Test.so .shobj/Hash_Map_Bucket_Iterator_Test.o .shobj/Hash_Map_Bucket_Iterator_Test.so: Hash_Map_Bucket_Iterator_Test.cpp \ + test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -2758,9 +2781,9 @@ realclean: clean .obj/IOStream_Test.o .obj/IOStream_Test.so .shobj/IOStream_Test.o .shobj/IOStream_Test.so: IOStream_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -2853,6 +2876,8 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -2924,9 +2949,9 @@ realclean: clean .obj/Lazy_Map_Manager_Test.o .obj/Lazy_Map_Manager_Test.so .shobj/Lazy_Map_Manager_Test.o .shobj/Lazy_Map_Manager_Test.so: Lazy_Map_Manager_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -3026,9 +3051,9 @@ realclean: clean $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/FILE_Connector.h \ $(ACE_ROOT)/ace/FILE_IO.h \ $(ACE_ROOT)/ace/FILE.h \ @@ -3067,7 +3092,8 @@ realclean: clean $(ACE_ROOT)/ace/FILE_Connector.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp test_config.h \ + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + test_config.h \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Synch.h \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -3094,9 +3120,9 @@ realclean: clean .obj/Malloc_Test.o .obj/Malloc_Test.so .shobj/Malloc_Test.o .shobj/Malloc_Test.so: Malloc_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -3171,14 +3197,15 @@ realclean: clean $(ACE_ROOT)/ace/Process.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp Malloc_Test.h + $(ACE_ROOT)/ace/Auto_Ptr.cpp \ + Malloc_Test.h .obj/Map_Test.o .obj/Map_Test.so .shobj/Map_Test.o .shobj/Map_Test.so: Map_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -3222,7 +3249,8 @@ realclean: clean $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp Map_Test.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + Map_Test.h \ $(ACE_ROOT)/ace/Active_Map_Manager.h \ $(ACE_ROOT)/ace/Active_Map_Manager.i \ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ @@ -3299,9 +3327,9 @@ realclean: clean .obj/Map_Manager_Test.o .obj/Map_Manager_Test.so .shobj/Map_Manager_Test.o .shobj/Map_Manager_Test.so: Map_Manager_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -3430,6 +3458,8 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ @@ -3457,9 +3487,9 @@ realclean: clean .obj/Mem_Map_Test.o .obj/Mem_Map_Test.so .shobj/Mem_Map_Test.o .shobj/Mem_Map_Test.so: Mem_Map_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -3510,9 +3540,9 @@ realclean: clean .obj/MM_Shared_Memory_Test.o .obj/MM_Shared_Memory_Test.so .shobj/MM_Shared_Memory_Test.o .shobj/MM_Shared_Memory_Test.so: MM_Shared_Memory_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -3563,6 +3593,8 @@ realclean: clean $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Shared_Memory_MM.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -3590,9 +3622,9 @@ realclean: clean .obj/MT_Reactor_Timer_Test.o .obj/MT_Reactor_Timer_Test.so .shobj/MT_Reactor_Timer_Test.o .shobj/MT_Reactor_Timer_Test.so: MT_Reactor_Timer_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -3677,6 +3709,8 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -3731,9 +3765,9 @@ realclean: clean .obj/MT_SOCK_Test.o .obj/MT_SOCK_Test.so .shobj/MT_SOCK_Test.o .shobj/MT_SOCK_Test.so: MT_SOCK_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -3779,6 +3813,8 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -3828,9 +3864,9 @@ realclean: clean .obj/Message_Block_Test.o .obj/Message_Block_Test.so .shobj/Message_Block_Test.o .shobj/Message_Block_Test.so: Message_Block_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -3881,6 +3917,8 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -3971,9 +4009,9 @@ realclean: clean .obj/Message_Queue_Test.o .obj/Message_Queue_Test.so .shobj/Message_Queue_Test.o .shobj/Message_Queue_Test.so: Message_Queue_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -4019,6 +4057,8 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -4102,9 +4142,9 @@ realclean: clean Message_Queue_Notifications_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -4196,6 +4236,8 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -4240,9 +4282,9 @@ realclean: clean .obj/New_Fail_Test.o .obj/New_Fail_Test.so .shobj/New_Fail_Test.o .shobj/New_Fail_Test.so: New_Fail_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -4292,9 +4334,9 @@ realclean: clean .obj/Notify_Performance_Test.o .obj/Notify_Performance_Test.so .shobj/Notify_Performance_Test.o .shobj/Notify_Performance_Test.so: Notify_Performance_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -4347,6 +4389,8 @@ realclean: clean $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -4443,9 +4487,9 @@ realclean: clean .obj/Object_Manager_Test.o .obj/Object_Manager_Test.so .shobj/Object_Manager_Test.o .shobj/Object_Manager_Test.so: Object_Manager_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -4491,12 +4535,13 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp -.obj/OS_Test.o .obj/OS_Test.so .shobj/OS_Test.o .shobj/OS_Test.so: OS_Test.cpp $(ACE_ROOT)/ace/OS.h \ +.obj/OS_Test.o .obj/OS_Test.so .shobj/OS_Test.o .shobj/OS_Test.so: OS_Test.cpp \ + $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -4544,9 +4589,9 @@ realclean: clean .obj/Process_Mutex_Test.o .obj/Process_Mutex_Test.so .shobj/Process_Mutex_Test.o .shobj/Process_Mutex_Test.so: Process_Mutex_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -4602,9 +4647,9 @@ realclean: clean .obj/Process_Strategy_Test.o .obj/Process_Strategy_Test.so .shobj/Process_Strategy_Test.o .shobj/Process_Strategy_Test.so: Process_Strategy_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -4697,6 +4742,8 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -4767,9 +4814,9 @@ realclean: clean .obj/Priority_Buffer_Test.o .obj/Priority_Buffer_Test.so .shobj/Priority_Buffer_Test.o .shobj/Priority_Buffer_Test.so: Priority_Buffer_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -4871,6 +4918,8 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -4895,9 +4944,9 @@ realclean: clean .obj/Dynamic_Priority_Test.o .obj/Dynamic_Priority_Test.so .shobj/Dynamic_Priority_Test.o .shobj/Dynamic_Priority_Test.so: Dynamic_Priority_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -4999,6 +5048,8 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -5027,9 +5078,9 @@ realclean: clean .obj/Priority_Task_Test.o .obj/Priority_Task_Test.so .shobj/Priority_Task_Test.o .shobj/Priority_Task_Test.so: Priority_Task_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -5080,6 +5131,8 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -5167,9 +5220,9 @@ realclean: clean .obj/Priority_Reactor_Test.o .obj/Priority_Reactor_Test.so .shobj/Priority_Reactor_Test.o .shobj/Priority_Reactor_Test.so: Priority_Reactor_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -5282,6 +5335,8 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -5354,9 +5409,9 @@ realclean: clean .obj/Process_Manager_Test.o .obj/Process_Manager_Test.so .shobj/Process_Manager_Test.o .shobj/Process_Manager_Test.so: Process_Manager_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -5446,9 +5501,9 @@ realclean: clean .obj/Pipe_Test.o .obj/Pipe_Test.so .shobj/Pipe_Test.o .shobj/Pipe_Test.so: Pipe_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -5506,9 +5561,9 @@ realclean: clean .obj/RB_Tree_Test.o .obj/RB_Tree_Test.so .shobj/RB_Tree_Test.o .shobj/RB_Tree_Test.so: RB_Tree_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -5584,14 +5639,15 @@ realclean: clean $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/RB_Tree.cpp RB_Tree_Test.h + $(ACE_ROOT)/ace/RB_Tree.cpp \ + RB_Tree_Test.h .obj/Reactors_Test.o .obj/Reactors_Test.so .shobj/Reactors_Test.o .shobj/Reactors_Test.so: Reactors_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -5642,6 +5698,8 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -5731,9 +5789,9 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -5819,15 +5877,17 @@ realclean: clean $(ACE_ROOT)/ace/SOCK.i \ $(ACE_ROOT)/ace/SOCK_Dgram.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ test_config.h .obj/Reactor_Notify_Test.o .obj/Reactor_Notify_Test.so .shobj/Reactor_Notify_Test.o .shobj/Reactor_Notify_Test.so: Reactor_Notify_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -5878,6 +5938,8 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -5979,9 +6041,9 @@ realclean: clean .obj/Reactor_Performance_Test.o .obj/Reactor_Performance_Test.so .shobj/Reactor_Performance_Test.o .shobj/Reactor_Performance_Test.so: Reactor_Performance_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -6049,6 +6111,8 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -6169,9 +6233,9 @@ realclean: clean .obj/Reactor_Timer_Test.o .obj/Reactor_Timer_Test.so .shobj/Reactor_Timer_Test.o .shobj/Reactor_Timer_Test.so: Reactor_Timer_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -6253,9 +6317,9 @@ realclean: clean .obj/Reader_Writer_Test.o .obj/Reader_Writer_Test.so .shobj/Reader_Writer_Test.o .shobj/Reader_Writer_Test.so: Reader_Writer_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -6301,6 +6365,8 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -6332,9 +6398,9 @@ realclean: clean .obj/Recursive_Mutex_Test.o .obj/Recursive_Mutex_Test.so .shobj/Recursive_Mutex_Test.o .shobj/Recursive_Mutex_Test.so: Recursive_Mutex_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -6382,6 +6448,8 @@ realclean: clean $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -6411,9 +6479,9 @@ realclean: clean .obj/Reverse_Lock_Test.o .obj/Reverse_Lock_Test.so .shobj/Reverse_Lock_Test.o .shobj/Reverse_Lock_Test.so: Reverse_Lock_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -6462,9 +6530,9 @@ realclean: clean .obj/Semaphore_Test.o .obj/Semaphore_Test.so .shobj/Semaphore_Test.o .shobj/Semaphore_Test.so: Semaphore_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -6510,6 +6578,8 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -6541,9 +6611,9 @@ realclean: clean .obj/Service_Config_Test.o .obj/Service_Config_Test.so .shobj/Service_Config_Test.o .shobj/Service_Config_Test.so: Service_Config_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -6634,9 +6704,9 @@ realclean: clean .obj/Signal_Test.o .obj/Signal_Test.so .shobj/Signal_Test.o .shobj/Signal_Test.so: Signal_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -6682,6 +6752,8 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -6719,9 +6791,9 @@ realclean: clean .obj/Sigset_Ops_Test.o .obj/Sigset_Ops_Test.so .shobj/Sigset_Ops_Test.o .shobj/Sigset_Ops_Test.so: Sigset_Ops_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -6768,11 +6840,12 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.cpp .obj/Simple_Message_Block_Test.o .obj/Simple_Message_Block_Test.so .shobj/Simple_Message_Block_Test.o .shobj/Simple_Message_Block_Test.so: Simple_Message_Block_Test.cpp \ + test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -6850,9 +6923,9 @@ realclean: clean .obj/SOCK_Test.o .obj/SOCK_Test.so .shobj/SOCK_Test.o .shobj/SOCK_Test.so: SOCK_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -6898,6 +6971,8 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -6947,9 +7022,9 @@ realclean: clean .obj/SOCK_Connector_Test.o .obj/SOCK_Connector_Test.so .shobj/SOCK_Connector_Test.o .shobj/SOCK_Connector_Test.so: SOCK_Connector_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -7014,9 +7089,9 @@ realclean: clean .obj/SOCK_Send_Recv_Test.o .obj/SOCK_Send_Recv_Test.so .shobj/SOCK_Send_Recv_Test.o .shobj/SOCK_Send_Recv_Test.so: SOCK_Send_Recv_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -7062,6 +7137,8 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -7109,9 +7186,9 @@ realclean: clean .obj/SPIPE_Test.o .obj/SPIPE_Test.so .shobj/SPIPE_Test.o .shobj/SPIPE_Test.so: SPIPE_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -7157,6 +7234,8 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -7201,9 +7280,9 @@ realclean: clean .obj/SString_Test.o .obj/SString_Test.so .shobj/SString_Test.o .shobj/SString_Test.so: SString_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -7255,9 +7334,9 @@ realclean: clean .obj/SV_Shared_Memory_Test.o .obj/SV_Shared_Memory_Test.so .shobj/SV_Shared_Memory_Test.o .shobj/SV_Shared_Memory_Test.so: SV_Shared_Memory_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -7330,9 +7409,9 @@ realclean: clean .obj/Svc_Handler_Test.o .obj/Svc_Handler_Test.so .shobj/Svc_Handler_Test.o .shobj/Svc_Handler_Test.so: Svc_Handler_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -7401,6 +7480,8 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ @@ -7484,9 +7565,9 @@ realclean: clean .obj/Task_Test.o .obj/Task_Test.so .shobj/Task_Test.o .shobj/Task_Test.so: Task_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -7537,6 +7618,8 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -7617,14 +7700,15 @@ realclean: clean $(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/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Thread_Hook.h .obj/Thread_Manager_Test.o .obj/Thread_Manager_Test.so .shobj/Thread_Manager_Test.o .shobj/Thread_Manager_Test.so: Thread_Manager_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -7670,6 +7754,8 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -7699,9 +7785,9 @@ realclean: clean .obj/Thread_Mutex_Test.o .obj/Thread_Mutex_Test.so .shobj/Thread_Mutex_Test.o .shobj/Thread_Mutex_Test.so: Thread_Mutex_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -7747,6 +7833,8 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -7776,9 +7864,9 @@ realclean: clean .obj/Thread_Pool_Test.o .obj/Thread_Pool_Test.so .shobj/Thread_Pool_Test.o .shobj/Thread_Pool_Test.so: Thread_Pool_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -7829,6 +7917,8 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -7915,9 +8005,9 @@ realclean: clean test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -7967,9 +8057,9 @@ realclean: clean .obj/Time_Service_Test.o .obj/Time_Service_Test.so .shobj/Time_Service_Test.o .shobj/Time_Service_Test.so: Time_Service_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -8023,10 +8113,10 @@ realclean: clean .obj/Time_Value_Test.o .obj/Time_Value_Test.so .shobj/Time_Value_Test.o .shobj/Time_Value_Test.so: Time_Value_Test.cpp \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ - $(ACE_ROOT)/ace/svc_export.h test_config.h \ - $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + test_config.h $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -8074,9 +8164,9 @@ realclean: clean .obj/Timer_Queue_Test.o .obj/Timer_Queue_Test.so .shobj/Timer_Queue_Test.o .shobj/Timer_Queue_Test.so: Timer_Queue_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -8170,9 +8260,9 @@ realclean: clean .obj/TSS_Test.o .obj/TSS_Test.so .shobj/TSS_Test.o .shobj/TSS_Test.so: TSS_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -8218,6 +8308,8 @@ realclean: clean $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -8248,9 +8340,9 @@ realclean: clean .obj/UPIPE_SAP_Test.o .obj/UPIPE_SAP_Test.so .shobj/UPIPE_SAP_Test.o .shobj/UPIPE_SAP_Test.so: UPIPE_SAP_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -8356,6 +8448,8 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ @@ -8406,11 +8500,12 @@ realclean: clean $(ACE_ROOT)/ace/UPIPE_Connector.i .obj/Upgradable_RW_Test.o .obj/Upgradable_RW_Test.so .shobj/Upgradable_RW_Test.o .shobj/Upgradable_RW_Test.so: Upgradable_RW_Test.cpp Upgradable_RW_Test.h \ + test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -8461,6 +8556,8 @@ realclean: clean $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Containers.i \ @@ -8553,9 +8650,9 @@ realclean: clean .obj/Naming_Test.o .obj/Naming_Test.so .shobj/Naming_Test.o .shobj/Naming_Test.so: Naming_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -8673,9 +8770,9 @@ realclean: clean test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -8788,6 +8885,8 @@ realclean: clean $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ @@ -8853,9 +8952,9 @@ realclean: clean .obj/XtReactor_Test.o .obj/XtReactor_Test.so .shobj/XtReactor_Test.o .shobj/XtReactor_Test.so: XtReactor_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -8904,9 +9003,9 @@ realclean: clean .obj/FlReactor_Test.o .obj/FlReactor_Test.so .shobj/FlReactor_Test.o .shobj/FlReactor_Test.so: FlReactor_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -8955,9 +9054,9 @@ realclean: clean .obj/TkReactor_Test.o .obj/TkReactor_Test.so .shobj/TkReactor_Test.o .shobj/TkReactor_Test.so: TkReactor_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -9006,9 +9105,9 @@ realclean: clean .obj/Tokens_Test.o .obj/Tokens_Test.so .shobj/Tokens_Test.o .shobj/Tokens_Test.so: Tokens_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ @@ -9129,15 +9228,17 @@ realclean: clean $(ACE_ROOT)/ace/Token_Request_Reply.i \ $(ACE_ROOT)/ace/Remote_Tokens.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Token_Invariants.h .obj/CDR_Array_Test.o .obj/CDR_Array_Test.so .shobj/CDR_Array_Test.o .shobj/CDR_Array_Test.so: CDR_Array_Test.cpp test_config.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ diff --git a/tests/Task_Test.cpp b/tests/Task_Test.cpp index af6ab9abdf4..6c418d384f5 100644 --- a/tests/Task_Test.cpp +++ b/tests/Task_Test.cpp @@ -11,17 +11,18 @@ // = DESCRIPTION // This test program illustrates how the ACE barrier // synchronization mechanisms work in conjunction with the -// <ACE_Task> and the <ACE_Thread_Manager>. This also illustrates +// <ACE_Task> and the <ACE_Thread_Manager>. This also illustrates // how the <ACE_Thread_Hook> mechanism works. // // = AUTHOR -// Prashant Jain <pjain@cs.wustl.edu> and +// Prashant Jain <pjain@cs.wustl.edu> and // Douglas C. Schmidt <schmidt@cs.wustl.edu> // // ============================================================================ #include "test_config.h" #include "ace/Task.h" +#include "ace/Thread_Hook.h" ACE_RCSID(tests, Task_Test, "$Id$") diff --git a/websvcs/lib/Makefile b/websvcs/lib/Makefile index fbe6d65b1c9..e3a6e0bc2d4 100644 --- a/websvcs/lib/Makefile +++ b/websvcs/lib/Makefile @@ -49,9 +49,9 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -70,7 +70,7 @@ endif # SUPPRESS_DASH_G $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Addr.h \ $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/INET_Addr.i websvcs_export.h \ - URL_Addr.i + $(ACE_ROOT)/ace/INET_Addr.i \ + websvcs_export.h URL_Addr.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/websvcs/tests/Makefile b/websvcs/tests/Makefile index 319be42583e..af2055d842a 100644 --- a/websvcs/tests/Makefile +++ b/websvcs/tests/Makefile @@ -53,9 +53,9 @@ endif $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ - $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ |