diff options
37 files changed, 512 insertions, 331 deletions
diff --git a/ChangeLog-97a b/ChangeLog-97a index 6e647bfe87d..e80e0d7aa94 100644 --- a/ChangeLog-97a +++ b/ChangeLog-97a @@ -1,3 +1,15 @@ +Mon May 5 21:37:01 1997 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/Message_Block: Revised the release() logic for + ACE_Message_Block and ACE_Data_Block so that we will delete both + within the same block of code in order to hold the lock. This + should prevent nasty race conditions in multi-threaded programs. + Thanks to Craig Perras <craig.perras@CyberSafe.COM> for + reporting this problem. + + * ace/Message_Block.cpp: Replaced an explicit acquire()/release() + of ACE_Lock::locking_strategy_ with a call to an ACE_Guard. + Mon May 05 21:01:42 1997 David L. Levine <levine@cs.wustl.edu> * ace/config-linux*.h: added ACE_HAS_STRING_CLASS. Thanks to diff --git a/ace/Message_Block.cpp b/ace/Message_Block.cpp index 16608d358c7..a72c4aa1104 100644 --- a/ace/Message_Block.cpp +++ b/ace/Message_Block.cpp @@ -16,7 +16,9 @@ ACE_Message_Block::data_block (ACE_Data_Block *db) { ACE_TRACE ("ACE_Data_Block::data_block"); if (this->data_block_ != 0) - this->data_block_->release (); + // This call passes a 0 into release since we don't want to delete + // <this> at this point. + this->data_block_->release (0); this->data_block_ = db; @@ -184,9 +186,6 @@ ACE_Message_Block::~ACE_Message_Block (void) { ACE_TRACE ("ACE_Message_Block::~ACE_Message_Block"); - if (this->data_block ()) - this->data_block ()->release (); - // Free up all the continuation messages. if (this->cont_) { @@ -196,6 +195,10 @@ ACE_Message_Block::~ACE_Message_Block (void) this->prev_ = 0; this->next_ = 0; + + // This must come last since it may delete <this>. + if (this->data_block ()) + this->data_block ()->release (this); } ACE_Data_Block::ACE_Data_Block (void) @@ -412,48 +415,46 @@ ACE_Message_Block::init_i (size_t size, } ACE_Data_Block * -ACE_Data_Block::release (void) +ACE_Data_Block::release_i (ACE_Message_Block *mb) { ACE_TRACE ("ACE_Data_Block::release"); - ACE_Data_Block *result; - - // If there's a locking strategy then we need to acquire the lock - // before decrementing the count. - if (this->locking_strategy_) - { - this->locking_strategy_->acquire (); - - ACE_ASSERT (this->reference_count_ > 0); + ACE_ASSERT (this->reference_count_ >= 0); - this->reference_count_--; + ACE_Data_Block *result = 0; - if (this->reference_count_ == 0) - result = 0; - else // if (this->reference_count_ > 0) - result = this; + this->reference_count_--; - this->locking_strategy_->release (); - } - else + if (this->reference_count_ == 0) { - ACE_ASSERT (this->reference_count_ >= 0); + delete this; + // We need to delete <mb> here since the lock will be held + // correctly at this point, which protects against race + // conditions in multi-threaded programs. Note that if <mb> is + // 0 there's no harm in deleting it. + delete mb; + } + else // if (this->reference_count_ > 0) + result = this; - this->reference_count_--; + return result; +} - if (this->reference_count_ == 0) - result = 0; - else // if (this->reference_count_ > 0) - result = this; - } +ACE_Data_Block * +ACE_Data_Block::release (ACE_Message_Block *mb) +{ + ACE_TRACE ("ACE_Data_Block::release"); - // We must delete this outside the scope of the locking_strategy_ - // since otherwise we'd be trying to "release" through a deleted - // pointer! - if (result == 0) - delete this; + // If there's a locking strategy then we need to acquire the lock + // before decrementing the count. + if (this->locking_strategy_) + { + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->locking_strategy_, 0); - return result; + return this->release_i (mb); + } + else + return this->release_i (mb); } ACE_Message_Block * @@ -461,16 +462,12 @@ ACE_Message_Block::release (void) { ACE_TRACE ("ACE_Message_Block::release"); - ACE_Message_Block *result = 0; - - this->data_block_ = this->data_block ()->release (); + this->data_block_ = this->data_block ()->release (this); if (this->data_block_ == 0) - delete this; + return 0; else - result = this; - - return result; + return this; } /* static */ ACE_Message_Block * @@ -494,9 +491,8 @@ ACE_Data_Block::duplicate (void) if (this->locking_strategy_) { // We need to acquire the lock before incrementing the count. - this->locking_strategy_->acquire (); + ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->locking_strategy_, 0); this->reference_count_++; - this->locking_strategy_->release (); } else this->reference_count_++; diff --git a/ace/Message_Block.h b/ace/Message_Block.h index 76227a407be..7137b88fa6c 100644 --- a/ace/Message_Block.h +++ b/ace/Message_Block.h @@ -409,11 +409,11 @@ public: ACE_Data_Block *duplicate (void); // Return a "shallow" copy that increments our reference count by 1. - ACE_Data_Block *release (void); + ACE_Data_Block *release (ACE_Message_Block *mb = 0); // Decrease the shared reference count by 1. If the reference count // is > 0 then return this; else if reference count == 0 then delete - // <this> and return 0. Behavior is undefined if reference count < - // 0. + // <this> and <mb> and return 0. Behavior is undefined if reference + // count < 0. // = Message flag accessors and mutators. ACE_Message_Block::Message_Flags set_flags (ACE_Message_Block::Message_Flags more_flags); @@ -437,6 +437,9 @@ public: // Dump the state of an object. private: + ACE_Data_Block *release_i (ACE_Message_Block *mb); + // Performs the actual release. + ACE_Message_Block::ACE_Message_Type type_; // Type of message. diff --git a/apps/Gateway/Gateway/Makefile b/apps/Gateway/Gateway/Makefile index 63764a47aac..02eff3ccffb 100644 --- a/apps/Gateway/Gateway/Makefile +++ b/apps/Gateway/Gateway/Makefile @@ -90,8 +90,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -142,6 +142,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -225,8 +226,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -277,6 +278,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -332,8 +334,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -384,6 +386,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -433,8 +436,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i Event.h \ Consumer_Dispatch_Set.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i .obj/Proxy_Handler.o .shobj/Proxy_Handler.so: Proxy_Handler.cpp Event_Channel.h \ Proxy_Handler_Connector.h \ $(WRAPPER_ROOT)/ace/Connector.h \ @@ -469,8 +472,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -521,6 +524,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -577,8 +581,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -629,6 +633,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -684,8 +689,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -736,6 +741,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ diff --git a/apps/Gateway/Peer/Makefile b/apps/Gateway/Peer/Makefile index a7152c04b13..20df0bdea70 100644 --- a/apps/Gateway/Peer/Makefile +++ b/apps/Gateway/Peer/Makefile @@ -82,8 +82,8 @@ INCLDIRS += -I../Gateway $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -134,6 +134,7 @@ INCLDIRS += -I../Gateway $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ diff --git a/apps/JAWS/server/Makefile b/apps/JAWS/server/Makefile index e4c1916b421..cfb7b9f0157 100644 --- a/apps/JAWS/server/Makefile +++ b/apps/JAWS/server/Makefile @@ -93,8 +93,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Timer_List_T.h \ $(WRAPPER_ROOT)/ace/Timer_Heap.h \ $(WRAPPER_ROOT)/ace/Timer_Heap_T.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Timer_Wheel.h \ $(WRAPPER_ROOT)/ace/Timer_Wheel_T.h \ ../../JAWS/server/IO.h ../../JAWS/server/HTTP_Server.h \ @@ -143,6 +143,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -156,6 +157,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.i \ ../../JAWS/server/HTTP_Handler.h ../../JAWS/server/HTTP_Request.h \ + ../../JAWS/server/Parse_Headers.h ../../JAWS/server/HTTP_Response.h \ ../../JAWS/server/HTTP_Server_T.h .obj/HTTP_Handler.o .shobj/HTTP_Handler.so: HTTP_Handler.cpp \ $(WRAPPER_ROOT)/ace/Message_Block.h \ @@ -188,8 +190,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -197,8 +199,9 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Message_Block.i \ ../../JAWS/server/HTTP_Handler.h \ $(WRAPPER_ROOT)/ace/Asynch_IO.h \ - ../../JAWS/server/HTTP_Request.h ../../JAWS/server/HTTP_Helpers.h \ - ../../JAWS/server/IO.h + ../../JAWS/server/HTTP_Request.h ../../JAWS/server/Parse_Headers.h \ + ../../JAWS/server/HTTP_Response.h ../../JAWS/server/IO.h \ + ../../JAWS/server/HTTP_Helpers.h .obj/HTTP_Helpers.o .shobj/HTTP_Helpers.so: HTTP_Helpers.cpp ../../JAWS/server/HTTP_Helpers.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/ACE.h \ @@ -223,7 +226,48 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i -.obj/HTTP_Request.o .shobj/HTTP_Request.so: HTTP_Request.cpp ../../JAWS/server/HTTP_Request.h \ +.obj/HTTP_Request.o .shobj/HTTP_Request.so: HTTP_Request.cpp \ + $(WRAPPER_ROOT)/ace/Message_Block.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/OS.h \ + $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/OS.i \ + $(WRAPPER_ROOT)/ace/Trace.h \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Malloc.h \ + $(WRAPPER_ROOT)/ace/Malloc.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ + $(WRAPPER_ROOT)/ace/Synch.i \ + $(WRAPPER_ROOT)/ace/Synch_T.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.i \ + $(WRAPPER_ROOT)/ace/Synch_T.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Malloc_T.i \ + $(WRAPPER_ROOT)/ace/Memory_Pool.h \ + $(WRAPPER_ROOT)/ace/Signal.h \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ + $(WRAPPER_ROOT)/ace/Signal.i \ + $(WRAPPER_ROOT)/ace/Mem_Map.h \ + $(WRAPPER_ROOT)/ace/Mem_Map.i \ + $(WRAPPER_ROOT)/ace/Memory_Pool.i \ + $(WRAPPER_ROOT)/ace/Message_Block.i \ + ../../JAWS/server/HTTP_Request.h ../../JAWS/server/Parse_Headers.h \ + ../../JAWS/server/HTTP_Helpers.h +.obj/HTTP_Response.o .shobj/HTTP_Response.so: HTTP_Response.cpp ../../JAWS/server/HTTP_Response.h \ + ../../JAWS/server/HTTP_Request.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -234,7 +278,24 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/ACE.i \ - $(WRAPPER_ROOT)/ace/Log_Record.i + $(WRAPPER_ROOT)/ace/Log_Record.i \ + ../../JAWS/server/Parse_Headers.h ../../JAWS/server/HTTP_Helpers.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ + $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \ + $(WRAPPER_ROOT)/ace/Synch.i \ + $(WRAPPER_ROOT)/ace/Synch_T.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.h \ + $(WRAPPER_ROOT)/ace/Event_Handler.i \ + $(WRAPPER_ROOT)/ace/Synch_T.i \ + $(WRAPPER_ROOT)/ace/Thread.h \ + $(WRAPPER_ROOT)/ace/Thread.i \ + ../../JAWS/server/IO.h \ + $(WRAPPER_ROOT)/ace/Asynch_IO.h +.obj/Parse_Headers.o .shobj/Parse_Headers.so: Parse_Headers.cpp \ + $(WRAPPER_ROOT)/apps/JAWS/server/Parse_Headers.h .obj/VFS.o .shobj/VFS.so: VFS.cpp ../../JAWS/server/VFS.h ../../JAWS/server/JXH_List.h \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/ACE.h \ @@ -277,7 +338,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Log_Record.i \ $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Asynch_IO.h \ - ../../JAWS/server/HTTP_Handler.h ../../JAWS/server/HTTP_Request.h \ ../../JAWS/server/HTTP_Helpers.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ @@ -304,8 +364,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.i \ $(WRAPPER_ROOT)/ace/Message_Block.i \ diff --git a/apps/JAWS/stress_testing/Makefile b/apps/JAWS/stress_testing/Makefile index 3d895f92d59..058ba3deaf9 100644 --- a/apps/JAWS/stress_testing/Makefile +++ b/apps/JAWS/stress_testing/Makefile @@ -105,8 +105,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Shared_Object.i \ $(WRAPPER_ROOT)/ace/Service_Object.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -142,6 +142,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h @@ -200,8 +201,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Shared_Object.i \ $(WRAPPER_ROOT)/ace/Service_Object.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -237,6 +238,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h @@ -295,8 +297,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Shared_Object.i \ $(WRAPPER_ROOT)/ace/Service_Object.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -332,6 +334,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h @@ -390,8 +393,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Shared_Object.i \ $(WRAPPER_ROOT)/ace/Service_Object.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -427,6 +430,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ diff --git a/examples/ASX/CCM_App/Makefile b/examples/ASX/CCM_App/Makefile index 4c269d8619a..c64d7ec731d 100644 --- a/examples/ASX/CCM_App/Makefile +++ b/examples/ASX/CCM_App/Makefile @@ -74,8 +74,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -126,6 +126,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h @@ -162,8 +163,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -220,6 +221,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i \ $(WRAPPER_ROOT)/ace/Module.i \ diff --git a/examples/ASX/Event_Server/Event_Server/Makefile b/examples/ASX/Event_Server/Event_Server/Makefile index 658dca636bf..6aac6f5a222 100644 --- a/examples/ASX/Event_Server/Event_Server/Makefile +++ b/examples/ASX/Event_Server/Event_Server/Makefile @@ -141,8 +141,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -175,6 +175,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.h \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i \ $(WRAPPER_ROOT)/ace/Svc_Handler.i \ @@ -226,8 +227,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -283,6 +284,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i \ $(WRAPPER_ROOT)/ace/Module.i \ @@ -337,8 +339,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -382,6 +384,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i \ $(WRAPPER_ROOT)/ace/Module.i \ @@ -443,8 +446,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -495,6 +498,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ diff --git a/examples/ASX/UPIPE_Event_Server/Makefile b/examples/ASX/UPIPE_Event_Server/Makefile index 1c69394697a..84b11b17331 100644 --- a/examples/ASX/UPIPE_Event_Server/Makefile +++ b/examples/ASX/UPIPE_Event_Server/Makefile @@ -129,8 +129,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -184,6 +184,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i \ $(WRAPPER_ROOT)/ace/Module.i \ @@ -235,8 +236,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -293,6 +294,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i \ $(WRAPPER_ROOT)/ace/Module.i \ @@ -334,8 +336,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -390,6 +392,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i \ $(WRAPPER_ROOT)/ace/Module.i \ @@ -453,8 +456,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -505,6 +508,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ diff --git a/examples/Connection/misc/Makefile b/examples/Connection/misc/Makefile index 7a0d7000eb6..e69269f38ec 100644 --- a/examples/Connection/misc/Makefile +++ b/examples/Connection/misc/Makefile @@ -71,8 +71,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -123,6 +123,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -190,8 +191,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -242,6 +243,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ diff --git a/examples/Connection/non_blocking/Makefile b/examples/Connection/non_blocking/Makefile index fb43d0b5c17..1491a8b20ca 100644 --- a/examples/Connection/non_blocking/Makefile +++ b/examples/Connection/non_blocking/Makefile @@ -88,8 +88,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -140,6 +140,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -185,8 +186,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -237,6 +238,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -297,8 +299,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -336,6 +338,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -398,8 +401,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -437,6 +440,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -492,8 +496,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -538,6 +542,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -598,8 +603,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -643,6 +648,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -700,8 +706,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -748,6 +754,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -808,8 +815,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -856,6 +863,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ diff --git a/examples/IOStream/server/Makefile b/examples/IOStream/server/Makefile index 6ebef0662dd..9f2ed08a1f5 100644 --- a/examples/IOStream/server/Makefile +++ b/examples/IOStream/server/Makefile @@ -71,8 +71,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -123,6 +123,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ diff --git a/examples/IPC_SAP/UPIPE_SAP/Makefile b/examples/IPC_SAP/UPIPE_SAP/Makefile index 745d1aaac31..9bbbe4a684d 100644 --- a/examples/IPC_SAP/UPIPE_SAP/Makefile +++ b/examples/IPC_SAP/UPIPE_SAP/Makefile @@ -72,8 +72,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -130,6 +130,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i \ $(WRAPPER_ROOT)/ace/Module.i \ @@ -185,8 +186,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -243,6 +244,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i \ $(WRAPPER_ROOT)/ace/Module.i \ @@ -297,8 +299,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -355,6 +357,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i \ $(WRAPPER_ROOT)/ace/Module.i \ diff --git a/examples/Logger/simple-server/Makefile b/examples/Logger/simple-server/Makefile index 711c2ecd7ec..f0d0ad4d5a2 100644 --- a/examples/Logger/simple-server/Makefile +++ b/examples/Logger/simple-server/Makefile @@ -95,8 +95,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Thread.i \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ @@ -150,8 +150,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Thread.i \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ diff --git a/examples/Misc/Makefile b/examples/Misc/Makefile index 47be3e494de..91eef0973aa 100644 --- a/examples/Misc/Makefile +++ b/examples/Misc/Makefile @@ -137,8 +137,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -189,11 +189,26 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Read_Buffer.h \ $(WRAPPER_ROOT)/ace/Read_Buffer.i +.obj/test_set.o .shobj/test_set.so: test_set.cpp \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ + $(WRAPPER_ROOT)/ace/OS.h \ + $(WRAPPER_ROOT)/ace/config.h \ + $(WRAPPER_ROOT)/ace/stdcpp.h \ + $(WRAPPER_ROOT)/ace/OS.i \ + $(WRAPPER_ROOT)/ace/Trace.h \ + $(WRAPPER_ROOT)/ace/Log_Msg.h \ + $(WRAPPER_ROOT)/ace/Log_Record.h \ + $(WRAPPER_ROOT)/ace/Log_Priority.h \ + $(WRAPPER_ROOT)/ace/Log_Record.i \ + $(WRAPPER_ROOT)/ace/ACE.i \ + $(WRAPPER_ROOT)/ace/Containers.i .obj/test_sstring.o .shobj/test_sstring.so: test_sstring.cpp \ $(WRAPPER_ROOT)/ace/SString.h \ $(WRAPPER_ROOT)/ace/ACE.h \ @@ -233,8 +248,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Event_Handler.h \ $(WRAPPER_ROOT)/ace/Event_Handler.i \ $(WRAPPER_ROOT)/ace/Synch_T.i \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i .obj/test_XtReactor1.o .shobj/test_XtReactor1.so: test_XtReactor1.cpp \ $(WRAPPER_ROOT)/ace/XtReactor.h \ @@ -253,8 +268,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Handle_Set.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ - $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -267,10 +280,12 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ @@ -316,8 +331,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Handle_Set.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ - $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -330,10 +343,12 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ diff --git a/examples/Reactor/Dgram/Makefile b/examples/Reactor/Dgram/Makefile index 5500d340ad2..4c0efa06600 100644 --- a/examples/Reactor/Dgram/Makefile +++ b/examples/Reactor/Dgram/Makefile @@ -57,8 +57,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Handle_Set.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ - $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -71,10 +69,12 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ @@ -111,8 +111,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Handle_Set.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ - $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -125,10 +123,12 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ diff --git a/examples/Reactor/Misc/Makefile b/examples/Reactor/Misc/Makefile index 35d46bbf8da..07a7e1a548a 100644 --- a/examples/Reactor/Misc/Makefile +++ b/examples/Reactor/Misc/Makefile @@ -78,8 +78,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ @@ -130,8 +130,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -182,6 +182,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h @@ -217,8 +218,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -269,6 +270,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -321,8 +323,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Handle_Set.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ - $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -335,10 +335,12 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ @@ -389,6 +391,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -428,8 +431,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -480,6 +483,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h @@ -499,8 +503,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Handle_Set.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ - $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -513,10 +515,12 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ @@ -551,8 +555,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Timer_Heap.h \ $(WRAPPER_ROOT)/ace/Timer_Heap_T.h \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ - $(WRAPPER_ROOT)/ace/Time_Value.h \ + $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ $(WRAPPER_ROOT)/ace/stdcpp.h \ @@ -561,10 +565,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Log_Msg.h \ $(WRAPPER_ROOT)/ace/Log_Record.h \ $(WRAPPER_ROOT)/ace/Log_Priority.h \ - $(WRAPPER_ROOT)/ace/ACE.h \ - $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Log_Record.i \ - $(WRAPPER_ROOT)/ace/Synch.h \ + $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \ @@ -576,9 +578,11 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Timer_List.h \ $(WRAPPER_ROOT)/ace/Timer_List_T.h diff --git a/examples/Reactor/Ntalker/Makefile b/examples/Reactor/Ntalker/Makefile index e53da31c2ae..c791a401d00 100644 --- a/examples/Reactor/Ntalker/Makefile +++ b/examples/Reactor/Ntalker/Makefile @@ -68,8 +68,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Handle_Set.h \ $(WRAPPER_ROOT)/ace/Handle_Set.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ - $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -82,10 +80,12 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ @@ -130,6 +130,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h diff --git a/examples/Service_Configurator/IPC-tests/server/Makefile b/examples/Service_Configurator/IPC-tests/server/Makefile index 4074b0bef3b..33da318c8a9 100644 --- a/examples/Service_Configurator/IPC-tests/server/Makefile +++ b/examples/Service_Configurator/IPC-tests/server/Makefile @@ -90,8 +90,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -142,6 +142,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -198,8 +199,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -250,6 +251,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -306,8 +308,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -358,6 +360,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -412,8 +415,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -464,6 +467,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -522,8 +526,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -574,6 +578,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -632,8 +637,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -684,6 +689,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -734,8 +740,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -786,6 +792,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -836,8 +843,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -888,6 +895,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -936,8 +944,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -988,6 +996,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -1038,8 +1047,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -1090,6 +1099,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -1164,8 +1174,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -1209,6 +1219,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -1258,8 +1269,8 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -1310,6 +1321,7 @@ LDFLAGS += -L./ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h diff --git a/examples/Service_Configurator/Misc/Makefile b/examples/Service_Configurator/Misc/Makefile index f131d2f3260..fcbaadd8a6b 100644 --- a/examples/Service_Configurator/Misc/Makefile +++ b/examples/Service_Configurator/Misc/Makefile @@ -76,8 +76,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -128,6 +128,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h diff --git a/examples/Shared_Malloc/Makefile b/examples/Shared_Malloc/Makefile index 6ffa81b24c5..a45fad41356 100644 --- a/examples/Shared_Malloc/Makefile +++ b/examples/Shared_Malloc/Makefile @@ -78,8 +78,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ diff --git a/examples/System_V_IPC/SV_Message_Queues/Makefile b/examples/System_V_IPC/SV_Message_Queues/Makefile index 3b9973e8dc1..a82ade88701 100644 --- a/examples/System_V_IPC/SV_Message_Queues/Makefile +++ b/examples/System_V_IPC/SV_Message_Queues/Makefile @@ -68,8 +68,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/SV_Message_Queue.h \ $(WRAPPER_ROOT)/ace/SV_Message.h \ @@ -118,8 +118,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Typed_SV_Message_Queue.h \ $(WRAPPER_ROOT)/ace/SV_Message_Queue.h \ diff --git a/examples/System_V_IPC/SV_Semaphores/Makefile b/examples/System_V_IPC/SV_Semaphores/Makefile index 3b480189d65..31c6f36babe 100644 --- a/examples/System_V_IPC/SV_Semaphores/Makefile +++ b/examples/System_V_IPC/SV_Semaphores/Makefile @@ -71,8 +71,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -107,8 +107,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ diff --git a/examples/Threads/Makefile b/examples/Threads/Makefile index 4c845e88660..6ca8118174c 100644 --- a/examples/Threads/Makefile +++ b/examples/Threads/Makefile @@ -89,8 +89,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -141,6 +141,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -178,8 +179,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Shared_Object.i \ $(WRAPPER_ROOT)/ace/Service_Object.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -230,6 +231,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h @@ -274,8 +276,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -322,6 +324,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i .obj/future1.o .shobj/future1.so: future1.cpp \ @@ -365,8 +368,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -413,6 +416,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i \ $(WRAPPER_ROOT)/ace/Future.h \ @@ -461,8 +465,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -509,6 +513,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i \ $(WRAPPER_ROOT)/ace/Future.h \ @@ -548,8 +553,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -600,6 +605,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h @@ -635,8 +641,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -687,6 +693,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -717,8 +724,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i .obj/process_semaphore.o .shobj/process_semaphore.so: process_semaphore.cpp \ $(WRAPPER_ROOT)/ace/Synch.h \ @@ -745,8 +752,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i .obj/reader_writer.o .shobj/reader_writer.so: reader_writer.cpp \ $(WRAPPER_ROOT)/ace/Synch.h \ @@ -808,8 +815,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -860,6 +867,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -906,8 +914,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -954,6 +962,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i .obj/task_two.o .shobj/task_two.so: task_two.cpp \ @@ -997,8 +1006,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -1045,6 +1054,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i .obj/task_three.o .shobj/task_three.so: task_three.cpp \ @@ -1063,8 +1073,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/Handle_Set.i \ $(WRAPPER_ROOT)/ace/Timer_Queue.h \ - $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ - $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Synch.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \ $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \ @@ -1077,10 +1085,12 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ + $(WRAPPER_ROOT)/ace/Timer_Queue_T.h \ + $(WRAPPER_ROOT)/ace/Time_Value.h \ $(WRAPPER_ROOT)/ace/Timer_Queue_T.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Token.h \ $(WRAPPER_ROOT)/ace/Token.i \ @@ -1131,6 +1141,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -1179,8 +1190,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -1227,6 +1238,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i .obj/thread_manager.o .shobj/thread_manager.so: thread_manager.cpp \ @@ -1261,8 +1273,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -1313,6 +1325,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h @@ -1357,8 +1370,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -1405,6 +1418,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i .obj/thread_specific.o .shobj/thread_specific.so: thread_specific.cpp \ @@ -1439,8 +1453,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -1491,6 +1505,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h @@ -1526,8 +1541,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -1578,6 +1593,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -1626,8 +1642,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -1674,6 +1690,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i .obj/token.o .shobj/token.so: token.cpp \ @@ -1719,8 +1736,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -1765,6 +1782,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i diff --git a/netsvcs/clients/Naming/Client/Makefile b/netsvcs/clients/Naming/Client/Makefile index 7a503354826..1241d7be12e 100644 --- a/netsvcs/clients/Naming/Client/Makefile +++ b/netsvcs/clients/Naming/Client/Makefile @@ -82,8 +82,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -134,6 +134,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -179,8 +180,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -231,6 +232,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile b/netsvcs/clients/Naming/Dump_Restore/Makefile index 1f5dba9bef9..c24f3d30882 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Makefile +++ b/netsvcs/clients/Naming/Dump_Restore/Makefile @@ -82,8 +82,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -134,6 +134,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -180,8 +181,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -232,6 +233,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ diff --git a/netsvcs/clients/Tokens/collection/Makefile b/netsvcs/clients/Tokens/collection/Makefile index 9b5351bb989..6e105d66a15 100644 --- a/netsvcs/clients/Tokens/collection/Makefile +++ b/netsvcs/clients/Tokens/collection/Makefile @@ -69,8 +69,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ - $(WRAPPER_ROOT)/ace/Stack.h \ - $(WRAPPER_ROOT)/ace/Stack.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ $(WRAPPER_ROOT)/ace/Map_Manager.i \ @@ -106,8 +106,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Shared_Object.i \ $(WRAPPER_ROOT)/ace/Service_Object.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -144,6 +142,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/IO_Cntl_Msg.h \ $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h diff --git a/netsvcs/clients/Tokens/deadlock/Makefile b/netsvcs/clients/Tokens/deadlock/Makefile index 622278881ea..c467a76d1f9 100644 --- a/netsvcs/clients/Tokens/deadlock/Makefile +++ b/netsvcs/clients/Tokens/deadlock/Makefile @@ -70,8 +70,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Map_Manager.h \ $(WRAPPER_ROOT)/ace/Map_Manager.i \ $(WRAPPER_ROOT)/ace/Local_Tokens.h \ - $(WRAPPER_ROOT)/ace/Stack.h \ - $(WRAPPER_ROOT)/ace/Stack.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Local_Tokens.i \ $(WRAPPER_ROOT)/ace/Token_Manager.i \ diff --git a/netsvcs/clients/Tokens/invariant/Makefile b/netsvcs/clients/Tokens/invariant/Makefile index 3a448156060..daff6bc45af 100644 --- a/netsvcs/clients/Tokens/invariant/Makefile +++ b/netsvcs/clients/Tokens/invariant/Makefile @@ -76,8 +76,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Map_Manager.h \ $(WRAPPER_ROOT)/ace/Map_Manager.i \ $(WRAPPER_ROOT)/ace/Local_Tokens.h \ - $(WRAPPER_ROOT)/ace/Stack.h \ - $(WRAPPER_ROOT)/ace/Stack.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Local_Tokens.i \ $(WRAPPER_ROOT)/ace/Token_Invariants.i diff --git a/netsvcs/clients/Tokens/mutex/Makefile b/netsvcs/clients/Tokens/mutex/Makefile index 5eef34dc974..0df98b8f3b9 100644 --- a/netsvcs/clients/Tokens/mutex/Makefile +++ b/netsvcs/clients/Tokens/mutex/Makefile @@ -69,8 +69,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ - $(WRAPPER_ROOT)/ace/Stack.h \ - $(WRAPPER_ROOT)/ace/Stack.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ $(WRAPPER_ROOT)/ace/Map_Manager.i \ diff --git a/netsvcs/clients/Tokens/rw_lock/Makefile b/netsvcs/clients/Tokens/rw_lock/Makefile index c6eaf1b8f5c..7cb67d7405d 100644 --- a/netsvcs/clients/Tokens/rw_lock/Makefile +++ b/netsvcs/clients/Tokens/rw_lock/Makefile @@ -69,8 +69,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread.h \ $(WRAPPER_ROOT)/ace/Thread.i \ - $(WRAPPER_ROOT)/ace/Stack.h \ - $(WRAPPER_ROOT)/ace/Stack.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ $(WRAPPER_ROOT)/ace/Map_Manager.i \ diff --git a/netsvcs/lib/Makefile b/netsvcs/lib/Makefile index 479c6ff2844..dcc69e16df3 100644 --- a/netsvcs/lib/Makefile +++ b/netsvcs/lib/Makefile @@ -53,8 +53,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Log_Record.i \ $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SString.i \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Get_Opt.h \ $(WRAPPER_ROOT)/ace/Get_Opt.i \ TS_Server_Handler.h \ @@ -129,6 +129,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -178,8 +179,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -230,6 +231,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -283,8 +285,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -335,6 +337,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -356,7 +359,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/FIFO_Recv.i \ $(WRAPPER_ROOT)/ace/FIFO_Recv_Msg.i .obj/Name_Handler.o .shobj/Name_Handler.so: Name_Handler.cpp \ - $(WRAPPER_ROOT)/ace/Set.h \ + $(WRAPPER_ROOT)/ace/Containers.h \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ $(WRAPPER_ROOT)/ace/config.h \ @@ -368,7 +371,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Log_Priority.h \ $(WRAPPER_ROOT)/ace/Log_Record.i \ $(WRAPPER_ROOT)/ace/ACE.i \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Get_Opt.h \ $(WRAPPER_ROOT)/ace/Get_Opt.i \ Name_Handler.h \ @@ -443,6 +446,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -520,8 +524,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Thread_Manager.h \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -559,6 +563,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -605,8 +610,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -657,6 +662,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -670,8 +676,6 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/SOCK_Acceptor.h \ $(WRAPPER_ROOT)/ace/SOCK_Acceptor.i \ $(WRAPPER_ROOT)/ace/Local_Tokens.h \ - $(WRAPPER_ROOT)/ace/Stack.h \ - $(WRAPPER_ROOT)/ace/Stack.i \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ $(WRAPPER_ROOT)/ace/Map_Manager.i \ $(WRAPPER_ROOT)/ace/Local_Tokens.i \ diff --git a/netsvcs/servers/Makefile b/netsvcs/servers/Makefile index 3e8849a2c4d..0153036229d 100644 --- a/netsvcs/servers/Makefile +++ b/netsvcs/servers/Makefile @@ -72,8 +72,8 @@ CPPFLAGS += -I$(WRAPPER_ROOT)/netsvcs/lib $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -124,6 +124,7 @@ CPPFLAGS += -I$(WRAPPER_ROOT)/netsvcs/lib $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -162,8 +163,6 @@ CPPFLAGS += -I$(WRAPPER_ROOT)/netsvcs/lib $(WRAPPER_ROOT)/ace/Name_Space.h \ $(WRAPPER_ROOT)/netsvcs/lib/Token_Handler.h \ $(WRAPPER_ROOT)/ace/Local_Tokens.h \ - $(WRAPPER_ROOT)/ace/Stack.h \ - $(WRAPPER_ROOT)/ace/Stack.i \ $(WRAPPER_ROOT)/ace/Local_Tokens.i \ $(WRAPPER_ROOT)/ace/Token_Collection.h \ $(WRAPPER_ROOT)/ace/Token_Collection.i \ diff --git a/performance-tests/Misc/Makefile b/performance-tests/Misc/Makefile index 157060e88f5..bcb44fe19d0 100644 --- a/performance-tests/Misc/Makefile +++ b/performance-tests/Misc/Makefile @@ -83,8 +83,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Malloc_T.i \ $(WRAPPER_ROOT)/ace/Memory_Pool.h \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Mem_Map.h \ $(WRAPPER_ROOT)/ace/Mem_Map.i \ @@ -131,6 +131,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/Task_T.i \ $(WRAPPER_ROOT)/ace/High_Res_Timer.h \ @@ -200,8 +201,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ACE.i \ $(WRAPPER_ROOT)/ace/SString.i \ $(WRAPPER_ROOT)/ace/Naming_Context.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Service_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.h \ $(WRAPPER_ROOT)/ace/Shared_Object.i \ @@ -275,6 +276,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ diff --git a/performance-tests/Synch-Benchmarks/Makefile b/performance-tests/Synch-Benchmarks/Makefile index 393957f61c2..24aedb029bb 100644 --- a/performance-tests/Synch-Benchmarks/Makefile +++ b/performance-tests/Synch-Benchmarks/Makefile @@ -103,8 +103,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Shared_Object.i \ $(WRAPPER_ROOT)/ace/Service_Object.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -154,6 +154,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -207,8 +208,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Shared_Object.i \ $(WRAPPER_ROOT)/ace/Service_Object.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -258,6 +259,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -311,8 +313,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Shared_Object.i \ $(WRAPPER_ROOT)/ace/Service_Object.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -362,6 +364,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -416,8 +419,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Shared_Object.i \ $(WRAPPER_ROOT)/ace/Service_Object.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -467,6 +470,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -520,8 +524,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Shared_Object.i \ $(WRAPPER_ROOT)/ace/Service_Object.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -571,6 +575,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -624,8 +629,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Shared_Object.i \ $(WRAPPER_ROOT)/ace/Service_Object.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -675,6 +680,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -728,8 +734,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Shared_Object.i \ $(WRAPPER_ROOT)/ace/Service_Object.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -779,6 +785,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -832,8 +839,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Shared_Object.i \ $(WRAPPER_ROOT)/ace/Service_Object.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -883,6 +890,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -936,8 +944,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Shared_Object.i \ $(WRAPPER_ROOT)/ace/Service_Object.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -987,6 +995,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -1040,8 +1049,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Shared_Object.i \ $(WRAPPER_ROOT)/ace/Service_Object.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -1091,6 +1100,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -1145,8 +1155,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Shared_Object.i \ $(WRAPPER_ROOT)/ace/Service_Object.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -1196,6 +1206,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -1249,8 +1260,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Shared_Object.i \ $(WRAPPER_ROOT)/ace/Service_Object.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -1300,6 +1311,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -1378,8 +1390,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -1430,6 +1442,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ @@ -1475,8 +1488,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Synch_T.i \ $(WRAPPER_ROOT)/ace/Thread_Manager.i \ $(WRAPPER_ROOT)/ace/Signal.h \ - $(WRAPPER_ROOT)/ace/Set.h \ - $(WRAPPER_ROOT)/ace/Set.i \ + $(WRAPPER_ROOT)/ace/Containers.h \ + $(WRAPPER_ROOT)/ace/Containers.i \ $(WRAPPER_ROOT)/ace/Signal.i \ $(WRAPPER_ROOT)/ace/Service_Config.i \ $(WRAPPER_ROOT)/ace/Reactor.h \ @@ -1527,6 +1540,7 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Strategies.h \ $(WRAPPER_ROOT)/ace/Strategies_T.h \ $(WRAPPER_ROOT)/ace/Synch_Options.h \ + $(WRAPPER_ROOT)/ace/Hash_Map_Manager.h \ $(WRAPPER_ROOT)/ace/Message_Queue.i \ $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ diff --git a/tests/Makefile b/tests/Makefile index b2cffc66a50..1ac5e38cb82 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -361,7 +361,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/Connector.h \ $(WRAPPER_ROOT)/ace/Map_Manager.h \ $(WRAPPER_ROOT)/ace/Map_Manager.i \ - $(WRAPPER_ROOT)/ace/Connector.i test_config.h + $(WRAPPER_ROOT)/ace/Connector.i \ + test_config.h .obj/Future_Test.o .shobj/Future_Test.so: Future_Test.cpp \ $(WRAPPER_ROOT)/ace/ACE.h \ $(WRAPPER_ROOT)/ace/OS.h \ @@ -1771,7 +1772,8 @@ include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU $(WRAPPER_ROOT)/ace/ReactorEx.i \ $(WRAPPER_ROOT)/ace/Svc_Conf_Tokens.h \ $(WRAPPER_ROOT)/ace/Get_Opt.h \ - $(WRAPPER_ROOT)/ace/Get_Opt.i test_config.h + $(WRAPPER_ROOT)/ace/Get_Opt.i \ + test_config.h .obj/Recursive_Mutex_Test.o .shobj/Recursive_Mutex_Test.so: Recursive_Mutex_Test.cpp \ $(WRAPPER_ROOT)/ace/Service_Config.h \ $(WRAPPER_ROOT)/ace/Service_Object.h \ |