diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-08-13 01:01:54 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-08-13 01:01:54 +0000 |
| commit | 6ddf891228ec0d66cfb5c4f3e63755a9706131e8 (patch) | |
| tree | 3aca7b80fb3b727228fd51bcc7ed39520cb5229e | |
| parent | 0b22ee1ef6e7b10c52e9de7cb100fef0bdc20549 (diff) | |
| download | ATCD-6ddf891228ec0d66cfb5c4f3e63755a9706131e8.tar.gz | |
ChangeLogTag:Sun Aug 12 17:55:57 2001 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 48 | ||||
| -rw-r--r-- | TAO/tao/CodecFactory.h | 9 | ||||
| -rw-r--r-- | TAO/tao/CodecFactory_ORBInitializer.cpp | 17 | ||||
| -rw-r--r-- | TAO/tao/CodecFactory_ORBInitializer.h | 11 | ||||
| -rw-r--r-- | TAO/tao/Domain/Makefile | 5 | ||||
| -rw-r--r-- | TAO/tao/DynamicAny/Makefile | 32 | ||||
| -rw-r--r-- | TAO/tao/DynamicInterface/Makefile | 6 | ||||
| -rw-r--r-- | TAO/tao/IFR_Client/Makefile | 18 | ||||
| -rw-r--r-- | TAO/tao/IORManipulation/Makefile | 16 | ||||
| -rw-r--r-- | TAO/tao/IORTable/Makefile | 4 | ||||
| -rw-r--r-- | TAO/tao/Makefile | 2550 | ||||
| -rw-r--r-- | TAO/tao/Messaging_ORBInitializer.cpp | 76 | ||||
| -rw-r--r-- | TAO/tao/Messaging_ORBInitializer.h | 24 | ||||
| -rw-r--r-- | TAO/tao/Messaging_PolicyFactory.h | 4 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Makefile | 333 | ||||
| -rw-r--r-- | TAO/tao/RTCORBA/Makefile | 228 | ||||
| -rw-r--r-- | TAO/tao/Strategies/Makefile | 70 | ||||
| -rw-r--r-- | TAO/tao/TypeCodeFactory/Makefile | 2 | ||||
| -rw-r--r-- | TAO/tao/default_resource.cpp | 50 | ||||
| -rw-r--r-- | TAO/tao/default_resource.h | 33 | ||||
| -rw-r--r-- | TAO/tests/DLL_ORB/Test_Client_Module.cpp | 4 | ||||
| -rw-r--r-- | TAO/tests/DLL_ORB/Test_Server_Module.cpp | 8 | ||||
| -rw-r--r-- | TAO/tests/DLL_ORB/client.cpp | 2 |
23 files changed, 3022 insertions, 528 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 1d559bd8e1b..404eef12249 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,51 @@ +Sun Aug 12 17:55:57 2001 Ossama Othman <ossama@uci.edu> + + * tao/CodecFactory.h (TAO_CodecFactory): + * tao/Messaging_PolicyFactory.h (TAO_Messaging_PolicyFactory): + + Instances of these objects are now reference counted to make + sure they exist long enough for the ORB to release them. This + fixes some dynamic unloading problems. + + * tao/CodecFactory_ORBInitializer.h: + * tao/Messaging_ORBInitializer.h: + + Maintain a reference (i.e., a "_var") to the CodecFactory and + Messaging_PolicyFactory, respectively. They will be destroyed + when all outstanding references are released. + + * tao/CodecFactory_ORBInitializer.cpp (pre_init): + * tao/Messaging_ORBInitializer.cpp (register_policy_factories): + + Initialize a CodecFactory and Messaging_PolicyFactory, + respectively, on the heap. These instances are now reference + counted. + + * tao/default_resource.h (TAO_Default_Resource_Factory): + + No longer any need to inherit from ACE_Cleanup. The Service + Configurator will once again manage the default resource + factory's memory. + + * tao/default_resource.cpp: + + Removed code that was commented out during the previous changes + to this file. That code will not be used. + + * tests/DLL_ORB/Test_Client_Module.cpp: + + Removed "tabs" from this source file. + + * tests/DLL_ORB/Test_Server_Module.cpp (init): + + No longer any need to use the "-ORBSkipServiceConfigOpen" option + (at least for this single-threaded test). + + * tests/DLL_ORB/client.cpp (main): + + Removed debugging ORB debugging options. They shouldn't be in + "released" version of this test. + Sun Aug 12 08:46:01 2001 Balachandran Natarajan <bala@cs.wustl.edu> * tests/Native_Exceptions/test_i.cpp: Fixed warning with g++. diff --git a/TAO/tao/CodecFactory.h b/TAO/tao/CodecFactory.h index 63f76a7dae1..3e0c9f03508 100644 --- a/TAO/tao/CodecFactory.h +++ b/TAO/tao/CodecFactory.h @@ -39,12 +39,12 @@ * * @brief Implementation of the IOP::CodecFactory interface. * - * This class can be used to create Codec of a given type, such as a - * CDR encapsulation Codec. + * This class can be used to create Codec (coder/decoder) of a given + * type, such as a CDR encapsulation Codec. */ class TAO_Export TAO_CodecFactory : public virtual IOP::CodecFactory, - public virtual CORBA::LocalObject + public virtual TAO_Local_RefCounted_Object { public: @@ -53,7 +53,7 @@ public: /// Create a Coder/Decoder for the given type of encoding. virtual IOP::Codec_ptr create_codec (const IOP::Encoding & enc, - CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException, IOP::CodecFactory::UnknownEncoding)); @@ -75,4 +75,3 @@ private: #include "ace/post.h" #endif /* TAO_CODEC_FACTORY_H */ - diff --git a/TAO/tao/CodecFactory_ORBInitializer.cpp b/TAO/tao/CodecFactory_ORBInitializer.cpp index 1e386c94d55..236c04f8eb4 100644 --- a/TAO/tao/CodecFactory_ORBInitializer.cpp +++ b/TAO/tao/CodecFactory_ORBInitializer.cpp @@ -19,8 +19,23 @@ TAO_CodecFactory_ORBInitializer::pre_init ( // The CodecFactory is stateless and reentrant, so share a single // instance between all ORBs. + if (CORBA::is_nil (this->codec_factory_.in ())) + { + IOP::CodecFactory_ptr codec_factory; + ACE_NEW_THROW_EX (codec_factory, + TAO_CodecFactory, + CORBA::NO_MEMORY ( + CORBA::SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + ENOMEM), + CORBA::COMPLETED_NO)); + ACE_CHECK; + + this->codec_factory_ = codec_factory; + } + info->register_initial_reference ("CodecFactory", - &(this->codec_factory_), + this->codec_factory_.in (), ACE_TRY_ENV); ACE_CHECK; } diff --git a/TAO/tao/CodecFactory_ORBInitializer.h b/TAO/tao/CodecFactory_ORBInitializer.h index bbaf3fc8f0e..ac074a0a392 100644 --- a/TAO/tao/CodecFactory_ORBInitializer.h +++ b/TAO/tao/CodecFactory_ORBInitializer.h @@ -24,7 +24,7 @@ #include "PortableInterceptorC.h" #include "LocalObject.h" -#include "CodecFactory.h" +#include "IOPC.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -61,9 +61,12 @@ public: private: /// Instance of the IOP::CodecFactory. - /// The CodecFactory is stateless and reentrant, so share a single - /// instance between all ORBs. - TAO_CodecFactory codec_factory_; + /** + * The CodecFactory is stateless and reentrant, so share a single + * instance between all ORBs. + */ + IOP::CodecFactory_var codec_factory_; + }; #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/tao/Domain/Makefile b/TAO/tao/Domain/Makefile index 20d90a32d6d..093fa34eb6e 100644 --- a/TAO/tao/Domain/Makefile +++ b/TAO/tao/Domain/Makefile @@ -50,7 +50,8 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/DomainS.o .obj/DomainS.so .shobj/DomainS.o .shobj/DomainS.so: DomainS.cpp DomainS.h \ - $(ACE_ROOT)/ace/pre.h domain_export.h \ + $(ACE_ROOT)/ace/pre.h \ + domain_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -377,6 +378,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ diff --git a/TAO/tao/DynamicAny/Makefile b/TAO/tao/DynamicAny/Makefile index a9a5f2a91ad..e3b3cfcd8ac 100644 --- a/TAO/tao/DynamicAny/Makefile +++ b/TAO/tao/DynamicAny/Makefile @@ -274,8 +274,8 @@ CPPFLAGS += -I$(TAO_ROOT) DynamicAnyC.i DynAnyFactory.h .obj/DynAnyFactory.o .obj/DynAnyFactory.so .shobj/DynAnyFactory.o .shobj/DynAnyFactory.so: DynAnyFactory.cpp DynAnyFactory.h \ - $(ACE_ROOT)/ace/pre.h DynamicAny.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h \ + DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -497,8 +497,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Auto_Ptr.cpp .obj/DynCommon.o .obj/DynCommon.so .shobj/DynCommon.o .shobj/DynCommon.so: DynCommon.cpp DynCommon.h \ - $(ACE_ROOT)/ace/pre.h DynamicAny.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h \ + DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -717,8 +717,8 @@ CPPFLAGS += -I$(TAO_ROOT) DynEnum_i.h DynSequence_i.h DynStruct_i.h DynUnion_i.h .obj/DynAny_i.o .obj/DynAny_i.so .shobj/DynAny_i.o .shobj/DynAny_i.so: DynAny_i.cpp DynAny_i.h \ - $(ACE_ROOT)/ace/pre.h DynamicAny.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h \ + DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -928,8 +928,8 @@ CPPFLAGS += -I$(TAO_ROOT) DynamicAnyC.i DynCommon.h DynAnyFactory.h .obj/DynStruct_i.o .obj/DynStruct_i.so .shobj/DynStruct_i.o .shobj/DynStruct_i.so: DynStruct_i.cpp DynStruct_i.h \ - $(ACE_ROOT)/ace/pre.h DynamicAny.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h \ + DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1150,8 +1150,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Marshal.i .obj/DynSequence_i.o .obj/DynSequence_i.so .shobj/DynSequence_i.o .shobj/DynSequence_i.so: DynSequence_i.cpp DynSequence_i.h \ - $(ACE_ROOT)/ace/pre.h DynamicAny.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h \ + DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1372,8 +1372,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Marshal.i .obj/DynEnum_i.o .obj/DynEnum_i.so .shobj/DynEnum_i.o .shobj/DynEnum_i.so: DynEnum_i.cpp DynEnum_i.h \ - $(ACE_ROOT)/ace/pre.h DynamicAny.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h \ + DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1592,8 +1592,8 @@ CPPFLAGS += -I$(TAO_ROOT) DynAnyFactory.h .obj/DynArray_i.o .obj/DynArray_i.so .shobj/DynArray_i.o .shobj/DynArray_i.so: DynArray_i.cpp DynArray_i.h \ - $(ACE_ROOT)/ace/pre.h DynamicAny.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h \ + DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1814,8 +1814,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Marshal.i .obj/DynUnion_i.o .obj/DynUnion_i.so .shobj/DynUnion_i.o .shobj/DynUnion_i.so: DynUnion_i.cpp DynUnion_i.h \ - $(ACE_ROOT)/ace/pre.h DynamicAny.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h \ + DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ diff --git a/TAO/tao/DynamicInterface/Makefile b/TAO/tao/DynamicInterface/Makefile index 6416e6b42f5..2b65d2bec03 100644 --- a/TAO/tao/DynamicInterface/Makefile +++ b/TAO/tao/DynamicInterface/Makefile @@ -456,6 +456,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ @@ -1099,6 +1101,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ @@ -1782,6 +1786,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ diff --git a/TAO/tao/IFR_Client/Makefile b/TAO/tao/IFR_Client/Makefile index f475ae370df..668a2bdaa90 100644 --- a/TAO/tao/IFR_Client/Makefile +++ b/TAO/tao/IFR_Client/Makefile @@ -310,6 +310,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ @@ -334,8 +336,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl .obj/IFR_BasicC.o .obj/IFR_BasicC.so .shobj/IFR_BasicC.o .shobj/IFR_BasicC.so: IFR_BasicC.cpp IFR_BasicC.h \ - $(ACE_ROOT)/ace/pre.h IFR_BaseC.h \ - ifr_client_export.h \ + $(ACE_ROOT)/ace/pre.h \ + IFR_BaseC.h ifr_client_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -590,6 +592,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ @@ -614,8 +618,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl .obj/IFR_ExtendedC.o .obj/IFR_ExtendedC.so .shobj/IFR_ExtendedC.o .shobj/IFR_ExtendedC.so: IFR_ExtendedC.cpp IFR_ExtendedC.h \ - $(ACE_ROOT)/ace/pre.h IFR_BasicC.h \ - IFR_BaseC.h ifr_client_export.h \ + $(ACE_ROOT)/ace/pre.h \ + IFR_BasicC.h IFR_BaseC.h ifr_client_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -870,6 +874,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ @@ -1151,6 +1157,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ @@ -1434,6 +1442,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ diff --git a/TAO/tao/IORManipulation/Makefile b/TAO/tao/IORManipulation/Makefile index 08347da8ac3..b2781b0905a 100644 --- a/TAO/tao/IORManipulation/Makefile +++ b/TAO/tao/IORManipulation/Makefile @@ -181,7 +181,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - IORC.h $(TAO_ROOT)/tao/Object.h \ + IORC.h \ + $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ @@ -197,7 +198,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i IORC.i \ + $(TAO_ROOT)/tao/CDR.i \ + IORC.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ @@ -341,7 +343,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - IORC.h $(TAO_ROOT)/tao/Object.h \ + IORC.h \ + $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ @@ -357,8 +360,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i IORC.i \ - IORManipulation.h \ + $(TAO_ROOT)/tao/CDR.i \ + IORC.i IORManipulation.h \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i @@ -507,7 +510,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i IORC.i \ + $(TAO_ROOT)/tao/CDR.i \ + IORC.i \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ diff --git a/TAO/tao/IORTable/Makefile b/TAO/tao/IORTable/Makefile index 0b7963d84ec..43b9e60b995 100644 --- a/TAO/tao/IORTable/Makefile +++ b/TAO/tao/IORTable/Makefile @@ -715,8 +715,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB_Core.i .obj/IOR_Table_Impl.o .obj/IOR_Table_Impl.so .shobj/IOR_Table_Impl.o .shobj/IOR_Table_Impl.so: IOR_Table_Impl.cpp IOR_Table_Impl.h \ - $(ACE_ROOT)/ace/pre.h IORTable.h \ - iortable_export.h \ + $(ACE_ROOT)/ace/pre.h \ + IORTable.h iortable_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index e44caa86033..1e49a86221f 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -753,7 +753,8 @@ realclean: target_specification.i .obj/Transport.o .obj/Transport.so .shobj/Transport.o .shobj/Transport.so: Transport.cpp Transport.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -1046,9 +1047,9 @@ realclean: Pluggable_Messaging.h \ Pluggable_Messaging_Utils.h \ Pluggable_Messaging.i \ - Synch_Queued_Message.h Queued_Message.h Queued_Message.inl \ - Asynch_Queued_Message.h Flushing_Strategy.h debug.h Resume_Handle.h \ - Resume_Handle.inl + Synch_Queued_Message.h Queued_Message.h LF_Event.h LF_Event.inl \ + Queued_Message.inl Asynch_Queued_Message.h Flushing_Strategy.h \ + debug.h Resume_Handle.h Resume_Handle.inl .obj/Incoming_Message_Queue.o .obj/Incoming_Message_Queue.so .shobj/Incoming_Message_Queue.o .shobj/Incoming_Message_Queue.so: Incoming_Message_Queue.cpp \ Incoming_Message_Queue.h \ @@ -1284,7 +1285,8 @@ realclean: ORB_Core.i debug.h .obj/Resume_Handle.o .obj/Resume_Handle.so .shobj/Resume_Handle.o .shobj/Resume_Handle.so: Resume_Handle.cpp Resume_Handle.h \ - $(ACE_ROOT)/ace/pre.h TAO_Export.h \ + $(ACE_ROOT)/ace/pre.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1379,8 +1381,8 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i ORB.h \ - Exception.h \ + corbafwd.i \ + ORB.h Exception.h \ corbafwd.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ @@ -1516,7 +1518,8 @@ realclean: ORB_Core.i .obj/Profile.o .obj/Profile.so .shobj/Profile.o .shobj/Profile.so: Profile.cpp Profile.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -1763,7 +1766,8 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Stub.i debug.h + Stub.i \ + debug.h .obj/Endpoint.o .obj/Endpoint.so .shobj/Endpoint.o .shobj/Endpoint.so: Endpoint.cpp \ Endpoint.h \ @@ -4318,7 +4322,9 @@ realclean: GIOP_Utils.i \ GIOP_Message_State.h \ GIOP_Message_State.inl \ - GIOP_Message_Base.i + GIOP_Message_Base.i \ + GIOP_Message_Lite.h \ + GIOP_Message_Lite.i .obj/IIOP_Connector.o .obj/IIOP_Connector.so .shobj/IIOP_Connector.o .shobj/IIOP_Connector.so: IIOP_Connector.cpp \ IIOP_Connector.h \ @@ -4673,6 +4679,8 @@ realclean: Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ TAOC.h \ TAOC.i \ operation_details.h \ @@ -5284,8 +5292,8 @@ realclean: IIOP_Transport.i \ IIOP_Connection_Handler.i \ Timeprobe.h \ - $(ACE_ROOT)/ace/Timeprobe.h debug.h \ - ORB_Core.h corbafwd.h ORB.h Exception.h Services.h \ + $(ACE_ROOT)/ace/Timeprobe.h \ + debug.h ORB_Core.h corbafwd.h ORB.h Exception.h Services.h \ Services.i \ CORBA_String.h \ CORBA_String.inl \ @@ -6363,11 +6371,24 @@ realclean: Reactive_Flushing_Strategy.h \ Flushing_Strategy.h \ Block_Flushing_Strategy.h \ + Leader_Follower_Flushing_Strategy.h \ Leader_Follower.h \ + LF_Follower.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.inl \ + $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \ + LF_Follower.inl \ + $(ACE_ROOT)/ace/Intrusive_List.h \ + $(ACE_ROOT)/ace/Intrusive_List.inl \ + $(ACE_ROOT)/ace/Intrusive_List.cpp \ Leader_Follower.i \ LRU_Connection_Purging_Strategy.h \ Connection_Purging_Strategy.h \ Connection_Purging_Strategy.inl \ + LF_Strategy_Complete.h \ + LF_Strategy.h \ + LF_Strategy.inl \ + LF_Strategy_Complete.inl \ $(ACE_ROOT)/ace/TP_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor_T.h \ @@ -8568,6 +8589,8 @@ realclean: Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ TAOC.h \ TAOC.i \ operation_details.h \ @@ -8592,7 +8615,8 @@ realclean: $(ACE_ROOT)/ace/Dynamic_Service.cpp .obj/LocalObject.o .obj/LocalObject.so .shobj/LocalObject.o .shobj/LocalObject.so: LocalObject.cpp LocalObject.h \ - $(ACE_ROOT)/ace/pre.h Object.h \ + $(ACE_ROOT)/ace/pre.h \ + Object.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ @@ -8706,7 +8730,8 @@ realclean: Sequence_T.i \ Sequence_T.cpp \ Environment.h \ - CDR.h $(ACE_ROOT)/ace/CDR_Stream.h \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ Remote_Object_Proxy_Impl.h CurrentC.h \ @@ -8852,7 +8877,8 @@ realclean: Any.i .obj/ORB.o .obj/ORB.so .shobj/ORB.o .shobj/ORB.so: ORB.cpp ORB.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -8977,7 +9003,8 @@ realclean: Object.i \ CurrentC.i \ PolicyC.i \ - ORB.i ORB_Table.h \ + ORB.i \ + ORB_Table.h \ TAO_Singleton.h \ TAO_Singleton.inl \ TAO_Singleton.cpp \ @@ -9112,17 +9139,15 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Stub.i ORB_Core.h \ - Server_Strategy_Factory.h debug.h TAO_Internal.h NVList.h \ + Stub.i \ + ORB_Core.h Server_Strategy_Factory.h debug.h TAO_Internal.h NVList.h \ NVList.i \ Dynamic_Adapter.h MProfile.h ORBInitInfo.h PortableInterceptorC.h \ LocalObject.h StringSeqC.h StringSeqC.i CodecFactory.h IOPC.h \ ORBInitInfo.inl ORBInitializer_Registry.h TAO_Singleton.h \ ORBInitializer_Registry.inl \ CodecFactory_ORBInitializer.h TypeCodeFactory_Adapter.h \ - Messaging_ORBInitializer.h \ - Messaging_PolicyFactory.h \ - ValueFactory_Map.h \ + Messaging_ORBInitializer.h ValueFactory_Map.h \ ValueFactory_Map.i \ Object_KeyC.h \ Object_KeyC.i \ @@ -9257,7 +9282,8 @@ realclean: corbafwd.i .obj/PolicyC.o .obj/PolicyC.so .shobj/PolicyC.o .shobj/PolicyC.so: PolicyC.cpp PolicyC.h \ - $(ACE_ROOT)/ace/pre.h TAO_Export.h \ + $(ACE_ROOT)/ace/pre.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -9354,7 +9380,8 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - Exception.h $(ACE_ROOT)/ace/SString.h \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ Exception.i \ Environment.h \ @@ -9368,7 +9395,8 @@ realclean: Sequence_T.i \ Sequence_T.cpp \ Environment.h \ - CDR.h $(ACE_ROOT)/ace/CDR_Stream.h \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ Remote_Object_Proxy_Impl.h \ @@ -9516,6 +9544,8 @@ realclean: Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ TAOC.h \ TAOC.i \ operation_details.h \ @@ -10293,6 +10323,8 @@ realclean: Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ TAOC.h \ TAOC.i \ operation_details.h \ @@ -10424,7 +10456,8 @@ realclean: Sequence_T.i \ Sequence_T.cpp \ Environment.h \ - CDR.h $(ACE_ROOT)/ace/CDR_Stream.h \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ Remote_Object_Proxy_Impl.h \ @@ -10435,7 +10468,8 @@ realclean: Object.i \ CurrentC.i \ PolicyC.i \ - DomainC.i Stub.h \ + DomainC.i \ + Stub.h \ Pluggable.h \ Typecode.h \ Exception.h \ @@ -10572,6 +10606,8 @@ realclean: Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ TAOC.h \ TAOC.i \ operation_details.h \ @@ -10856,6 +10892,8 @@ realclean: Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ TAOC.h \ TAOC.i \ operation_details.h \ @@ -11333,7 +11371,8 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - Endpoint.i Stub.h \ + Endpoint.i \ + Stub.h \ Pluggable.h \ Sequence.h \ Managed_Types.h \ @@ -11487,10 +11526,12 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Stub.i Sequence.h \ - Object.h Invocation.h CDR.h Any.h Synch_Reply_Dispatcher.h \ + Stub.i \ + Sequence.h Object.h Invocation.h CDR.h Any.h Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ TAOC.h TAOC.i operation_details.h corbafwd.h Service_Context.h \ Service_Context.inl \ target_specification.h \ @@ -11550,7 +11591,8 @@ realclean: Buffering_Constraint_Policy.i \ Messaging_Policy_i.h \ Messaging_Policy_i.i \ - debug.h $(ACE_ROOT)/ace/Auto_Ptr.h \ + debug.h \ + $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp @@ -12717,7 +12759,8 @@ realclean: Typecode.i .obj/Protocols_Hooks.o .obj/Protocols_Hooks.so .shobj/Protocols_Hooks.o .shobj/Protocols_Hooks.so: Protocols_Hooks.cpp Protocols_Hooks.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -12959,7 +13002,8 @@ realclean: Sequence_T.i \ Sequence_T.cpp \ Environment.h \ - CDR.h $(ACE_ROOT)/ace/CDR_Stream.h \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ Remote_Object_Proxy_Impl.h \ @@ -13074,7 +13118,8 @@ realclean: corbafwd.i \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i Stub.h \ + CDR.i \ + Stub.h \ Pluggable.h \ Sequence.h \ Managed_Types.h \ @@ -13225,10 +13270,12 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Stub.i Any.h \ - Synch_Reply_Dispatcher.h \ + Stub.i \ + Any.h Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ TAOC.h TAOC.i operation_details.h corbafwd.h Service_Context.h \ Service_Context.inl \ target_specification.h \ @@ -13554,6 +13601,8 @@ realclean: Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ TAOC.h \ TAOC.i \ operation_details.h \ @@ -13829,6 +13878,8 @@ realclean: Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ TAOC.h \ TAOC.i \ operation_details.h \ @@ -14023,7 +14074,8 @@ realclean: operation_details.i .obj/ClientRequestInfo.o .obj/ClientRequestInfo.so .shobj/ClientRequestInfo.o .shobj/ClientRequestInfo.so: ClientRequestInfo.cpp ClientRequestInfo.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -14271,6 +14323,8 @@ realclean: Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ TAOC.h \ TimeBaseC.h \ TAOC.i operation_details.h target_specification.h \ @@ -14282,7 +14336,8 @@ realclean: Invocation.i Tagged_Components.h debug.h .obj/RequestInfo_Util.o .obj/RequestInfo_Util.so .shobj/RequestInfo_Util.o .shobj/RequestInfo_Util.so: RequestInfo_Util.cpp RequestInfo_Util.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -14408,7 +14463,8 @@ realclean: .obj/ClientInterceptorAdapter.o .obj/ClientInterceptorAdapter.so .shobj/ClientInterceptorAdapter.o .shobj/ClientInterceptorAdapter.so: ClientInterceptorAdapter.cpp \ ClientInterceptorAdapter.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -14656,6 +14712,8 @@ realclean: Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ TAOC.h \ TimeBaseC.h \ TAOC.i operation_details.h target_specification.h \ @@ -14668,7 +14726,8 @@ realclean: .obj/PortableInterceptorC.o .obj/PortableInterceptorC.so .shobj/PortableInterceptorC.o .shobj/PortableInterceptorC.so: PortableInterceptorC.cpp \ PortableInterceptorC.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -14943,7 +15002,8 @@ realclean: StringSeqC.i .obj/OctetSeqC.o .obj/OctetSeqC.so .shobj/OctetSeqC.o .shobj/OctetSeqC.so: OctetSeqC.cpp OctetSeqC.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -15064,8 +15124,8 @@ realclean: $(ACE_ROOT)/ace/SString.i \ Exception.i \ Typecode.i \ - Any.i CDR.h \ - Typecode.h ORB_Core.h ORB.h Exception.h Services.h \ + Any.i \ + CDR.h Typecode.h ORB_Core.h ORB.h Exception.h Services.h \ Services.i \ CORBA_String.h \ CORBA_String.inl \ @@ -15174,7 +15234,8 @@ realclean: ORB_Core.i .obj/StringSeqC.o .obj/StringSeqC.so .shobj/StringSeqC.o .shobj/StringSeqC.so: StringSeqC.cpp StringSeqC.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -15295,11 +15356,12 @@ realclean: $(ACE_ROOT)/ace/SString.i \ Exception.i \ Typecode.i \ - Any.i CDR.h \ - Typecode.h + Any.i \ + CDR.h Typecode.h .obj/ORB_Core.o .obj/ORB_Core.so .shobj/ORB_Core.o .shobj/ORB_Core.so: ORB_Core.cpp ORB_Core.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -15393,8 +15455,8 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i ORB.h \ - Exception.h \ + corbafwd.i \ + ORB.h Exception.h \ corbafwd.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ @@ -15547,7 +15609,8 @@ realclean: GIOP_Message_Version.h \ GIOP_Message_Version.inl \ Profile.i \ - MProfile.i Stub.h \ + MProfile.i \ + Stub.h \ MProfile.h \ ORB.h \ ORB_Core.h \ @@ -15555,6 +15618,14 @@ realclean: Reactor_Registry.h \ Reactor_Registry.i \ Leader_Follower.h \ + LF_Follower.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.inl \ + $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \ + LF_Follower.inl \ + $(ACE_ROOT)/ace/Intrusive_List.h \ + $(ACE_ROOT)/ace/Intrusive_List.inl \ + $(ACE_ROOT)/ace/Intrusive_List.cpp \ Leader_Follower.i \ Transport_Cache_Manager.h \ Cache_Entries.h \ @@ -15607,17 +15678,11 @@ realclean: Sync_Strategies.i \ Object_Loader.h Object_Loader.i ObjectIDList.h \ ObjectIDList.i \ - $(ACE_ROOT)/ace/Env_Value_T.h \ - $(ACE_ROOT)/ace/Env_Value_T.i \ - $(ACE_ROOT)/ace/Env_Value_T.cpp \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ - $(ACE_ROOT)/ace/Dynamic_Service.i \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(ACE_ROOT)/ace/Arg_Shifter.h \ Services_Activate.h Invocation.h Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ TAOC.h operation_details.h Service_Context.h \ Service_Context.inl \ target_specification.h \ @@ -15634,7 +15699,19 @@ realclean: Default_Protocols_Hooks.i \ IORInfo.h LocalObject.h Flushing_Strategy.h \ POA_Extension_Initializer.h Buffering_Constraint_Policy.h \ - Buffering_Constraint_Policy.i + Buffering_Constraint_Policy.i \ + LF_Event_Loop_Thread_Helper.h \ + LF_Strategy.h \ + LF_Strategy.inl \ + LF_Event_Loop_Thread_Helper.inl \ + $(ACE_ROOT)/ace/Env_Value_T.h \ + $(ACE_ROOT)/ace/Env_Value_T.i \ + $(ACE_ROOT)/ace/Env_Value_T.cpp \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ + $(ACE_ROOT)/ace/Dynamic_Service.i \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(ACE_ROOT)/ace/Arg_Shifter.h .obj/Stub_Factory.o .obj/Stub_Factory.so .shobj/Stub_Factory.o .shobj/Stub_Factory.so: Stub_Factory.cpp Stub_Factory.h \ $(ACE_ROOT)/ace/pre.h \ @@ -15881,8 +15958,8 @@ realclean: try_macros.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ - corbafwd.i ORB.h \ - Exception.h \ + corbafwd.i \ + ORB.h Exception.h \ corbafwd.h \ Exception.i \ Services.h \ @@ -15974,11 +16051,1067 @@ realclean: $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i -.obj/Leader_Follower.o .obj/Leader_Follower.so .shobj/Leader_Follower.o .shobj/Leader_Follower.so: Leader_Follower.cpp Leader_Follower.h \ +.obj/LF_Follower.o .obj/LF_Follower.so .shobj/LF_Follower.o .shobj/LF_Follower.so: LF_Follower.cpp \ + LF_Follower.h \ $(ACE_ROOT)/ace/pre.h \ + orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + TAO_Export.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Intrusive_List_Node.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.inl \ + $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \ + LF_Follower.inl \ + Leader_Follower.h \ ORB_Core.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + corbafwd.i \ + ORB.h \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ + Services.h \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + Environment.h \ + Environment.i \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + PolicyC.h \ + Encodable.h \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i \ + Remote_Object_Proxy_Impl.h \ + Object_Proxy_Impl.h \ + CurrentC.h \ + Object.h \ + Object_Proxy_Broker.h \ + Object.i \ + CurrentC.i \ + PolicyC.i \ + ORB.i \ + Policy_Manager.h \ + Policy_Set.h \ + Policy_Set.i \ + LocalObject.h \ + LocalObject.i \ + debug.h \ + Policy_Manager.i \ + Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + Pluggable.h \ + Typecode.h \ + Typecode.i \ + IOPC.h \ + Any.h \ + Any.i \ + IOPC.i \ + Pluggable.i \ + Protocol_Factory.h \ + params.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + Adapter.h \ + Adapter.i \ + PolicyFactory_Registry.h \ + PortableInterceptorC.h \ + DynamicC.h \ + DynamicC.i \ + MessagingC.h \ + ValueBase.h \ + ValueBase.i \ + ValueFactory.h \ + ValueFactory.i \ + TimeBaseC.h \ + SmartProxies/Smart_Proxies.h \ + SmartProxies/smartproxies_export.h \ + SmartProxies/Smart_Proxies.inl \ + TimeBaseC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i \ + PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + Parser_Registry.h \ + Parser_Registry.i \ + Service_Callbacks.h \ + Service_Callbacks.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ + Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + Cleanup_Func_Registry.inl \ + Object_Ref_Table.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + Interceptor_List.h \ + Interceptor_List.inl \ + Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + ORB_Core.i \ + $(ACE_ROOT)/ace/Intrusive_List.h \ + $(ACE_ROOT)/ace/Intrusive_List.inl \ + $(ACE_ROOT)/ace/Intrusive_List.cpp \ + Leader_Follower.i + +.obj/LF_Follower_Auto_Ptr.o .obj/LF_Follower_Auto_Ptr.so .shobj/LF_Follower_Auto_Ptr.o .shobj/LF_Follower_Auto_Ptr.so: LF_Follower_Auto_Ptr.cpp \ + LF_Follower_Auto_Ptr.h \ + $(ACE_ROOT)/ace/pre.h \ + orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + Leader_Follower.h \ + LF_Follower.h \ + TAO_Export.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Intrusive_List_Node.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.inl \ + $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \ + LF_Follower.inl \ + ORB_Core.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + corbafwd.i \ + ORB.h \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ + Services.h \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + Environment.h \ + Environment.i \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + PolicyC.h \ + Encodable.h \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i \ + Remote_Object_Proxy_Impl.h \ + Object_Proxy_Impl.h \ + CurrentC.h \ + Object.h \ + Object_Proxy_Broker.h \ + Object.i \ + CurrentC.i \ + PolicyC.i \ + ORB.i \ + Policy_Manager.h \ + Policy_Set.h \ + Policy_Set.i \ + LocalObject.h \ + LocalObject.i \ + debug.h \ + Policy_Manager.i \ + Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + Pluggable.h \ + Typecode.h \ + Typecode.i \ + IOPC.h \ + Any.h \ + Any.i \ + IOPC.i \ + Pluggable.i \ + Protocol_Factory.h \ + params.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + Adapter.h \ + Adapter.i \ + PolicyFactory_Registry.h \ + PortableInterceptorC.h \ + DynamicC.h \ + DynamicC.i \ + MessagingC.h \ + ValueBase.h \ + ValueBase.i \ + ValueFactory.h \ + ValueFactory.i \ + TimeBaseC.h \ + SmartProxies/Smart_Proxies.h \ + SmartProxies/smartproxies_export.h \ + SmartProxies/Smart_Proxies.inl \ + TimeBaseC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i \ + PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + Parser_Registry.h \ + Parser_Registry.i \ + Service_Callbacks.h \ + Service_Callbacks.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ + Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + Cleanup_Func_Registry.inl \ + Object_Ref_Table.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + Interceptor_List.h \ + Interceptor_List.inl \ + Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + ORB_Core.i \ + $(ACE_ROOT)/ace/Intrusive_List.h \ + $(ACE_ROOT)/ace/Intrusive_List.inl \ + $(ACE_ROOT)/ace/Intrusive_List.cpp \ + Leader_Follower.i \ + LF_Follower_Auto_Ptr.inl + +.obj/LF_Follower_Auto_Adder.o .obj/LF_Follower_Auto_Adder.so .shobj/LF_Follower_Auto_Adder.o .shobj/LF_Follower_Auto_Adder.so: LF_Follower_Auto_Adder.cpp \ + LF_Follower_Auto_Adder.h \ + $(ACE_ROOT)/ace/pre.h \ + orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + Leader_Follower.h \ + LF_Follower.h \ + TAO_Export.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Intrusive_List_Node.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.inl \ + $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \ + LF_Follower.inl \ + ORB_Core.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + corbafwd.i \ + ORB.h \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ + Services.h \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + Environment.h \ + Environment.i \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + PolicyC.h \ + Encodable.h \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i \ + Remote_Object_Proxy_Impl.h \ + Object_Proxy_Impl.h \ + CurrentC.h \ + Object.h \ + Object_Proxy_Broker.h \ + Object.i \ + CurrentC.i \ + PolicyC.i \ + ORB.i \ + Policy_Manager.h \ + Policy_Set.h \ + Policy_Set.i \ + LocalObject.h \ + LocalObject.i \ + debug.h \ + Policy_Manager.i \ + Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + Pluggable.h \ + Typecode.h \ + Typecode.i \ + IOPC.h \ + Any.h \ + Any.i \ + IOPC.i \ + Pluggable.i \ + Protocol_Factory.h \ + params.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + Adapter.h \ + Adapter.i \ + PolicyFactory_Registry.h \ + PortableInterceptorC.h \ + DynamicC.h \ + DynamicC.i \ + MessagingC.h \ + ValueBase.h \ + ValueBase.i \ + ValueFactory.h \ + ValueFactory.i \ + TimeBaseC.h \ + SmartProxies/Smart_Proxies.h \ + SmartProxies/smartproxies_export.h \ + SmartProxies/Smart_Proxies.inl \ + TimeBaseC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i \ + PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + Parser_Registry.h \ + Parser_Registry.i \ + Service_Callbacks.h \ + Service_Callbacks.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ + Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + Cleanup_Func_Registry.inl \ + Object_Ref_Table.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + Interceptor_List.h \ + Interceptor_List.inl \ + Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + ORB_Core.i \ + $(ACE_ROOT)/ace/Intrusive_List.h \ + $(ACE_ROOT)/ace/Intrusive_List.inl \ + $(ACE_ROOT)/ace/Intrusive_List.cpp \ + Leader_Follower.i \ + LF_Follower_Auto_Adder.inl + +.obj/Leader_Follower.o .obj/Leader_Follower.so .shobj/Leader_Follower.o .shobj/Leader_Follower.so: Leader_Follower.cpp \ + Leader_Follower.h \ + $(ACE_ROOT)/ace/pre.h \ + LF_Follower.h \ + orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + TAO_Export.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Intrusive_List_Node.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.inl \ + $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \ + LF_Follower.inl \ + ORB_Core.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + corbafwd.i \ + ORB.h \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ + Services.h \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + Environment.h \ + Environment.i \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + PolicyC.h \ + Encodable.h \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i \ + Remote_Object_Proxy_Impl.h \ + Object_Proxy_Impl.h \ + CurrentC.h \ + Object.h \ + Object_Proxy_Broker.h \ + Object.i \ + CurrentC.i \ + PolicyC.i \ + ORB.i \ + Policy_Manager.h \ + Policy_Set.h \ + Policy_Set.i \ + LocalObject.h \ + LocalObject.i \ + debug.h \ + Policy_Manager.i \ + Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + Pluggable.h \ + Typecode.h \ + Typecode.i \ + IOPC.h \ + Any.h \ + Any.i \ + IOPC.i \ + Pluggable.i \ + Protocol_Factory.h \ + params.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + Adapter.h \ + Adapter.i \ + PolicyFactory_Registry.h \ + PortableInterceptorC.h \ + DynamicC.h \ + DynamicC.i \ + MessagingC.h \ + ValueBase.h \ + ValueBase.i \ + ValueFactory.h \ + ValueFactory.i \ + TimeBaseC.h \ + SmartProxies/Smart_Proxies.h \ + SmartProxies/smartproxies_export.h \ + SmartProxies/Smart_Proxies.inl \ + TimeBaseC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i \ + PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + Parser_Registry.h \ + Parser_Registry.i \ + Service_Callbacks.h \ + Service_Callbacks.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ + Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + Cleanup_Func_Registry.inl \ + Object_Ref_Table.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + Interceptor_List.h \ + Interceptor_List.inl \ + Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + ORB_Core.i \ + $(ACE_ROOT)/ace/Intrusive_List.h \ + $(ACE_ROOT)/ace/Intrusive_List.inl \ + $(ACE_ROOT)/ace/Intrusive_List.cpp \ + Leader_Follower.i \ + LF_Follower_Auto_Ptr.h \ + LF_Follower_Auto_Ptr.inl \ + LF_Follower_Auto_Adder.h \ + LF_Follower_Auto_Adder.inl \ + LF_Event.h \ + LF_Event.inl \ + LF_Event_Binder.h \ + LF_Event_Binder.inl \ + Transport.h \ + Transport_Descriptor_Interface.h \ + Endpoint.h \ + Endpoint.i \ + Transport_Descriptor_Interface.inl \ + Transport_Cache_Manager.h \ + Cache_Entries.h \ + Cache_Entries.inl \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ + Transport_Cache_Manager.inl \ + Transport_Timer.h \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + Incoming_Message_Queue.h \ + Pluggable_Messaging_Utils.h \ + Pluggable_Messaging_Utils.i \ + Incoming_Message_Queue.inl \ + Transport.inl + +.obj/Leader_Follower_Flushing_Strategy.o .obj/Leader_Follower_Flushing_Strategy.so .shobj/Leader_Follower_Flushing_Strategy.o .shobj/Leader_Follower_Flushing_Strategy.so: \ + Leader_Follower_Flushing_Strategy.cpp \ + Leader_Follower_Flushing_Strategy.h \ + $(ACE_ROOT)/ace/pre.h \ + Flushing_Strategy.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -16072,6 +17205,13 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ + Leader_Follower.h \ + LF_Follower.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.inl \ + $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \ + LF_Follower.inl \ + ORB_Core.h \ ORB.h \ Exception.h \ $(ACE_ROOT)/ace/SString.h \ @@ -16214,8 +17354,724 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ + $(ACE_ROOT)/ace/Intrusive_List.h \ + $(ACE_ROOT)/ace/Intrusive_List.inl \ + $(ACE_ROOT)/ace/Intrusive_List.cpp \ Leader_Follower.i \ - Resource_Factory.h + Transport.h \ + Transport_Descriptor_Interface.h \ + Endpoint.h \ + Endpoint.i \ + Transport_Descriptor_Interface.inl \ + Transport_Cache_Manager.h \ + Cache_Entries.h \ + Cache_Entries.inl \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ + Transport_Cache_Manager.inl \ + Transport_Timer.h \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + Incoming_Message_Queue.h \ + Pluggable_Messaging_Utils.h \ + Pluggable_Messaging_Utils.i \ + Incoming_Message_Queue.inl \ + Transport.inl \ + Queued_Message.h \ + LF_Event.h \ + LF_Event.inl \ + Queued_Message.inl + +.obj/LF_Event.o .obj/LF_Event.so .shobj/LF_Event.o .shobj/LF_Event.so: LF_Event.cpp \ + LF_Event.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + TAO_Export.h \ + corbafwd.i \ + LF_Event.inl \ + LF_Follower.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.inl \ + $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \ + LF_Follower.inl \ + Leader_Follower.h \ + ORB_Core.h \ + ORB.h \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ + Services.h \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + Environment.h \ + Environment.i \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + PolicyC.h \ + Encodable.h \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i \ + Remote_Object_Proxy_Impl.h \ + Object_Proxy_Impl.h \ + CurrentC.h \ + Object.h \ + Object_Proxy_Broker.h \ + Object.i \ + CurrentC.i \ + PolicyC.i \ + ORB.i \ + Policy_Manager.h \ + Policy_Set.h \ + Policy_Set.i \ + LocalObject.h \ + LocalObject.i \ + debug.h \ + Policy_Manager.i \ + Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + Pluggable.h \ + Typecode.h \ + Typecode.i \ + IOPC.h \ + Any.h \ + Any.i \ + IOPC.i \ + Pluggable.i \ + Protocol_Factory.h \ + params.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + Adapter.h \ + Adapter.i \ + PolicyFactory_Registry.h \ + PortableInterceptorC.h \ + DynamicC.h \ + DynamicC.i \ + MessagingC.h \ + ValueBase.h \ + ValueBase.i \ + ValueFactory.h \ + ValueFactory.i \ + TimeBaseC.h \ + SmartProxies/Smart_Proxies.h \ + SmartProxies/smartproxies_export.h \ + SmartProxies/Smart_Proxies.inl \ + TimeBaseC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i \ + PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + Parser_Registry.h \ + Parser_Registry.i \ + Service_Callbacks.h \ + Service_Callbacks.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ + Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + Cleanup_Func_Registry.inl \ + Object_Ref_Table.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + Interceptor_List.h \ + Interceptor_List.inl \ + Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + ORB_Core.i \ + $(ACE_ROOT)/ace/Intrusive_List.h \ + $(ACE_ROOT)/ace/Intrusive_List.inl \ + $(ACE_ROOT)/ace/Intrusive_List.cpp \ + Leader_Follower.i + +.obj/LF_Event_Binder.o .obj/LF_Event_Binder.so .shobj/LF_Event_Binder.o .shobj/LF_Event_Binder.so: LF_Event_Binder.cpp \ + LF_Event_Binder.h \ + $(ACE_ROOT)/ace/pre.h \ + LF_Event.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + TAO_Export.h \ + corbafwd.i \ + LF_Event.inl \ + LF_Event_Binder.inl + +.obj/LF_Event_Loop_Thread_Helper.o .obj/LF_Event_Loop_Thread_Helper.so .shobj/LF_Event_Loop_Thread_Helper.o .shobj/LF_Event_Loop_Thread_Helper.so: LF_Event_Loop_Thread_Helper.cpp \ + LF_Event_Loop_Thread_Helper.h \ + $(ACE_ROOT)/ace/pre.h \ + orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + LF_Strategy.h \ + TAO_Export.h \ + LF_Strategy.inl \ + LF_Event_Loop_Thread_Helper.inl + +.obj/LF_Strategy.o .obj/LF_Strategy.so .shobj/LF_Strategy.o .shobj/LF_Strategy.so: LF_Strategy.cpp \ + LF_Strategy.h \ + $(ACE_ROOT)/ace/pre.h \ + orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + TAO_Export.h \ + LF_Strategy.inl + +.obj/LF_Strategy_Complete.o .obj/LF_Strategy_Complete.so .shobj/LF_Strategy_Complete.o .shobj/LF_Strategy_Complete.so: LF_Strategy_Complete.cpp \ + LF_Strategy_Complete.h \ + $(ACE_ROOT)/ace/pre.h \ + LF_Strategy.h \ + orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + TAO_Export.h \ + LF_Strategy.inl \ + LF_Strategy_Complete.inl \ + Leader_Follower.h \ + LF_Follower.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Intrusive_List_Node.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.inl \ + $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \ + LF_Follower.inl \ + ORB_Core.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + corbafwd.i \ + ORB.h \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ + Services.h \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + Environment.h \ + Environment.i \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + PolicyC.h \ + Encodable.h \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i \ + Remote_Object_Proxy_Impl.h \ + Object_Proxy_Impl.h \ + CurrentC.h \ + Object.h \ + Object_Proxy_Broker.h \ + Object.i \ + CurrentC.i \ + PolicyC.i \ + ORB.i \ + Policy_Manager.h \ + Policy_Set.h \ + Policy_Set.i \ + LocalObject.h \ + LocalObject.i \ + debug.h \ + Policy_Manager.i \ + Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + Pluggable.h \ + Typecode.h \ + Typecode.i \ + IOPC.h \ + Any.h \ + Any.i \ + IOPC.i \ + Pluggable.i \ + Protocol_Factory.h \ + params.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + Adapter.h \ + Adapter.i \ + PolicyFactory_Registry.h \ + PortableInterceptorC.h \ + DynamicC.h \ + DynamicC.i \ + MessagingC.h \ + ValueBase.h \ + ValueBase.i \ + ValueFactory.h \ + ValueFactory.i \ + TimeBaseC.h \ + SmartProxies/Smart_Proxies.h \ + SmartProxies/smartproxies_export.h \ + SmartProxies/Smart_Proxies.inl \ + TimeBaseC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i \ + PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + Parser_Registry.h \ + Parser_Registry.i \ + Service_Callbacks.h \ + Service_Callbacks.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ + Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + Cleanup_Func_Registry.inl \ + Object_Ref_Table.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + Interceptor_List.h \ + Interceptor_List.inl \ + Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + ORB_Core.i \ + $(ACE_ROOT)/ace/Intrusive_List.h \ + $(ACE_ROOT)/ace/Intrusive_List.inl \ + $(ACE_ROOT)/ace/Intrusive_List.cpp \ + Leader_Follower.i .obj/Reactor_Registry.o .obj/Reactor_Registry.so .shobj/Reactor_Registry.o .shobj/Reactor_Registry.so: Reactor_Registry.cpp \ Reactor_Registry.h \ @@ -16460,7 +18316,17 @@ realclean: $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ Leader_Follower.h \ - Leader_Follower.i + LF_Follower.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.inl \ + $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \ + LF_Follower.inl \ + $(ACE_ROOT)/ace/Intrusive_List.h \ + $(ACE_ROOT)/ace/Intrusive_List.inl \ + $(ACE_ROOT)/ace/Intrusive_List.cpp \ + Leader_Follower.i \ + LF_Strategy.h \ + LF_Strategy.inl .obj/params.o .obj/params.so .shobj/params.o .shobj/params.so: params.cpp \ params.h \ @@ -17392,6 +19258,10 @@ realclean: CORBANAME_Parser.i CORBALOC_Parser.h CORBALOC_Parser.i FILE_Parser.h \ FILE_Parser.i DLL_Parser.h DLL_Parser.i StringSeqC.h corbafwd.h \ Sequence.h StringSeqC.i Object_Loader.h Object_Loader.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ + $(ACE_ROOT)/ace/Dynamic_Service.i \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ Default_Stub_Factory.h \ Stub_Factory.h \ Default_Endpoint_Selector_Factory.h \ @@ -17400,7 +19270,8 @@ realclean: Default_Protocols_Hooks.i .obj/TAO_Server_Request.o .obj/TAO_Server_Request.so .shobj/TAO_Server_Request.o .shobj/TAO_Server_Request.so: TAO_Server_Request.cpp TAO_Server_Request.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -17637,8 +19508,8 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i Timeprobe.h \ - $(ACE_ROOT)/ace/Timeprobe.h debug.h \ - Pluggable_Messaging_Utils.h \ + $(ACE_ROOT)/ace/Timeprobe.h \ + debug.h Pluggable_Messaging_Utils.h \ Pluggable_Messaging_Utils.i \ Pluggable_Messaging.h \ Pluggable_Messaging_Utils.h \ @@ -18187,6 +20058,14 @@ realclean: $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ Leader_Follower.h \ + LF_Follower.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.inl \ + $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \ + LF_Follower.inl \ + $(ACE_ROOT)/ace/Intrusive_List.h \ + $(ACE_ROOT)/ace/Intrusive_List.inl \ + $(ACE_ROOT)/ace/Intrusive_List.cpp \ Leader_Follower.i .obj/Wait_Strategy.o .obj/Wait_Strategy.so .shobj/Wait_Strategy.o .shobj/Wait_Strategy.so: Wait_Strategy.cpp \ @@ -18389,7 +20268,8 @@ realclean: TAO_Export.h \ corbafwd.i \ Wait_Strategy.inl \ - Transport.h corbafwd.h Exception.h \ + Transport.h \ + Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ Exception.i \ @@ -18429,12 +20309,11 @@ realclean: $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ Cache_Entries.h \ - Transport_Descriptor_Interface.h \ Cache_Entries.inl \ Connection_Purging_Strategy.h \ Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ - Transport_Timer.h TAO_Export.h \ + Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ @@ -18475,7 +20354,8 @@ realclean: $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ - Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \ + Incoming_Message_Queue.h \ + Pluggable_Messaging_Utils.h \ IOPC.h \ Any.h \ CDR.h \ @@ -18489,7 +20369,6 @@ realclean: Object_Proxy_Impl.h \ Object.i \ Typecode.h \ - Exception.h \ Typecode.i \ Any.i \ Sequence.h \ @@ -18501,8 +20380,17 @@ realclean: Sequence_T.cpp \ IOPC.i \ Pluggable_Messaging_Utils.i \ - Incoming_Message_Queue.inl Transport.inl Resume_Handle.h \ - Resume_Handle.inl + Incoming_Message_Queue.inl \ + Transport.inl \ + Resume_Handle.h \ + Resume_Handle.inl \ + Synch_Reply_Dispatcher.h \ + Reply_Dispatcher.h \ + Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl .obj/Wait_On_Reactor.o .obj/Wait_On_Reactor.so .shobj/Wait_On_Reactor.o .shobj/Wait_On_Reactor.so: Wait_On_Reactor.cpp \ Wait_On_Reactor.h \ @@ -18747,18 +20635,18 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Transport.h corbafwd.h Exception.h Transport_Descriptor_Interface.h \ + Transport.h \ + Transport_Descriptor_Interface.h \ Endpoint.h \ Endpoint.i \ Transport_Descriptor_Interface.inl \ Transport_Cache_Manager.h \ Cache_Entries.h \ - Transport_Descriptor_Interface.h \ Cache_Entries.inl \ Connection_Purging_Strategy.h \ Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ - Transport_Timer.h TAO_Export.h \ + Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ @@ -18780,9 +20668,18 @@ realclean: $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ - Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \ + Incoming_Message_Queue.h \ + Pluggable_Messaging_Utils.h \ Pluggable_Messaging_Utils.i \ - Incoming_Message_Queue.inl Transport.inl + Incoming_Message_Queue.inl \ + Transport.inl \ + Synch_Reply_Dispatcher.h \ + Reply_Dispatcher.h \ + Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl .obj/Wait_On_Leader_Follower.o .obj/Wait_On_Leader_Follower.so .shobj/Wait_On_Leader_Follower.o .shobj/Wait_On_Leader_Follower.so: Wait_On_Leader_Follower.cpp \ Wait_On_Leader_Follower.h \ @@ -19028,19 +20925,27 @@ realclean: $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ Leader_Follower.h \ + LF_Follower.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.inl \ + $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \ + LF_Follower.inl \ + $(ACE_ROOT)/ace/Intrusive_List.h \ + $(ACE_ROOT)/ace/Intrusive_List.inl \ + $(ACE_ROOT)/ace/Intrusive_List.cpp \ Leader_Follower.i \ - Transport.h corbafwd.h Exception.h Transport_Descriptor_Interface.h \ + Transport.h \ + Transport_Descriptor_Interface.h \ Endpoint.h \ Endpoint.i \ Transport_Descriptor_Interface.inl \ Transport_Cache_Manager.h \ Cache_Entries.h \ - Transport_Descriptor_Interface.h \ Cache_Entries.inl \ Connection_Purging_Strategy.h \ Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ - Transport_Timer.h TAO_Export.h \ + Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ @@ -19062,9 +20967,18 @@ realclean: $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ - Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \ + Incoming_Message_Queue.h \ + Pluggable_Messaging_Utils.h \ Pluggable_Messaging_Utils.i \ - Incoming_Message_Queue.inl Transport.inl + Incoming_Message_Queue.inl \ + Transport.inl \ + Synch_Reply_Dispatcher.h \ + Reply_Dispatcher.h \ + Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl .obj/Transport_Mux_Strategy.o .obj/Transport_Mux_Strategy.so .shobj/Transport_Mux_Strategy.o .shobj/Transport_Mux_Strategy.so: Transport_Mux_Strategy.cpp \ Transport_Mux_Strategy.h \ @@ -19882,6 +21796,8 @@ realclean: Sequence_T.cpp \ IOPC.i \ Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ GIOP_Message_Version.h \ GIOP_Message_Version.inl \ ORB_Core.h \ @@ -20000,22 +21916,20 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Wait_Strategy.h \ - Wait_Strategy.inl \ Pluggable_Messaging_Utils.h \ Pluggable_Messaging_Utils.i \ - Transport.h corbafwd.h Exception.h Transport_Descriptor_Interface.h \ + Transport.h \ + Transport_Descriptor_Interface.h \ Endpoint.h \ Endpoint.i \ Transport_Descriptor_Interface.inl \ Transport_Cache_Manager.h \ Cache_Entries.h \ - Transport_Descriptor_Interface.h \ Cache_Entries.inl \ Connection_Purging_Strategy.h \ Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ - Transport_Timer.h TAO_Export.h \ + Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ @@ -20037,8 +21951,9 @@ realclean: $(ACE_ROOT)/ace/Process_Mutex.inl \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ - Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \ - Incoming_Message_Queue.inl Transport.inl + Incoming_Message_Queue.h \ + Incoming_Message_Queue.inl \ + Transport.inl .obj/Asynch_Reply_Dispatcher.o .obj/Asynch_Reply_Dispatcher.so .shobj/Asynch_Reply_Dispatcher.o .shobj/Asynch_Reply_Dispatcher.so: Asynch_Reply_Dispatcher.cpp \ Asynch_Reply_Dispatcher.h \ @@ -20323,9 +22238,7 @@ realclean: Interceptor_List.h \ Interceptor_List.inl \ Protocols_Hooks.h \ - ORB_Core.i \ - Leader_Follower.h \ - Leader_Follower.i + ORB_Core.i .obj/Asynch_Timeout_Handler.o .obj/Asynch_Timeout_Handler.so .shobj/Asynch_Timeout_Handler.o .shobj/Asynch_Timeout_Handler.so: Asynch_Timeout_Handler.cpp \ Asynch_Timeout_Handler.h \ @@ -20571,7 +22484,8 @@ realclean: Transport_Mux_Strategy.h .obj/IOPC.o .obj/IOPC.so .shobj/IOPC.o .shobj/IOPC.so: IOPC.cpp IOPC.h \ - $(ACE_ROOT)/ace/pre.h TAO_Export.h \ + $(ACE_ROOT)/ace/pre.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -20579,7 +22493,8 @@ realclean: $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl Any.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + Any.h \ CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -20683,8 +22598,8 @@ realclean: $(ACE_ROOT)/ace/SString.i \ Exception.i \ Typecode.i \ - Any.i Object.h \ - Exception.h CDR.h Sequence.h \ + Any.i \ + Object.h Exception.h CDR.h Sequence.h \ Managed_Types.h \ Managed_Types.i \ Sequence.i \ @@ -20737,7 +22652,8 @@ realclean: $(ACE_ROOT)/ace/Managed_Object.cpp \ TAO_Singleton_Manager.h \ Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ - DynamicC.h Any.h \ + DynamicC.h \ + Any.h \ DynamicC.i MessagingC.h orbconf.h ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -20907,7 +22823,8 @@ realclean: CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i PollableC.i \ + CDR.i \ + PollableC.i \ Stub.h \ Pluggable.h \ Sequence.h \ @@ -21054,6 +22971,8 @@ realclean: Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ TAOC.h \ TAOC.i \ operation_details.h \ @@ -23801,8 +25720,8 @@ realclean: MProfile.i \ ORB.h \ ORB_Core.h \ - Stub.i MProfile.h \ - Connector_Registry.h \ + Stub.i \ + MProfile.h Connector_Registry.h \ params.h \ Connector_Registry.i @@ -23934,7 +25853,8 @@ realclean: CORBANAME_Parser.i Invocation.h CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i Stub.h \ + CDR.i \ + Stub.h \ Pluggable.h \ Sequence.h \ Managed_Types.h \ @@ -24059,10 +25979,12 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Stub.i Any.h \ - Synch_Reply_Dispatcher.h \ + Stub.i \ + Any.h Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ TAOC.h TAOC.i operation_details.h corbafwd.h Service_Context.h \ Service_Context.inl \ target_specification.h \ @@ -24723,7 +26645,8 @@ realclean: $(ACE_ROOT)/ace/Dynamic_Service.cpp .obj/ORBInitInfo.o .obj/ORBInitInfo.so .shobj/ORBInitInfo.o .shobj/ORBInitInfo.so: ORBInitInfo.cpp ORBInitInfo.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -24951,7 +26874,8 @@ realclean: .obj/ORBInitializer_Registry.o .obj/ORBInitializer_Registry.so .shobj/ORBInitializer_Registry.o .shobj/ORBInitializer_Registry.so: ORBInitializer_Registry.cpp \ ORBInitializer_Registry.h \ - $(ACE_ROOT)/ace/pre.h TAO_Export.h \ + $(ACE_ROOT)/ace/pre.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -25111,7 +27035,8 @@ realclean: .obj/PolicyFactory_Registry.o .obj/PolicyFactory_Registry.so .shobj/PolicyFactory_Registry.o .shobj/PolicyFactory_Registry.so: PolicyFactory_Registry.cpp \ PolicyFactory_Registry.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -25879,7 +27804,8 @@ realclean: .obj/Cleanup_Func_Registry.o .obj/Cleanup_Func_Registry.so .shobj/Cleanup_Func_Registry.o .shobj/Cleanup_Func_Registry.so: Cleanup_Func_Registry.cpp \ Cleanup_Func_Registry.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -26082,7 +28008,8 @@ realclean: Transport_Descriptor_Interface.inl .obj/IORInfo.o .obj/IORInfo.so .shobj/IORInfo.o .shobj/IORInfo.so: IORInfo.cpp IORInfo.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -26241,7 +28168,8 @@ realclean: MProfile.i .obj/Object_Ref_Table.o .obj/Object_Ref_Table.so .shobj/Object_Ref_Table.o .shobj/Object_Ref_Table.so: Object_Ref_Table.cpp Object_Ref_Table.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -26493,7 +28421,8 @@ realclean: $(ACE_ROOT)/ace/Dynamic_Service.cpp .obj/CodecFactory.o .obj/CodecFactory.so .shobj/CodecFactory.o .shobj/CodecFactory.so: CodecFactory.cpp CodecFactory.h \ - $(ACE_ROOT)/ace/pre.h TAO_Export.h \ + $(ACE_ROOT)/ace/pre.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -26501,8 +28430,9 @@ realclean: $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ - $(ACE_ROOT)/ace/OS_Errno.inl IOPC.h \ - Any.h CDR.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + IOPC.h Any.h \ + CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -26605,8 +28535,8 @@ realclean: $(ACE_ROOT)/ace/SString.i \ Exception.i \ Typecode.i \ - Any.i Object.h \ - Exception.h CDR.h Sequence.h \ + Any.i \ + Object.h Exception.h CDR.h Sequence.h \ Managed_Types.h \ Managed_Types.i \ Sequence.i \ @@ -26618,7 +28548,8 @@ realclean: .obj/CodecFactory_ORBInitializer.o .obj/CodecFactory_ORBInitializer.so .shobj/CodecFactory_ORBInitializer.o .shobj/CodecFactory_ORBInitializer.so: CodecFactory_ORBInitializer.cpp \ CodecFactory_ORBInitializer.h \ - $(ACE_ROOT)/ace/pre.h TAO_Export.h \ + $(ACE_ROOT)/ace/pre.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -26865,8 +28796,8 @@ realclean: corbafwd.i \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i OctetSeqC.h \ - corbafwd.h Sequence.h \ + CDR.i \ + OctetSeqC.h corbafwd.h Sequence.h \ Managed_Types.h \ Managed_Types.i \ Sequence.i \ @@ -26888,8 +28819,8 @@ realclean: $(ACE_ROOT)/ace/SString.i \ Exception.i \ Typecode.i \ - Any.i Typecode.h \ - Marshal.h \ + Any.i \ + Typecode.h Marshal.h \ Principal.h \ OctetSeqC.h \ Principal.i \ @@ -27018,7 +28949,8 @@ realclean: $(ACE_ROOT)/ace/Dynamic_Service.cpp .obj/Flushing_Strategy.o .obj/Flushing_Strategy.so .shobj/Flushing_Strategy.o .shobj/Flushing_Strategy.so: Flushing_Strategy.cpp Flushing_Strategy.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -27325,8 +29257,8 @@ realclean: Sequence_T.cpp \ IOPC.i \ Pluggable_Messaging_Utils.i \ - Incoming_Message_Queue.inl Transport.inl Queued_Message.h \ - Queued_Message.inl + Incoming_Message_Queue.inl Transport.inl Queued_Message.h LF_Event.h \ + LF_Event.inl Queued_Message.inl .obj/Reactive_Flushing_Strategy.o .obj/Reactive_Flushing_Strategy.so .shobj/Reactive_Flushing_Strategy.o .shobj/Reactive_Flushing_Strategy.so: Reactive_Flushing_Strategy.cpp \ Reactive_Flushing_Strategy.h \ @@ -27592,10 +29524,11 @@ realclean: Fault_Tolerance_Service.i \ Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \ Interceptor_List.h Interceptor_List.inl Protocols_Hooks.h ORB_Core.i \ - Queued_Message.h Queued_Message.inl debug.h + Queued_Message.h LF_Event.h LF_Event.inl Queued_Message.inl debug.h .obj/Queued_Message.o .obj/Queued_Message.so .shobj/Queued_Message.o .shobj/Queued_Message.so: Queued_Message.cpp Queued_Message.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -27690,7 +29623,7 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - Queued_Message.inl + LF_Event.h LF_Event.inl Queued_Message.inl .obj/Synch_Queued_Message.o .obj/Synch_Queued_Message.so .shobj/Synch_Queued_Message.o .shobj/Synch_Queued_Message.so: Synch_Queued_Message.cpp \ Synch_Queued_Message.h \ @@ -27790,7 +29723,7 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - Queued_Message.inl + LF_Event.h LF_Event.inl Queued_Message.inl .obj/Asynch_Queued_Message.o .obj/Asynch_Queued_Message.so .shobj/Asynch_Queued_Message.o .shobj/Asynch_Queued_Message.so: Asynch_Queued_Message.cpp \ Asynch_Queued_Message.h \ @@ -27890,10 +29823,11 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - Queued_Message.inl + LF_Event.h LF_Event.inl Queued_Message.inl .obj/Transport_Timer.o .obj/Transport_Timer.so .shobj/Transport_Timer.o .shobj/Transport_Timer.so: Transport_Timer.cpp Transport_Timer.h \ - $(ACE_ROOT)/ace/pre.h TAO_Export.h \ + $(ACE_ROOT)/ace/pre.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -28717,6 +30651,8 @@ realclean: Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ TAOC.h \ TAOC.i \ operation_details.h \ @@ -28733,7 +30669,8 @@ realclean: .obj/POA_Extension_Initializer.o .obj/POA_Extension_Initializer.so .shobj/POA_Extension_Initializer.o .shobj/POA_Extension_Initializer.so: POA_Extension_Initializer.cpp \ POA_Extension_Initializer.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -29825,7 +31762,8 @@ realclean: $(ACE_ROOT)/ace/Dynamic_Service.cpp .obj/MessagingC.o .obj/MessagingC.so .shobj/MessagingC.o .shobj/MessagingC.so: MessagingC.cpp MessagingC.h \ - $(ACE_ROOT)/ace/pre.h orbconf.h \ + $(ACE_ROOT)/ace/pre.h \ + orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -29848,7 +31786,8 @@ realclean: $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i corbafwd.h \ + $(ACE_ROOT)/ace/OS.i \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -29942,8 +31881,8 @@ realclean: $(ACE_ROOT)/ace/SString.i \ Exception.i \ Typecode.i \ - Any.i CDR.h \ - Remote_Object_Proxy_Impl.h TimeBaseC.h \ + Any.i \ + CDR.h Remote_Object_Proxy_Impl.h TimeBaseC.h \ Any.h \ SmartProxies/Smart_Proxies.h \ SmartProxies/smartproxies_export.h \ @@ -30077,6 +32016,8 @@ realclean: Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ + LF_Event.h \ + LF_Event.inl \ TAOC.h \ TimeBaseC.h \ TAOC.i \ @@ -31079,9 +33020,9 @@ realclean: PortableInterceptorC.i \ LocalObject.h \ LocalObject.i \ - Messaging_PolicyFactory.h \ Messaging_Policy_i.h \ Messaging_Policy_i.i \ + Messaging_PolicyFactory.h \ ORB_Core.h \ ORB.h \ Services.h \ @@ -31793,7 +33734,15 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i Leader_Follower.h \ + LF_Follower.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.inl \ + $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \ + LF_Follower.inl \ ORB_Core.h \ + $(ACE_ROOT)/ace/Intrusive_List.h \ + $(ACE_ROOT)/ace/Intrusive_List.inl \ + $(ACE_ROOT)/ace/Intrusive_List.cpp \ Leader_Follower.i \ TAO_Server_Request.h Tagged_Profile.h \ GIOPC.h \ @@ -31837,7 +33786,330 @@ realclean: $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ Incoming_Message_Queue.h Pluggable_Messaging_Utils.h \ - Incoming_Message_Queue.inl Transport.inl + Incoming_Message_Queue.inl Transport.inl \ + LF_Strategy.h \ + LF_Strategy.inl + +.obj/GIOP_Message_Lite.o .obj/GIOP_Message_Lite.so .shobj/GIOP_Message_Lite.o .shobj/GIOP_Message_Lite.so: GIOP_Message_Lite.cpp \ + GIOP_Message_Lite.h \ + $(ACE_ROOT)/ace/pre.h \ + Pluggable_Messaging.h \ + Pluggable_Messaging_Utils.h \ + IOPC.h \ + TAO_Export.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + Any.h \ + CDR.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Flag_Manip.h \ + $(ACE_ROOT)/ace/Flag_Manip.i \ + $(ACE_ROOT)/ace/Handle_Ops.h \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + corbafwd.i \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i \ + Environment.h \ + Environment.i \ + Object.h \ + Object_Proxy_Broker.h \ + Object_Proxy_Impl.h \ + Object.i \ + Typecode.h \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ + Typecode.i \ + Any.i \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + IOPC.i \ + Pluggable_Messaging_Utils.i \ + Pluggable_Messaging.i \ + GIOP_Utils.h \ + GIOP_Utils.i \ + GIOP_Message_State.h \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ + GIOP_Message_State.inl \ + GIOP_Message_Lite.i \ + debug.h \ + TAOC.h \ + PolicyC.h \ + Encodable.h \ + Remote_Object_Proxy_Impl.h \ + CurrentC.h \ + CurrentC.i \ + PolicyC.i \ + TimeBaseC.h \ + SmartProxies/Smart_Proxies.h \ + SmartProxies/smartproxies_export.h \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + SmartProxies/Smart_Proxies.inl \ + TimeBaseC.i \ + TAOC.i \ + ORB_Core.h \ + ORB.h \ + Services.h \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + ORB.i \ + Policy_Manager.h \ + Policy_Set.h \ + Policy_Set.i \ + LocalObject.h \ + LocalObject.i \ + Policy_Manager.i \ + Resource_Factory.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + Pluggable.h \ + Pluggable.i \ + Protocol_Factory.h \ + params.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + params.i \ + Adapter.h \ + Adapter.i \ + PolicyFactory_Registry.h \ + PortableInterceptorC.h \ + DynamicC.h \ + DynamicC.i \ + MessagingC.h \ + ValueBase.h \ + ValueBase.i \ + ValueFactory.h \ + ValueFactory.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i \ + PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + Parser_Registry.h \ + Parser_Registry.i \ + Service_Callbacks.h \ + Service_Callbacks.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ + Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + Cleanup_Func_Registry.inl \ + Object_Ref_Table.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + Interceptor_List.h \ + Interceptor_List.inl \ + Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + ORB_Core.i \ + operation_details.h \ + Service_Context.h \ + Service_Context.inl \ + target_specification.h \ + Object_KeyC.h \ + Object_KeyC.i \ + target_specification.i \ + operation_details.i \ + TAO_Server_Request.h \ + Tagged_Profile.h \ + GIOPC.h \ + GIOPC.i \ + Tagged_Profile.i \ + OctetSeqC.h \ + OctetSeqC.i \ + TAO_Server_Request.i \ + GIOP_Message_Locate_Header.h \ + GIOP_Message_Locate_Header.i \ + Leader_Follower.h \ + LF_Follower.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.inl \ + $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \ + LF_Follower.inl \ + $(ACE_ROOT)/ace/Intrusive_List.h \ + $(ACE_ROOT)/ace/Intrusive_List.inl \ + $(ACE_ROOT)/ace/Intrusive_List.cpp \ + Leader_Follower.i \ + LF_Strategy.h \ + LF_Strategy.inl \ + Transport.h \ + Transport_Descriptor_Interface.h \ + Endpoint.h \ + Endpoint.i \ + Transport_Descriptor_Interface.inl \ + Transport_Cache_Manager.h \ + Cache_Entries.h \ + Cache_Entries.inl \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ + Transport_Cache_Manager.inl \ + Transport_Timer.h \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + Incoming_Message_Queue.h \ + Incoming_Message_Queue.inl \ + Transport.inl .obj/GIOP_Message_Generator_Parser.o .obj/GIOP_Message_Generator_Parser.so .shobj/GIOP_Message_Generator_Parser.o .shobj/GIOP_Message_Generator_Parser.so: GIOP_Message_Generator_Parser.cpp \ GIOP_Message_Generator_Parser.h \ @@ -32389,7 +34661,8 @@ realclean: Pluggable_Messaging_Utils.h \ Pluggable_Messaging_Utils.i \ TAO_Server_Request.h Tagged_Profile.h Object.h TAO_Server_Request.i \ - TAOC.h PolicyC.h \ + TAOC.h \ + PolicyC.h \ Encodable.h \ Remote_Object_Proxy_Impl.h \ CurrentC.h \ @@ -32416,7 +34689,8 @@ realclean: Services.i \ CORBA_String.h \ CORBA_String.inl \ - PolicyC.h ORB.i \ + PolicyC.h \ + ORB.i \ Environment.h Policy_Manager.h \ Policy_Set.h \ Policy_Set.i \ diff --git a/TAO/tao/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging_ORBInitializer.cpp index 24812b46d65..72cc5b4f09e 100644 --- a/TAO/tao/Messaging_ORBInitializer.cpp +++ b/TAO/tao/Messaging_ORBInitializer.cpp @@ -1,6 +1,4 @@ // -*- C++ -*- -// -// $Id$ #include "tao/Messaging_ORBInitializer.h" @@ -11,8 +9,10 @@ ACE_RCSID (TAO, #if TAO_HAS_CORBA_MESSAGING == 1 #include "tao/Messaging_Policy_i.h" +#include "tao/Messaging_PolicyFactory.h" #include "tao/ORB_Core.h" + void TAO_Messaging_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr @@ -23,7 +23,7 @@ TAO_Messaging_ORBInitializer::pre_init ( TAO_ORB_Core::set_timeout_hook (TAO_RelativeRoundtripTimeoutPolicy::hook); #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - + #if (TAO_HAS_SYNC_SCOPE_POLICY == 1) TAO_ORB_Core::set_sync_scope_hook (TAO_Sync_Scope_Policy::hook); #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ @@ -51,24 +51,36 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( // The Messaging policy factory is stateless and reentrant, so share a // single instance between all ORBs. - PortableInterceptor::PolicyFactory_ptr policy_factory = - &(this->policy_factory_); + if (CORBA::is_nil (this->policy_factory_.in ())) + { + PortableInterceptor::PolicyFactory_ptr policy_factory; + ACE_NEW_THROW_EX (policy_factory, + TAO_Messaging_PolicyFactory, + CORBA::NO_MEMORY ( + CORBA::SystemException::_tao_minor_code ( + TAO_DEFAULT_MINOR_CODE, + ENOMEM), + CORBA::COMPLETED_NO)); + ACE_CHECK; + + this->policy_factory_ = policy_factory; + } // Bind the same policy factory to all Messaging related policy // types since a single policy factory is used to create each of // the different types of Messaging policies. CORBA::PolicyType type; - + type = TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE; info->register_policy_factory (type, - policy_factory, + this->policy_factory_.in (), ACE_TRY_ENV); ACE_CHECK; - + type = TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE; info->register_policy_factory (type, - policy_factory, + this->policy_factory_.in (), ACE_TRY_ENV); ACE_CHECK; @@ -76,76 +88,76 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( type = TAO_BUFFERING_CONSTRAINT_POLICY_TYPE; info->register_policy_factory (type, - policy_factory, + this->policy_factory_.in (), ACE_TRY_ENV); ACE_CHECK; #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ - + type = TAO_MESSAGING_REBIND_POLICY_TYPE; info->register_policy_factory (type, - policy_factory, + this->policy_factory_.in (), ACE_TRY_ENV); ACE_CHECK; - + type = TAO_MESSAGING_REQUEST_PRIORITY_POLICY_TYPE; info->register_policy_factory (type, - policy_factory, + this->policy_factory_.in (), ACE_TRY_ENV); ACE_CHECK; - + type = TAO_MESSAGING_REPLY_PRIORITY_POLICY_TYPE; info->register_policy_factory (type, - policy_factory, + this->policy_factory_.in (), ACE_TRY_ENV); ACE_CHECK; - + type = TAO_MESSAGING_REQUEST_START_TIME_POLICY_TYPE; info->register_policy_factory (type, - policy_factory, + this->policy_factory_.in (), ACE_TRY_ENV); ACE_CHECK; - + type = TAO_MESSAGING_REQUEST_END_TIME_POLICY_TYPE; info->register_policy_factory (type, - policy_factory, + this->policy_factory_.in (), ACE_TRY_ENV); ACE_CHECK; - + type = TAO_MESSAGING_REPLY_START_TIME_POLICY_TYPE; info->register_policy_factory (type, - policy_factory, + this->policy_factory_.in (), ACE_TRY_ENV); ACE_CHECK; - + type = TAO_MESSAGING_REPLY_END_TIME_POLICY_TYPE; info->register_policy_factory (type, - policy_factory, + this->policy_factory_.in (), ACE_TRY_ENV); ACE_CHECK; - + type = TAO_MESSAGING_RELATIVE_REQ_TIMEOUT_POLICY_TYPE; info->register_policy_factory (type, - policy_factory, + this->policy_factory_.in (), ACE_TRY_ENV); ACE_CHECK; - + type = TAO_MESSAGING_ROUTING_POLICY_TYPE; info->register_policy_factory (type, - policy_factory, + this->policy_factory_.in (), ACE_TRY_ENV); ACE_CHECK; - + type = TAO_MESSAGING_MAX_HOPS_POLICY_TYPE; info->register_policy_factory (type, - policy_factory, + this->policy_factory_.in (), ACE_TRY_ENV); ACE_CHECK; - + type = TAO_MESSAGING_QUEUE_ORDER_POLICY_TYPE; info->register_policy_factory (type, - policy_factory, + this->policy_factory_.in (), ACE_TRY_ENV); ACE_CHECK; } diff --git a/TAO/tao/Messaging_ORBInitializer.h b/TAO/tao/Messaging_ORBInitializer.h index 143fb595864..459d95cbaee 100644 --- a/TAO/tao/Messaging_ORBInitializer.h +++ b/TAO/tao/Messaging_ORBInitializer.h @@ -26,7 +26,6 @@ #include "tao/PortableInterceptorC.h" #include "tao/LocalObject.h" -#include "tao/Messaging_PolicyFactory.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -37,6 +36,11 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ + +/// Forward Declarations +class TAO_Messaging_PolicyFactory; + + /// Messaging ORB initializer. class TAO_Export TAO_Messaging_ORBInitializer : public virtual PortableInterceptor::ORBInitializer, @@ -44,6 +48,14 @@ class TAO_Export TAO_Messaging_ORBInitializer { public: + /** + * @name PortableInterceptor::ORBInitializer Methods + * + * The following methods are required by the + * PortableInterceptor::ORBInitializer interface. + */ + //@{ + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -52,6 +64,8 @@ public: TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); + //@} + private: /// Register Messaging policy factories. @@ -62,9 +76,11 @@ private: private: /// Instance of the Messaging policy factory. - /// The Messaging policy factory is stateless and reentrant, so - /// share a single instance between all ORBs. - TAO_Messaging_PolicyFactory policy_factory_; + /** + * The Messaging policy factory is stateless and reentrant, so share + * a single instance between all ORBs. + */ + PortableInterceptor::PolicyFactory_var policy_factory_; }; diff --git a/TAO/tao/Messaging_PolicyFactory.h b/TAO/tao/Messaging_PolicyFactory.h index 29ecd3db2b8..61842bb4802 100644 --- a/TAO/tao/Messaging_PolicyFactory.h +++ b/TAO/tao/Messaging_PolicyFactory.h @@ -39,8 +39,8 @@ /// Policy factory for all Messaging related policies. class TAO_Export TAO_Messaging_PolicyFactory - : public PortableInterceptor::PolicyFactory, - public CORBA::LocalObject + : public virtual PortableInterceptor::PolicyFactory, + public virtual TAO_Local_RefCounted_Object { public: diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile index bb1ad3b7482..0501c66471a 100644 --- a/TAO/tao/PortableServer/Makefile +++ b/TAO/tao/PortableServer/Makefile @@ -489,7 +489,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i POA.i \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + POA.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ @@ -759,9 +760,45 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i POA.i \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + POA.i \ ImplRepoS.h \ ImplRepoC.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ portableserver_export.h \ ImplRepoC.i \ PortableServer.h \ @@ -788,40 +825,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ @@ -1194,8 +1202,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i POA.i \ - Strategized_Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + POA.i Strategized_Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -1852,11 +1860,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i POA.i + $(TAO_ROOT)/tao/OctetSeqC.i \ + POA.i .obj/Active_Object_Map.o .obj/Active_Object_Map.so .shobj/Active_Object_Map.o .shobj/Active_Object_Map.so: Active_Object_Map.cpp Active_Object_Map.h \ - $(ACE_ROOT)/ace/pre.h Key_Adapters.h \ - PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + Key_Adapters.h PortableServerC.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2243,8 +2252,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i POA.i \ - Operation_Table.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + POA.i Operation_Table.h \ $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ @@ -2541,8 +2550,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i POA.i \ - ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + POA.i ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -3907,23 +3916,60 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ portableserver_export.h \ ImplRepoC.i \ PortableServer.h \ PortableServerC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/PolicyC.i \ PortableServerC.i \ Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ @@ -4636,7 +4682,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i POA.i + $(TAO_ROOT)/tao/OctetSeqC.i \ + POA.i .obj/Servant_Dispatcher.o .obj/Servant_Dispatcher.so .shobj/Servant_Dispatcher.o .shobj/Servant_Dispatcher.so: Servant_Dispatcher.cpp Servant_Dispatcher.h \ $(ACE_ROOT)/ace/pre.h \ @@ -4832,8 +4879,8 @@ CPPFLAGS += -I$(TAO_ROOT) POA_Policy_Set.i Object_Adapter.i .obj/POA_Cached_Policies.o .obj/POA_Cached_Policies.so .shobj/POA_Cached_Policies.o .shobj/POA_Cached_Policies.so: POA_Cached_Policies.cpp POA_Cached_Policies.h \ - $(ACE_ROOT)/ace/pre.h POA_Policies.h \ - PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + POA_Policies.h PortableServerC.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5103,8 +5150,8 @@ CPPFLAGS += -I$(TAO_ROOT) POA_Policies.i .obj/POA_Policy_Set.o .obj/POA_Policy_Set.so .shobj/POA_Policy_Set.o .shobj/POA_Policy_Set.so: POA_Policy_Set.cpp POA_Policy_Set.h \ - $(ACE_ROOT)/ace/pre.h POA_Policies.h \ - PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + POA_Policies.h PortableServerC.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5702,19 +5749,59 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ portableserver_export.h ImplRepoC.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/Profile.h \ @@ -5722,11 +5809,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CONV_FRAMEC.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.i \ $(TAO_ROOT)/tao/Tagged_Components.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/GIOP_Message_Version.h \ $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ @@ -5741,8 +5823,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Policy_Set.h \ $(TAO_ROOT)/tao/Policy_Set.i \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ @@ -5756,36 +5836,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Unbounded_Queue.inl \ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ @@ -5844,11 +5897,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/target_specification.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -5859,15 +5912,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/RequestInfo_Util.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/ClientRequestInfo.inl \ $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \ $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl .obj/ImplRepoS.o .obj/ImplRepoS.so .shobj/ImplRepoS.o .shobj/ImplRepoS.so: ImplRepoS.cpp ImplRepoS.h \ - $(ACE_ROOT)/ace/pre.h ImplRepoC.h \ + $(ACE_ROOT)/ace/pre.h \ + ImplRepoC.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ @@ -5981,23 +6031,60 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ $(TAO_ROOT)/tao/Managed_Types.i \ - $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/Encodable.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ portableserver_export.h ImplRepoC.i \ PortableServer.h \ portableserver_export.h \ PortableServerC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/PolicyC.i \ PortableServerC.i \ Servant_Base.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ @@ -6063,8 +6150,6 @@ CPPFLAGS += -I$(TAO_ROOT) Active_Object_Map.i \ $(TAO_ROOT)/tao/Adapter.h \ $(TAO_ROOT)/tao/Adapter.i \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ Default_Policy_Validator.h \ Policy_Validator.h \ POA_Policy_Set.h \ @@ -6075,20 +6160,8 @@ CPPFLAGS += -I$(TAO_ROOT) POA_Policy_Set.i \ Object_Adapter.i \ Operation_Table.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -6096,8 +6169,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Tagged_Profile.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i \ - $(TAO_ROOT)/tao/Service_Context.h \ - $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ @@ -6116,23 +6187,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/params.h \ $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ - $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ - $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ - $(TAO_ROOT)/tao/TimeBaseC.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ @@ -6175,8 +6229,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/RequestInfo_Util.h \ ServerRequestInfo.h \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/StringSeqC.i \ ServerRequestInfo.inl \ ServerInterceptorAdapter.h \ ServerInterceptorAdapter.inl \ @@ -6210,7 +6262,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i MessagingS.h \ + $(ACE_ROOT)/ace/OS.i \ + MessagingS.h \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/corbafwd.h \ diff --git a/TAO/tao/RTCORBA/Makefile b/TAO/tao/RTCORBA/Makefile index a956862f534..26328b4e39a 100644 --- a/TAO/tao/RTCORBA/Makefile +++ b/TAO/tao/RTCORBA/Makefile @@ -111,7 +111,8 @@ endif # corba_messaging $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ Direct_Priority_Mapping.h rtcorba_export.h Priority_Mapping.h \ - RTCORBAC.h $(TAO_ROOT)/tao/IOPC.h \ + RTCORBAC.h \ + $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ @@ -261,7 +262,8 @@ endif # corba_messaging $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ Linear_Priority_Mapping.h rtcorba_export.h Priority_Mapping.h \ - RTCORBAC.h $(TAO_ROOT)/tao/IOPC.h \ + RTCORBAC.h \ + $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ @@ -839,8 +841,8 @@ endif # corba_messaging $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i rtcorba_export.h \ - Priority_Mapping.h RTCORBAC.h \ + $(ACE_ROOT)/ace/OS.i \ + rtcorba_export.h Priority_Mapping.h RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/Any.h \ @@ -991,7 +993,8 @@ endif # corba_messaging $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i rtcorba_export.h \ + $(ACE_ROOT)/ace/OS.i \ + rtcorba_export.h \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -1167,7 +1170,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - RTCORBAC.h $(TAO_ROOT)/tao/IOPC.h \ + RTCORBAC.h \ + $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -1272,7 +1276,8 @@ endif # corba_messaging $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i rtcorba_export.h \ + $(ACE_ROOT)/ace/OS.i \ + rtcorba_export.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/Any.h \ @@ -1392,7 +1397,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.i \ - RTCORBAC.i $(TAO_ROOT)/tao/Stub.h \ + RTCORBAC.i \ + $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/MProfile.h \ @@ -1503,6 +1509,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ @@ -1550,8 +1558,8 @@ endif # corba_messaging $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RTCORBA.h \ - rtcorba_export.h \ + $(ACE_ROOT)/ace/OS.i \ + RTCORBA.h rtcorba_export.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -1623,7 +1631,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - RTCORBAC.h $(TAO_ROOT)/tao/IOPC.h \ + RTCORBAC.h \ + $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -2045,6 +2054,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ @@ -2320,6 +2331,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ @@ -2595,6 +2608,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ @@ -2644,8 +2659,8 @@ endif # corba_messaging $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RTCORBA.h \ - rtcorba_export.h \ + $(ACE_ROOT)/ace/OS.i \ + RTCORBA.h rtcorba_export.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -2717,7 +2732,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - RTCORBAC.h $(TAO_ROOT)/tao/IOPC.h \ + RTCORBAC.h \ + $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -2877,8 +2893,8 @@ endif # corba_messaging $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RTCORBA.h \ - rtcorba_export.h \ + $(ACE_ROOT)/ace/OS.i \ + RTCORBA.h rtcorba_export.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -2950,7 +2966,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - RTCORBAC.h $(TAO_ROOT)/tao/IOPC.h \ + RTCORBAC.h \ + $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -3001,7 +3018,8 @@ endif # corba_messaging RTCORBAC.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ - Thread_Pool.h $(ACE_ROOT)/ace/Task.h \ + Thread_Pool.h \ + $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ @@ -3375,6 +3393,11 @@ endif # corba_messaging $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/ORBInitInfo.h \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/CodecFactory.h \ + $(TAO_ROOT)/tao/ORBInitInfo.inl \ RT_ORB_Loader.h \ $(TAO_ROOT)/tao/Object_Loader.h \ $(TAO_ROOT)/tao/Object_Loader.i \ @@ -3382,10 +3405,41 @@ endif # corba_messaging $(TAO_ROOT)/tao/Stub_Factory.h \ RT_Endpoint_Selector_Factory.h \ $(TAO_ROOT)/tao/Endpoint_Selector_Factory.h \ + Linear_Priority_Mapping.h Linear_Priority_Mapping.i \ + Direct_Priority_Mapping.h Direct_Priority_Mapping.i RT_ORB.h \ + Thread_Pool.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ $(ACE_ROOT)/ace/Service_Types.i \ $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + Thread_Pool.i RT_ORB.i RT_Current.h RT_Current.i \ $(ACE_ROOT)/ace/Svc_Conf.h \ $(ACE_ROOT)/ace/Obstack.h \ $(ACE_ROOT)/ace/Obstack_T.h \ @@ -3523,8 +3577,9 @@ endif # corba_messaging $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - RT_ORB.h RTCORBA.h RTCORBAC.h \ - $(TAO_ROOT)/tao/IOPC.h \ + RT_ORBInitializer.h \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -3546,7 +3601,13 @@ endif # corba_messaging $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ @@ -3562,92 +3623,28 @@ endif # corba_messaging $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.i \ - RTCORBAC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ - Thread_Pool.h $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.i \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ + RT_PolicyFactory.h \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/ORB.i \ - Thread_Pool.i RT_ORB.i RT_Current.h RT_Current.i RT_ORBInitializer.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/DynamicC.i \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueBase.i \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/ValueFactory.i \ - $(TAO_ROOT)/tao/PollableC.h \ - $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - $(TAO_ROOT)/tao/PortableInterceptorC.i \ - RT_PolicyFactory.h Linear_Priority_Mapping.h Priority_Mapping.h \ - Priority_Mapping.i Linear_Priority_Mapping.i \ - Direct_Priority_Mapping.h Direct_Priority_Mapping.i \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Policy_Set.h \ $(TAO_ROOT)/tao/Policy_Set.i \ @@ -3671,11 +3668,33 @@ endif # corba_messaging $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ + $(ACE_ROOT)/ace/Functor_T.h \ + $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(TAO_ROOT)/tao/Interceptor_List.h \ $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/ORBInitializer_Registry.h \ $(TAO_ROOT)/tao/ORBInitializer_Registry.inl @@ -3867,8 +3886,8 @@ endif # corba_messaging $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RTCORBA.h \ - rtcorba_export.h \ + $(ACE_ROOT)/ace/OS.i \ + RTCORBA.h rtcorba_export.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -3940,7 +3959,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - RTCORBAC.h $(TAO_ROOT)/tao/IOPC.h \ + RTCORBAC.h \ + $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -4189,7 +4209,8 @@ endif # corba_messaging $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ Priority_Mapping_Manager.h rtcorba_export.h Priority_Mapping.h \ - RTCORBAC.h $(TAO_ROOT)/tao/IOPC.h \ + RTCORBAC.h \ + $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -4346,6 +4367,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ @@ -4743,7 +4766,8 @@ endif # corba_messaging $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - RT_Stub.h $(TAO_ROOT)/tao/Stub.h \ + RT_Stub.h \ + $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ @@ -5055,7 +5079,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - RTCORBAC.h $(TAO_ROOT)/tao/IOPC.h \ + RTCORBAC.h \ + $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -5096,7 +5121,8 @@ endif # corba_messaging $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.i \ - RTCORBAC.i $(TAO_ROOT)/tao/ORB.h \ + RTCORBAC.i \ + $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ diff --git a/TAO/tao/Strategies/Makefile b/TAO/tao/Strategies/Makefile index 115826e059c..82fb723deff 100644 --- a/TAO/tao/Strategies/Makefile +++ b/TAO/tao/Strategies/Makefile @@ -1047,7 +1047,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOP_Utils.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.inl \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/GIOP_Message_Lite.h \ + $(TAO_ROOT)/tao/GIOP_Message_Lite.i .obj/DIOP_Connector.o .obj/DIOP_Connector.so .shobj/DIOP_Connector.o .shobj/DIOP_Connector.so: DIOP_Connector.cpp DIOP_Connector.h \ $(ACE_ROOT)/ace/pre.h \ @@ -1385,6 +1387,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ @@ -4089,6 +4093,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ @@ -6039,7 +6045,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOP_Utils.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ $(TAO_ROOT)/tao/GIOP_Message_State.inl \ - $(TAO_ROOT)/tao/GIOP_Message_Base.i + $(TAO_ROOT)/tao/GIOP_Message_Base.i \ + $(TAO_ROOT)/tao/GIOP_Message_Lite.h \ + $(TAO_ROOT)/tao/GIOP_Message_Lite.i .obj/SHMIOP_Connector.o .obj/SHMIOP_Connector.so .shobj/SHMIOP_Connector.o .shobj/SHMIOP_Connector.so: SHMIOP_Connector.cpp SHMIOP_Connector.h \ $(ACE_ROOT)/ace/pre.h \ @@ -6407,6 +6415,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ @@ -8015,11 +8025,27 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ FIFO_Connection_Purging_Strategy.h NULL_Connection_Purging_Strategy.h \ + LF_Strategy_Null.h \ + $(TAO_ROOT)/tao/LF_Strategy.h \ + $(TAO_ROOT)/tao/LF_Strategy.inl \ + LF_Strategy_Null.inl \ $(TAO_ROOT)/tao/Single_Reactor.h \ $(TAO_ROOT)/tao/Single_Reactor.i \ $(TAO_ROOT)/tao/LRU_Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/LF_Strategy_Complete.h \ + $(TAO_ROOT)/tao/LF_Strategy_Complete.inl \ $(TAO_ROOT)/tao/Leader_Follower.h \ + $(TAO_ROOT)/tao/LF_Follower.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.inl \ + $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \ + $(TAO_ROOT)/tao/LF_Follower.inl \ + $(ACE_ROOT)/ace/Intrusive_List.h \ + $(ACE_ROOT)/ace/Intrusive_List.inl \ + $(ACE_ROOT)/ace/Intrusive_List.cpp \ $(TAO_ROOT)/tao/Leader_Follower.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ @@ -8314,6 +8340,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Thread_Manager.i \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Leader_Follower.h \ + $(TAO_ROOT)/tao/LF_Follower.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.h \ + $(ACE_ROOT)/ace/Intrusive_List_Node.inl \ + $(ACE_ROOT)/ace/Intrusive_List_Node.cpp \ + $(TAO_ROOT)/tao/LF_Follower.inl \ + $(ACE_ROOT)/ace/Intrusive_List.h \ + $(ACE_ROOT)/ace/Intrusive_List.inl \ + $(ACE_ROOT)/ace/Intrusive_List.cpp \ $(TAO_ROOT)/tao/Leader_Follower.i .obj/LFU_Connection_Purging_Strategy.o .obj/LFU_Connection_Purging_Strategy.so .shobj/LFU_Connection_Purging_Strategy.o .shobj/LFU_Connection_Purging_Strategy.so: LFU_Connection_Purging_Strategy.cpp \ @@ -8960,4 +8994,36 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Incoming_Message_Queue.inl \ $(TAO_ROOT)/tao/Transport.inl +.obj/LF_Strategy_Null.o .obj/LF_Strategy_Null.so .shobj/LF_Strategy_Null.o .shobj/LF_Strategy_Null.so: LF_Strategy_Null.cpp LF_Strategy_Null.h \ + $(ACE_ROOT)/ace/pre.h \ + strategies_export.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(ACE_ROOT)/ace/ace_wchar.inl \ + $(ACE_ROOT)/ace/OS_Errno.h \ + $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ + $(TAO_ROOT)/tao/LF_Strategy.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ + $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ + $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ + $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ + $(ACE_ROOT)/ace/Min_Max.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/LF_Strategy.inl \ + LF_Strategy_Null.inl + # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tao/TypeCodeFactory/Makefile b/TAO/tao/TypeCodeFactory/Makefile index 5af5f76107d..76e19a7b3b9 100644 --- a/TAO/tao/TypeCodeFactory/Makefile +++ b/TAO/tao/TypeCodeFactory/Makefile @@ -464,6 +464,8 @@ realclean: clean $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.i \ + $(TAO_ROOT)/tao/LF_Event.h \ + $(TAO_ROOT)/tao/LF_Event.inl \ $(TAO_ROOT)/tao/TAOC.h \ $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 4228be56b9b..81773712f28 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -922,63 +922,15 @@ TAO_Default_Resource_Factory::disable_factory (void) // **************************************************************** -// Notice that the Service Configurator/Repository will not deallocate -// the *payload* object, i.e. the default resource factory. The -// TAO_Singleton_Manager will deallocate it. This is necessary since -// the ORB Core requires that a resource factory exist as it is being -// finalized. Resource factories that are statically or dynamically -// loaded (i.e. registered with the Service Repository) should -// generally enable the ACE_Service_Type::DELETE_OBJ service -// descriptor flag. ACE_STATIC_SVC_DEFINE (TAO_Default_Resource_Factory, ACE_TEXT ("Resource_Factory"), ACE_SVC_OBJ_T, &ACE_SVC_NAME (TAO_Default_Resource_Factory), ACE_Service_Type::DELETE_THIS - | ACE_Service_Type::DELETE_OBJ /* | ACE_Service_Type::DELETE_OBJ */ /* SEE ABOVE */, + | ACE_Service_Type::DELETE_OBJ, 0) - -// @@ See below for an explanation of why this macro is not used for -// the TAO_Default_Resource_Factory. ACE_FACTORY_DEFINE (TAO, TAO_Default_Resource_Factory) -#if 0 -// A custom factory definition is used instead of the commonly used -// one created by the ACE_FACTORY_DEFINE macro below. This is -// necessary to get around dynamic unloading issues. The default -// resource factory must exist long enough for the ORB to make the -// resource factory reclaim the reactor, for example. The easiest -// (and probably best) way to do that is register the -// TAO_Default_Resource_Factory for destruction with the -// TAO_Singleton_Manager. -extern "C" ACE_Service_Object * -_make_TAO_Default_Resource_Factory (ACE_Service_Object_Exterminator *gobbler) -{ - // The TAO_Singleton_Manager will "gobble" the payload - // (TAO_Default_Resource_Factory) object. Set the gobbler function - // invoked by the Service_Type implementation to be to be nil. - *gobbler = 0; - - TAO_Default_Resource_Factory *rf = 0; - ACE_NEW_RETURN (rf, - TAO_Default_Resource_Factory, - 0); - - // Register for destruction with the TAO_Singleton_Manager. - // - // Note that the instance of the TAO_Default_Resource_Factory just - // created is not a Singleton. The TAO_Singleton_Manager is useful - // for more than just Singleton managment. - if (TAO_Singleton_Manager::at_exit (rf) != 0) - { - delete rf; - return 0; - } - - return rf; -} -#endif /* 0 */ - // **************************************************************** #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h index f9a00aceb11..b31086ebe96 100644 --- a/TAO/tao/default_resource.h +++ b/TAO/tao/default_resource.h @@ -38,21 +38,28 @@ class TAO_LF_Strategy; * stored in thread-specific storage, stored in shared memory, * etc. * - * @note The default resource factory also inherits from ACE_Cleanup - * so that it may be registered for destruction with the - * TAO_Singleton_Manager. This generally only necessary for - * default resource factory since it may be created during ORB - * initialization, and it must exist long enough for the ORB - * Core to make some calls on it during ORB Core finalization. - * Resource factories that are statically or dynamically loaded - * (i.e. registered with the Service Repository) before the ORB - * is initialized need not inherit from ACE_Cleanup, nor is it - * necessary for them to register with the - * TAO_Singleton_Manager. + * @note When using an ORB created by a dynamically loaded object, it + * is generally necessary to pre-load a "Resource_Factory" prior + * to initializing the ORB. In the case of the + * TAO_Default_Resource_Factory, this can be done by adding the + * following Service Configurator directive to your `svc.conf' + * file before your the directive that loads the object that + * initialized your ORB: + * @par + * static Resource_Factory "" + * @par + * Alternatively, explicitly pre-load the Resource_Factory using + * the following in your code: + * @par + * ACE_Service_Config::process_directive ( + * ACE_TEXT ("static Resource_Factory \"\"") ); + * @par + * In both cases, place the appropriate resource factory + * arguments, if any, between the quotes immediately following + * "Resource_Factory." */ class TAO_Export TAO_Default_Resource_Factory - : public TAO_Resource_Factory, - public ACE_Cleanup + : public TAO_Resource_Factory { public: diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp index c9b82722ea8..34d22d0a5e4 100644 --- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp @@ -21,8 +21,8 @@ parse_args (int argc, char *argv[]) switch (c) { case 'k': - ior = get_opts.optarg; - break; + ior = get_opts.optarg; + break; case '?': default: diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp index 4d5a82fb11b..58166838b78 100644 --- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp @@ -66,10 +66,9 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - // Add two to the new argc since - // "dummy -ORBSkipServiceConfigOpen" is being added to the argv - // vector. - int new_argc = argc + 2; + // Add one to the new argc since "dummy" is being added to the + // argv vector. + int new_argc = argc + 1; CORBA::StringSeq new_argv (new_argc); new_argv.length (new_argc); @@ -78,7 +77,6 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) // again since the Service Configurator file is already in the // process of being opened. new_argv[0] = CORBA::string_dup ("dummy"); - new_argv[1] = CORBA::string_dup ("-ORBSkipServiceConfigOpen"); // Copy the remaining arguments into the new argument vector. for (int i = new_argc - argc, j = 0; diff --git a/TAO/tests/DLL_ORB/client.cpp b/TAO/tests/DLL_ORB/client.cpp index 1cb60dee474..70c797fe7d1 100644 --- a/TAO/tests/DLL_ORB/client.cpp +++ b/TAO/tests/DLL_ORB/client.cpp @@ -27,7 +27,7 @@ main (int, char *[]) // // In the process of doing this, the Test method provided by target // CORBA object will be invoked. - if (ACE_Service_Config::process_directive ("dynamic Client_Module Service_Object * Test_Client_Module:_make_Test_Client_Module() \"-k file://test.ior -ORBDebugLevel 4 -ORBDebug\"") != 0) + if (ACE_Service_Config::process_directive ("dynamic Client_Module Service_Object * Test_Client_Module:_make_Test_Client_Module() \"-k file://test.ior\"") != 0) { ACE_ERROR_RETURN ((LM_ERROR, |