diff options
| author | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-05-28 18:08:29 +0000 |
|---|---|---|
| committer | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-05-28 18:08:29 +0000 |
| commit | 566355594ab82e36705270c9980f9748b49c5595 (patch) | |
| tree | 4bf749596d859bb64c95394abf1f149e47d793c5 /TAO | |
| parent | 400c4cc85a9ca809c7f39ef18911e9cef43a3a90 (diff) | |
| download | ATCD-566355594ab82e36705270c9980f9748b49c5595.tar.gz | |
ChangeLogTag: Mon May 28 12:02:38 2001 Balachandran Natarajan <bala@cs.wustl.edu>
Diffstat (limited to 'TAO')
35 files changed, 1292 insertions, 825 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 62d27977393..7a5e417daef 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,59 @@ +Mon May 28 12:02:38 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + Modules that used TAO_GIOP_Version were forced to include the file + GIOP_Message_State.h. This header file also had another class that + had lot of information that was not needed for files that needed + only the TAO_GIOP_Version class. This checkins are to break that + dependency. + + * tao/GIOP_Message_Version.h: + * tao/GIOP_Message_Version.cpp: + * tao/GIOP_Message_Version.inl: Moved the TAO_GIOP_Version class to a + new file. Also renamed the class as TAO_GIOP_Message_Version to + keep in sync with other GIOP classes naming conventions. + + * tao/GIOP_Message_Base.cpp: + * tao/GIOP_Message_Base.h: + * tao/GIOP_Message_Lite.h: Changed the class names from + TAO_GIOP_Version to TAO_GIOP_Message_Version. + + * tao/GIOP_Message_State.h: + * tao/GIOP_Message_State.i: Removed the class TAO_GIOP_Version + from the files. + + * tao/Muxed_TMS.cpp: + * tao/Profile.cpp: + * tao/Profile.h: + * tao/Profile.i: + * tao/Reply_Dispatcher.h: + * tao/Synch_Reply_Dispatcher.h: + * tao/Invocation.cpp: + * tao/IIOP_Acceptor.h: + * tao/IIOP_Profile.cpp: + * tao/IIOP_Profile.h: Changed the references of TAO_GIOP_Version + to TAO_GIOP_Message_Version. Changed the inclusions from + GIOP_Message_State.h to GIOP_Message_Version.h. + + * tao/Makefile: + * tao/BiDir_GIOP/Makefile: + * tao/Domain/Makefile: + * tao/DynamicAny/Makefile: + * tao/DynamicInterface/Makefile: + * tao/IFR_Client/Makefile: + * tao/IORManipulation/Makefile: + * tao/PortableServer/Makefile: + * tao/TypeCodeFactory/Makefile: + * tao/Strategies/Makefile: Updated dependencies. + + * tao/Strategies/SHMIOP_Acceptor.h: + * tao/Strategies/SHMIOP_Profile.cpp: + * tao/Strategies/SHMIOP_Profile.h: + * tao/Strategies/UIOP_Acceptor.h: + * tao/Strategies/UIOP_Profile.cpp: + * tao/Strategies/UIOP_Profile.h: Made the changes from + TAO_GIOP_Version to TAO_GIOP_Message_Version. + + Mon May 28 06:23:31 2001 Balachandran Natarajan <bala@cs.wustl.edu> * performance-tests/POA/Create_Reference/create_reference.cpp: diff --git a/TAO/tao/BiDir_GIOP/Makefile b/TAO/tao/BiDir_GIOP/Makefile index b06285760ad..76ada414a72 100644 --- a/TAO/tao/BiDir_GIOP/Makefile +++ b/TAO/tao/BiDir_GIOP/Makefile @@ -998,8 +998,8 @@ 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/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB.h \ diff --git a/TAO/tao/Domain/Makefile b/TAO/tao/Domain/Makefile index b5a35bf352a..81b97bbdcfb 100644 --- a/TAO/tao/Domain/Makefile +++ b/TAO/tao/Domain/Makefile @@ -50,8 +50,7 @@ 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 \ @@ -367,8 +366,8 @@ 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/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Stub.i \ diff --git a/TAO/tao/DynamicAny/Makefile b/TAO/tao/DynamicAny/Makefile index df35ecc8f81..46313b6fdea 100644 --- a/TAO/tao/DynamicAny/Makefile +++ b/TAO/tao/DynamicAny/Makefile @@ -280,8 +280,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 \ @@ -508,8 +508,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Auto_Ptr.cpp .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 \ @@ -726,8 +726,8 @@ CPPFLAGS += -I$(TAO_ROOT) DynamicAnyC.i 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 \ @@ -976,8 +976,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 \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/OS.i DynamicAny.h \ + dynamicany_export.h \ $(TAO_ROOT)/tao/Object_Loader.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -1178,8 +1178,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 \ @@ -1402,8 +1402,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 \ @@ -1628,8 +1628,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 d7b8b2536ed..420dcee6590 100644 --- a/TAO/tao/DynamicInterface/Makefile +++ b/TAO/tao/DynamicInterface/Makefile @@ -340,8 +340,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -484,7 +484,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -666,12 +667,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -682,6 +681,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -779,7 +781,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/LocalObject.h \ @@ -1030,8 +1035,8 @@ 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/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -1713,8 +1718,8 @@ 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/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -1806,7 +1811,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index b0bdf47d366..f374e33d0e9 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -945,7 +945,7 @@ TAO_GIOP_Message_Base::set_state (CORBA::Octet def_major, void TAO_GIOP_Message_Base:: - send_close_connection (const TAO_GIOP_Version &version, + send_close_connection (const TAO_GIOP_Message_Version &version, TAO_Transport *transport, void *) { diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h index 6f2e25af55e..ecb194b1148 100644 --- a/TAO/tao/GIOP_Message_Base.h +++ b/TAO/tao/GIOP_Message_Base.h @@ -162,7 +162,7 @@ private: int send_error (TAO_Transport *transport); /// Close a connection, first sending GIOP::CloseConnection. - void send_close_connection (const TAO_GIOP_Version &version, + void send_close_connection (const TAO_GIOP_Message_Version &version, TAO_Transport *transport, void *ctx); diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h index 406f16fcf6d..8287007ce80 100644 --- a/TAO/tao/GIOP_Message_Lite.h +++ b/TAO/tao/GIOP_Message_Lite.h @@ -164,7 +164,7 @@ private: CORBA::Octet minor); /// Close a connection, first sending GIOP::CloseConnection. - void send_close_connection (const TAO_GIOP_Version &version, + void send_close_connection (const TAO_GIOP_Message_Version &version, TAO_Transport *transport, void *ctx); diff --git a/TAO/tao/GIOP_Message_State.h b/TAO/tao/GIOP_Message_State.h index 2a5f349b31f..a71d53869ac 100644 --- a/TAO/tao/GIOP_Message_State.h +++ b/TAO/tao/GIOP_Message_State.h @@ -27,44 +27,10 @@ #include "tao/corbafwd.h" #include "tao/CDR.h" +#include "tao/GIOP_Message_Version.h" class TAO_ORB_Core; -/** - * @class TAO_GIOP_Version - * - * @brief Major and Minor version number of the Inter-ORB Protocol. - */ -class TAO_Export TAO_GIOP_Version -{ -public: - /// Major version number - CORBA::Octet major; - - /// Minor version number - CORBA::Octet minor; - - /// Copy constructor - TAO_GIOP_Version (const TAO_GIOP_Version &src); - - /// Default constructor. - TAO_GIOP_Version (CORBA::Octet maj = TAO_DEF_GIOP_MAJOR, - CORBA::Octet min = TAO_DEF_GIOP_MINOR); - - /// Destructor. - ~TAO_GIOP_Version (void); - - /// Explicitly set the major and minor version. - void set_version (CORBA::Octet maj, CORBA::Octet min); - - /// Copy operator. - TAO_GIOP_Version &operator= (const TAO_GIOP_Version &src); - - /// Equality operator - int operator== (const TAO_GIOP_Version &src); - int operator!= (const TAO_GIOP_Version &src); -}; - /** * @class TAO_GIOP_Message_State @@ -101,7 +67,7 @@ public: int message_fragmented (void); /// Version info - TAO_GIOP_Version giop_version; + TAO_GIOP_Message_Version giop_version; /// 0 = big, 1 = little CORBA::Octet byte_order; @@ -139,7 +105,7 @@ public: /// The GIOP version for the first fragment /// @@ Same as above, all GIOP versions must match. - TAO_GIOP_Version first_fragment_giop_version; + TAO_GIOP_Message_Version first_fragment_giop_version; /** * If the messages are chained this represents the message type for diff --git a/TAO/tao/GIOP_Message_State.i b/TAO/tao/GIOP_Message_State.i index 807f6ba23ce..653bf47d6a8 100644 --- a/TAO/tao/GIOP_Message_State.i +++ b/TAO/tao/GIOP_Message_State.i @@ -1,65 +1,6 @@ // -*- C++ -*- //$Id$ - -// -// @@ Bala: is this comment useful at all? I mean, everybody can read -// C++, it is *OBVIOUS* that they are inlined methods, and what class -// they belong to, right? -// -// Inlined methods for TAO_GIOP_Version -// - -ACE_INLINE -TAO_GIOP_Version::TAO_GIOP_Version (const TAO_GIOP_Version &src) - : major (src.major), - minor (src.minor) -{ -} - -ACE_INLINE -TAO_GIOP_Version::TAO_GIOP_Version (CORBA::Octet maj, CORBA::Octet min) - : major (maj), - minor (min) -{ -} - -ACE_INLINE -TAO_GIOP_Version::~TAO_GIOP_Version (void) -{ -} - -ACE_INLINE TAO_GIOP_Version & -TAO_GIOP_Version::operator= (const TAO_GIOP_Version &src) -{ - if (this == &src) - return *this; - - this->major = src.major; - this->minor = src.minor; - return *this; -} - - -ACE_INLINE void -TAO_GIOP_Version::set_version (CORBA::Octet maj, CORBA::Octet min) -{ - this->major = maj; - this->minor = min; -} - -ACE_INLINE int -TAO_GIOP_Version::operator== (const TAO_GIOP_Version &src) -{ - return this->major == src.major && this->minor == src.minor; -} - -ACE_INLINE int -TAO_GIOP_Version::operator!= (const TAO_GIOP_Version &src) -{ - return !(*this == src); -} - // **************************************************************** // @@ Bala: we use the stars to separate classes in ACE+TAO diff --git a/TAO/tao/GIOP_Message_Version.cpp b/TAO/tao/GIOP_Message_Version.cpp new file mode 100644 index 00000000000..5363855c893 --- /dev/null +++ b/TAO/tao/GIOP_Message_Version.cpp @@ -0,0 +1,8 @@ +//$Id$ +# include "GIOP_Message_Version.h" + +#if !defined (__ACE_INLINE__) +# include "tao/GIOP_Message_Version.inl" +#endif /* __ACE_INLINE__ */ + + diff --git a/TAO/tao/GIOP_Message_Version.h b/TAO/tao/GIOP_Message_Version.h new file mode 100644 index 00000000000..4292a7d688f --- /dev/null +++ b/TAO/tao/GIOP_Message_Version.h @@ -0,0 +1,71 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file GIOP_Message_Version.h + * + * $Id$ + * + * GIOP Version utility class definition + * + * + * @author Chris Cleeland <cleeland@cs.wustl.edu> + * @author Carlos O' Ryan <coryan@uci.edu> + */ +//============================================================================= + +#ifndef TAO_GIOP_MESSAGE_VERSION_H +#define TAO_GIOP_MESSAGE_VERSION_H +#include "ace/pre.h" +#include "tao/corbafwd.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + + + +class TAO_ORB_Core; + +/** + * @class TAO_GIOP_Message_Version + * + * @brief Major and Minor version number of the Inter-ORB Protocol. + */ +class TAO_Export TAO_GIOP_Message_Version +{ +public: + + /// Major version number + CORBA::Octet major; + + /// Minor version number + CORBA::Octet minor; + + /// Copy constructor + TAO_GIOP_Message_Version (const TAO_GIOP_Message_Version &src); + + /// Default constructor. + TAO_GIOP_Message_Version (CORBA::Octet maj = TAO_DEF_GIOP_MAJOR, + CORBA::Octet min = TAO_DEF_GIOP_MINOR); + + /// Destructor. + ~TAO_GIOP_Message_Version (void); + + /// Explicitly set the major and minor version. + void set_version (CORBA::Octet maj, CORBA::Octet min); + + /// Copy operator. + TAO_GIOP_Message_Version &operator= (const TAO_GIOP_Message_Version &src); + + /// Equality operator + int operator== (const TAO_GIOP_Message_Version &src); + int operator!= (const TAO_GIOP_Message_Version &src); +}; + +#if defined (__ACE_INLINE__) +# include "tao/GIOP_Message_Version.inl" +#endif /* __ACE_INLINE__ */ + +#include "ace/post.h" +#endif /*TAO_GIOP_VERSION_H */ diff --git a/TAO/tao/GIOP_Message_Version.inl b/TAO/tao/GIOP_Message_Version.inl new file mode 100644 index 00000000000..b6c27cb2bb3 --- /dev/null +++ b/TAO/tao/GIOP_Message_Version.inl @@ -0,0 +1,58 @@ +// -*- C++ -*- +//$Id$ + +ACE_INLINE +TAO_GIOP_Message_Version::TAO_GIOP_Message_Version ( + const TAO_GIOP_Message_Version &src) + : major (src.major), + minor (src.minor) +{ +} + +ACE_INLINE +TAO_GIOP_Message_Version::TAO_GIOP_Message_Version (CORBA::Octet maj, + CORBA::Octet min) + : major (maj), + minor (min) +{ +} + +ACE_INLINE +TAO_GIOP_Message_Version::~TAO_GIOP_Message_Version (void) +{ +} + +ACE_INLINE TAO_GIOP_Message_Version & +TAO_GIOP_Message_Version::operator= ( + const TAO_GIOP_Message_Version &src) +{ + if (this == &src) + return *this; + + this->major = src.major; + this->minor = src.minor; + return *this; +} + + +ACE_INLINE void +TAO_GIOP_Message_Version::set_version (CORBA::Octet maj, + CORBA::Octet min) +{ + this->major = maj; + this->minor = min; +} + +ACE_INLINE int +TAO_GIOP_Message_Version::operator== ( + const TAO_GIOP_Message_Version &src) +{ + return this->major == src.major && this->minor == src.minor; +} + +ACE_INLINE int +TAO_GIOP_Message_Version::operator!= ( + const TAO_GIOP_Message_Version &src) +{ + return !(*this == src); +} diff --git a/TAO/tao/IFR_Client/Makefile b/TAO/tao/IFR_Client/Makefile index c69d266abff..2b919151e66 100644 --- a/TAO/tao/IFR_Client/Makefile +++ b/TAO/tao/IFR_Client/Makefile @@ -194,8 +194,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -338,8 +338,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RequestInfo_Util.h .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 \ @@ -478,8 +478,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -622,8 +622,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RequestInfo_Util.h .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 \ @@ -762,8 +762,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -1047,8 +1047,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -1356,8 +1356,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB.h \ diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h index d2a97bdb3b8..f86cc5ba6e8 100644 --- a/TAO/tao/IIOP_Acceptor.h +++ b/TAO/tao/IIOP_Acceptor.h @@ -30,7 +30,7 @@ #include "ace/Acceptor.h" #include "ace/SOCK_Acceptor.h" -#include "tao/GIOP_Message_State.h" +#include "tao/GIOP_Message_Version.h" // TAO IIOP_Acceptor concrete call defination @@ -180,7 +180,7 @@ protected: * @@ Theoretically they shouldn't be here!! We need to look at a * way to move this out */ - TAO_GIOP_Version version_; + TAO_GIOP_Message_Version version_; /// ORB Core. TAO_ORB_Core *orb_core_; diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index db6054c3b96..ae7a2a55d0f 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -32,7 +32,7 @@ TAO_IIOP_Profile::object_key_delimiter (void) const TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr &addr, const TAO_ObjectKey &object_key, - const TAO_GIOP_Version &version, + const TAO_GIOP_Message_Version &version, TAO_ORB_Core *orb_core) : TAO_Profile (TAO_TAG_IIOP_PROFILE, orb_core, version), endpoint_ (addr, @@ -47,7 +47,7 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host, CORBA::UShort port, const TAO_ObjectKey &object_key, const ACE_INET_Addr &addr, - const TAO_GIOP_Version &version, + const TAO_GIOP_Message_Version &version, TAO_ORB_Core *orb_core) : TAO_Profile (TAO_TAG_IIOP_PROFILE, orb_core, version), endpoint_ (host, port, addr), @@ -60,7 +60,7 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host, TAO_IIOP_Profile::TAO_IIOP_Profile (TAO_ORB_Core *orb_core) : TAO_Profile (TAO_TAG_IIOP_PROFILE, orb_core, - TAO_GIOP_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)), + TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)), endpoint_ (), count_ (1), object_key_ (), diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h index 9f9d5b12ff2..bb5bd4330a4 100644 --- a/TAO/tao/IIOP_Profile.h +++ b/TAO/tao/IIOP_Profile.h @@ -54,7 +54,7 @@ public: /// already been marshaled. TAO_IIOP_Profile (const ACE_INET_Addr &addr, const TAO_ObjectKey &object_key, - const TAO_GIOP_Version &version, + const TAO_GIOP_Message_Version &version, TAO_ORB_Core *orb_core); /// Profile constructor, this is the most efficient since it @@ -63,7 +63,7 @@ public: CORBA::UShort port, const TAO_ObjectKey &object_key, const ACE_INET_Addr &addr, - const TAO_GIOP_Version &version, + const TAO_GIOP_Message_Version &version, TAO_ORB_Core *orb_core); /// Profile constructor, default. diff --git a/TAO/tao/IORManipulation/Makefile b/TAO/tao/IORManipulation/Makefile index 557cae11bbd..a8ec0383260 100644 --- a/TAO/tao/IORManipulation/Makefile +++ b/TAO/tao/IORManipulation/Makefile @@ -181,8 +181,7 @@ 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 \ @@ -342,8 +341,7 @@ 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 \ @@ -367,6 +365,7 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/IORManipulation.o .obj/IORManipulation.so .shobj/IORManipulation.o .shobj/IORManipulation.so: IORManipulation.cpp IORManipulation.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ @@ -462,7 +461,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Object.i \ @@ -528,8 +526,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Stub.h \ diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index dee6244238c..7e0dca03670 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -269,7 +269,7 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV) // { // // Now that we have the client connection handler object we need to // // set the right messaging protocol for in the client side transport. -// const TAO_GIOP_Version& version = this->profile_->version (); +// const TAO_GIOP_Message_Version& version = this->profile_->version (); // result = this->transport_->messaging_init (version.major, // version.minor); // if (result == -1) @@ -349,7 +349,7 @@ TAO_GIOP_Invocation::perform_call (TAO_Transport_Descriptor_Interface &desc, { // Now that we have the client connection handler object we need to // set the right messaging protocol for in the client side transport. - const TAO_GIOP_Version& version = this->profile_->version (); + const TAO_GIOP_Message_Version& version = this->profile_->version (); result = this->transport_->messaging_init (version.major, version.minor); if (result == -1) diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index 836e4558cf4..a4f10d3054d 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -629,8 +629,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB_Core.h \ @@ -888,13 +888,11 @@ realclean: $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ Cache_Entries.h \ Transport_Descriptor_Interface.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h TAO_Export.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -905,6 +903,9 @@ realclean: $(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 \ @@ -1023,8 +1024,8 @@ realclean: CONV_FRAMEC.h \ CONV_FRAMEC.i \ Tagged_Components.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -1188,8 +1189,8 @@ realclean: TAO_Export.h Encodable.h Exception.h Environment.h Sequence.h CDR.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i Object_KeyC.h \ Object_KeyC.i \ MessagingC.h orbconf.h ValueBase.h \ @@ -1306,8 +1307,7 @@ 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 \ @@ -1657,8 +1657,8 @@ realclean: CONV_FRAMEC.h \ CONV_FRAMEC.i \ Tagged_Components.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ Endpoint.h \ Endpoint.i \ @@ -1810,12 +1810,10 @@ realclean: $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ Cache_Entries.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -1826,6 +1824,9 @@ realclean: $(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 \ @@ -1949,6 +1950,7 @@ realclean: Protocols_Hooks.h \ ORB_Core.i \ Server_Strategy_Factory.h \ + debug.h \ Messaging_Policy_i.h \ Messaging_Policy_i.i @@ -2097,8 +2099,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ ORB_Core.h \ ORB.h \ @@ -2778,7 +2780,8 @@ realclean: Transport_Cache_Manager.h \ Cache_Entries.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h \ Transport.inl \ @@ -2870,8 +2873,8 @@ realclean: $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ IIOP_Acceptor.i \ IIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ @@ -3115,7 +3118,8 @@ realclean: Transport_Cache_Manager.h \ Cache_Entries.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h \ Transport.inl \ @@ -3207,8 +3211,8 @@ realclean: $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ IIOP_Acceptor.i \ IIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ @@ -3360,8 +3364,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ Object_KeyC.h \ Object_KeyC.i \ @@ -3614,12 +3618,10 @@ realclean: $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ Cache_Entries.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -3630,6 +3632,9 @@ realclean: $(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 \ @@ -3800,8 +3805,8 @@ realclean: $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ IIOP_Acceptor.i \ IIOP_Profile.h \ Profile.h \ @@ -3838,6 +3843,7 @@ realclean: MProfile.h \ MProfile.i \ Stub.i \ + debug.h \ GIOP_Message_Base.h \ Pluggable_Messaging.h \ Pluggable_Messaging_Utils.h \ @@ -3854,6 +3860,8 @@ realclean: GIOP_Message_Generator_Parser_12.inl \ GIOP_Message_Generator_Parser_Impl.inl \ GIOP_Message_Reactive_Handler.h \ + GIOP_Message_State.h \ + GIOP_Message_State.i \ GIOP_Message_Reactive_Handler.inl \ GIOP_Utils.h \ GIOP_Utils.i \ @@ -4109,7 +4117,8 @@ realclean: Transport_Cache_Manager.h \ Cache_Entries.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h \ Transport.inl \ @@ -4131,8 +4140,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ Object_KeyC.h \ Object_KeyC.i \ @@ -4145,6 +4154,7 @@ realclean: ORB.i \ IIOP_Endpoint.i \ IIOP_Profile.i \ + debug.h \ ORB_Core.h \ Policy_Manager.h \ LocalObject.h \ @@ -4434,7 +4444,8 @@ realclean: Transport_Cache_Manager.h \ Cache_Entries.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h \ Transport.inl \ @@ -4527,8 +4538,8 @@ realclean: $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ IIOP_Acceptor.i \ IIOP_Profile.h \ Profile.h \ @@ -4544,6 +4555,7 @@ realclean: IIOP_Profile.i \ MProfile.h \ MProfile.i \ + debug.h \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp @@ -4753,7 +4765,8 @@ realclean: Transport_Cache_Manager.h \ Cache_Entries.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h \ Transport.inl \ @@ -4784,6 +4797,7 @@ realclean: IIOP_Connection_Handler.i \ Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ + debug.h \ ORB_Core.h \ ORB.h \ Services.h \ @@ -7983,8 +7997,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -8130,7 +8144,7 @@ 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 \ + $(ACE_ROOT)/ace/pre.h Object.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ @@ -8226,167 +8240,33 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - Object.h \ Object_Proxy_Broker.h \ Object_Proxy_Impl.h \ Object.i \ - LocalObject.i \ - Stub.h \ - Pluggable.h \ + LocalObject.i PolicyC.h \ + CurrentC.h \ + Object.h \ + CurrentC.i \ + TAO_Export.h Encodable.h Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ + Environment.h \ + Environment.i \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ Sequence.i \ Sequence_T.h \ + Sequence.h \ Sequence_T.i \ Sequence_T.cpp \ Environment.h \ - Environment.i \ - Typecode.h \ - Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - Exception.i \ - Typecode.i \ - IOPC.h \ - Any.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 \ - Any.i \ - IOPC.i \ - Pluggable.i \ - MProfile.h \ - Profile.h \ - Tagged_Components.h \ - CONV_FRAMEC.h \ - CONV_FRAMEC.i \ - Tagged_Components.i \ - PolicyC.h \ - CurrentC.h \ - CurrentC.i \ - Encodable.h \ Remote_Object_Proxy_Impl.h \ - PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ - Profile.i \ - MProfile.i \ - ORB.h \ - Services.h \ - Services.i \ - CORBA_String.h \ - CORBA_String.inl \ - ORB.i \ - ORB_Core.h \ - Policy_Manager.h \ - LocalObject.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 \ - 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 \ - RT_Policy_i.h \ - RTCORBAC.h \ - RTCORBAC.i \ - RT_Policy_i.i \ - 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 \ - Stub.i \ - IFR_Client_Adapter.h \ - $(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 + PolicyC.i .obj/ObjectIDList.o .obj/ObjectIDList.so .shobj/ObjectIDList.o .shobj/ObjectIDList.so: ObjectIDList.cpp \ ObjectIDList.h \ @@ -8652,8 +8532,7 @@ realclean: CDR.i \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - ORB.i \ - ORB_Table.h \ + ORB.i ORB_Table.h \ TAO_Singleton.h \ TAO_Singleton.inl \ TAO_Singleton.cpp \ @@ -8722,8 +8601,8 @@ realclean: CONV_FRAMEC.i \ Tagged_Components.i \ PolicyC.h \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -8789,8 +8668,8 @@ 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 RT_ORB.h \ Thread_Pool.h \ @@ -9090,8 +8969,7 @@ 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 \ @@ -9114,8 +8992,8 @@ realclean: CONV_FRAMEC.i \ Tagged_Components.i \ PolicyC.h \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -9897,8 +9775,8 @@ realclean: CurrentC.i \ Encodable.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -10230,8 +10108,7 @@ realclean: PortableInterceptor.i \ StringSeqC.h \ StringSeqC.i \ - DomainC.i \ - Stub.h \ + DomainC.i Stub.h \ Pluggable.h \ Pluggable.i \ MProfile.h \ @@ -10240,8 +10117,8 @@ realclean: CONV_FRAMEC.h \ CONV_FRAMEC.i \ Tagged_Components.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB_Core.h \ @@ -10453,8 +10330,7 @@ realclean: $(ACE_ROOT)/ace/SString.i \ Exception.i \ Typecode.i \ - Any.i \ - TAO_Export.h \ + Any.i TAO_Export.h \ SmartProxies/Smart_Proxies.h \ SmartProxies/smartproxies_export.h \ TAO_Singleton.h \ @@ -10468,8 +10344,7 @@ realclean: TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ SmartProxies/Smart_Proxies.inl \ - TimeBaseC.i \ - Stub.h \ + TimeBaseC.i Stub.h \ Pluggable.h \ Sequence.h \ Managed_Types.h \ @@ -10493,8 +10368,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -10974,8 +10849,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ Pluggable.h \ @@ -11078,8 +10953,7 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - Endpoint.i \ - Stub.h \ + Endpoint.i Stub.h \ Pluggable.h \ Sequence.h \ Managed_Types.h \ @@ -11121,8 +10995,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -11234,8 +11108,8 @@ 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 \ TAOC.h \ @@ -11261,7 +11135,8 @@ realclean: Transport_Cache_Manager.h \ Cache_Entries.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -11299,8 +11174,7 @@ realclean: Messaging_Policy_i.i \ Client_Priority_Policy.h \ Client_Priority_Policy.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 @@ -12565,8 +12439,8 @@ realclean: TAO_Export.h \ corbafwd.i \ RTCORBAC.h \ - corbafwd.h \ - IOPC.h TAO_Export.h Any.h \ + corbafwd.h IOPC.h \ + TAO_Export.h Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -12583,8 +12457,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 \ @@ -12592,15 +12466,13 @@ realclean: Sequence.h \ Sequence_T.i \ Sequence_T.cpp \ - IOPC.i \ - PolicyC.h \ + IOPC.i PolicyC.h \ CurrentC.h \ CurrentC.i \ Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - TimeBaseC.h \ - Any.h \ + TimeBaseC.h Any.h \ SmartProxies/Smart_Proxies.h \ SmartProxies/smartproxies_export.h \ TAO_Singleton.h \ @@ -12724,8 +12596,8 @@ realclean: TAO_Export.h \ corbafwd.i \ RTCORBAC.h \ - corbafwd.h \ - IOPC.h TAO_Export.h Any.h \ + corbafwd.h IOPC.h \ + TAO_Export.h Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -12742,8 +12614,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 \ @@ -12751,15 +12623,13 @@ realclean: Sequence.h \ Sequence_T.i \ Sequence_T.cpp \ - IOPC.i \ - PolicyC.h \ + IOPC.i PolicyC.h \ CurrentC.h \ CurrentC.i \ Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - TimeBaseC.h \ - Any.h \ + TimeBaseC.h Any.h \ SmartProxies/Smart_Proxies.h \ SmartProxies/smartproxies_export.h \ TAO_Singleton.h \ @@ -12941,8 +12811,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -13084,7 +12954,8 @@ realclean: Cache_Entries.h \ Transport_Descriptor_Interface.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h TAO_Export.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -13269,8 +13140,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ Invocation_Endpoint_Selectors.i \ @@ -13555,8 +13426,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ Invocation_Endpoint_Selectors.h \ @@ -13849,8 +13720,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -13992,7 +13863,8 @@ realclean: Transport_Cache_Manager.h \ Cache_Entries.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -14310,9 +14182,8 @@ realclean: $(ACE_ROOT)/ace/Array_Base.inl \ $(ACE_ROOT)/ace/Array_Base.cpp \ Interceptor_List.inl PortableInterceptor.i ClientRequestInfo.h \ - LocalObject.h \ - LocalObject.i \ - StringSeqC.h StringSeqC.i Service_Context.h \ + LocalObject.h LocalObject.i StringSeqC.h StringSeqC.i \ + Service_Context.h \ IOPC.h \ Service_Context.inl \ ClientRequestInfo.inl @@ -14464,9 +14335,8 @@ realclean: Encodable.h Environment.h \ PolicyC.i \ PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i LocalObject.h \ - LocalObject.i \ - StringSeqC.h StringSeqC.i Service_Context.h \ + PortableInterceptorC.i LocalObject.h LocalObject.i StringSeqC.h \ + StringSeqC.i Service_Context.h \ IOPC.h \ Service_Context.inl \ ClientRequestInfo.inl Invocation.h Stub.h \ @@ -14479,8 +14349,8 @@ realclean: CONV_FRAMEC.i \ Tagged_Components.i \ PolicyC.h \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -15441,8 +15311,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 \ @@ -15596,11 +15466,10 @@ realclean: CONV_FRAMEC.h \ CONV_FRAMEC.i \ Tagged_Components.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + 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 \ @@ -15616,7 +15485,8 @@ realclean: Endpoint.i \ Transport_Descriptor_Interface.inl \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Connector_Registry.h \ params.h \ @@ -15681,8 +15551,8 @@ realclean: Endpoint_Selector_Factory.h \ RT_Stub_Factory.h \ Stub_Factory.h \ - Stub.h \ - IORInfo.h LocalObject.h Flushing_Strategy.h + Stub.h IORInfo.h \ + LocalObject.h Flushing_Strategy.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 \ @@ -15823,8 +15693,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -16078,8 +15948,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -16191,8 +16061,7 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Stub.i \ - RT_Stub.h + Stub.i RT_Stub.h .obj/RT_Stub.o .obj/RT_Stub.so .shobj/RT_Stub.o .shobj/RT_Stub.so: RT_Stub.cpp RT_Stub.h \ $(ACE_ROOT)/ace/pre.h \ @@ -16333,8 +16202,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -16588,8 +16457,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ Invocation_Endpoint_Selectors.h \ @@ -16870,8 +16739,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 \ @@ -18055,12 +17924,10 @@ realclean: $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ Cache_Entries.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -18071,6 +17938,9 @@ realclean: $(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 \ @@ -18162,8 +18032,8 @@ realclean: CONV_FRAMEC.h \ CONV_FRAMEC.i \ Tagged_Components.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -18212,7 +18082,8 @@ realclean: RT_Policy_i.i \ Protocols_Hooks.h \ ORB_Core.i \ - Stub.i + Stub.i \ + debug.h .obj/TAO_Internal.o .obj/TAO_Internal.so .shobj/TAO_Internal.o .shobj/TAO_Internal.so: TAO_Internal.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ @@ -18631,8 +18502,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 \ @@ -18647,7 +18518,8 @@ realclean: Cache_Entries.h \ Transport_Descriptor_Interface.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -19467,13 +19339,11 @@ realclean: $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ Cache_Entries.h \ Transport_Descriptor_Interface.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h TAO_Export.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -19484,6 +19354,9 @@ realclean: $(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 \ @@ -19767,7 +19640,8 @@ realclean: Cache_Entries.h \ Transport_Descriptor_Interface.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h TAO_Export.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -20048,6 +19922,8 @@ realclean: 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 \ $(ACE_ROOT)/ace/Strategies.h \ @@ -20367,12 +20243,11 @@ realclean: $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ 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 \ $(ACE_ROOT)/ace/Strategies.h \ @@ -20383,6 +20258,9 @@ realclean: $(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 \ @@ -20573,8 +20451,8 @@ realclean: $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ debug.h \ Pluggable_Messaging_Utils.h \ Pluggable_Messaging_Utils.i \ @@ -20583,12 +20461,11 @@ realclean: Endpoint.i \ Transport_Descriptor_Interface.inl \ Transport_Cache_Manager.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ 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 \ $(ACE_ROOT)/ace/Strategies.h \ @@ -20599,6 +20476,9 @@ realclean: $(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 \ @@ -20883,8 +20763,8 @@ realclean: Sequence_T.cpp \ IOPC.i \ Reply_Dispatcher.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ ORB_Core.h \ ORB.h \ Services.h \ @@ -21014,7 +20894,8 @@ realclean: Cache_Entries.h \ Transport_Descriptor_Interface.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h TAO_Export.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -21178,12 +21059,10 @@ realclean: $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ Cache_Entries.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -21194,6 +21073,9 @@ realclean: $(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 \ @@ -21323,7 +21205,8 @@ realclean: Protocols_Hooks.h \ ORB_Core.i \ Leader_Follower.h \ - Leader_Follower.i + Leader_Follower.i \ + debug.h .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 \ @@ -21464,12 +21347,10 @@ realclean: $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ Cache_Entries.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -21480,6 +21361,9 @@ realclean: $(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 \ @@ -21564,8 +21448,7 @@ 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 \ @@ -21573,8 +21456,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 CDR.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 \ @@ -21677,8 +21560,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 \ @@ -21729,8 +21612,7 @@ 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 \ @@ -21906,8 +21788,7 @@ 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 \ @@ -21938,8 +21819,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -22333,8 +22214,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ ORB_Core.h \ ORB.h \ @@ -24817,14 +24698,14 @@ realclean: CONV_FRAMEC.h \ CONV_FRAMEC.i \ Tagged_Components.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ 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 @@ -24991,8 +24872,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -25898,9 +25779,8 @@ realclean: Encodable.h Environment.h \ PolicyC.i \ PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i LocalObject.h \ - LocalObject.i \ - StringSeqC.h StringSeqC.i CodecFactory.h ORB_Core.h ORB.h Services.h \ + PortableInterceptorC.i LocalObject.h LocalObject.i StringSeqC.h \ + StringSeqC.i CodecFactory.h ORB_Core.h ORB.h Services.h \ Services.i \ CORBA_String.h \ CORBA_String.inl \ @@ -25985,8 +25865,7 @@ 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 \ @@ -26459,10 +26338,8 @@ realclean: $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -26473,6 +26350,9 @@ realclean: $(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 \ @@ -26724,9 +26604,6 @@ realclean: $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ TAO_Export.h \ Cache_Entries.h \ Transport_Descriptor_Interface.h \ @@ -26747,7 +26624,8 @@ realclean: Endpoint.i \ Transport_Descriptor_Interface.inl \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport.h \ Exception.h \ @@ -26761,6 +26639,9 @@ realclean: $(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 \ @@ -26791,6 +26672,7 @@ realclean: $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ Transport.inl \ + debug.h \ ORB_Core.h \ ORB.h \ Services.h \ @@ -26881,9 +26763,7 @@ realclean: RTCORBAC.i \ RT_Policy_i.i \ Protocols_Hooks.h \ - ORB_Core.i \ - Connection_Purging_Strategy.h \ - Connection_Purging_Strategy.inl + ORB_Core.i .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 \ @@ -27236,9 +27116,7 @@ realclean: Encodable.h Environment.h \ PolicyC.i \ PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i LocalObject.h \ - LocalObject.i \ - MProfile.h \ + PortableInterceptorC.i LocalObject.h LocalObject.i MProfile.h \ Profile.h \ Tagged_Components.h \ IOPC.h \ @@ -27246,8 +27124,8 @@ realclean: CONV_FRAMEC.i \ Tagged_Components.i \ PolicyC.h \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i @@ -27504,8 +27382,7 @@ 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 \ @@ -27513,9 +27390,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 \ - 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 \ @@ -27618,8 +27494,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 \ @@ -27627,14 +27503,11 @@ realclean: Sequence.h \ Sequence_T.i \ Sequence_T.cpp \ - IOPC.i LocalObject.h \ - LocalObject.i \ - CDR_Encaps_Codec.h + IOPC.i LocalObject.h LocalObject.i CDR_Encaps_Codec.h .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 \ @@ -27781,9 +27654,7 @@ realclean: Encodable.h Environment.h \ PolicyC.i \ PollableC.h PollableC.i MessagingC.i CurrentC.h \ - PortableInterceptorC.i LocalObject.h \ - LocalObject.i \ - CodecFactory.h + PortableInterceptorC.i LocalObject.h LocalObject.i CodecFactory.h .obj/CDR_Encaps_Codec.o .obj/CDR_Encaps_Codec.so .shobj/CDR_Encaps_Codec.o .shobj/CDR_Encaps_Codec.so: CDR_Encaps_Codec.cpp CDR.h \ $(ACE_ROOT)/ace/pre.h \ @@ -27884,8 +27755,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 \ @@ -27907,8 +27778,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 \ @@ -27927,8 +27798,7 @@ realclean: ORB.i \ Marshal.i \ CDR_Encaps_Codec.h TAO_Export.h IOPC.h Object.h Exception.h IOPC.i \ - LocalObject.h \ - LocalObject.i + LocalObject.h LocalObject.i .obj/Endpoint_Selector_Factory.o .obj/Endpoint_Selector_Factory.so .shobj/Endpoint_Selector_Factory.o .shobj/Endpoint_Selector_Factory.so: Endpoint_Selector_Factory.cpp \ Endpoint_Selector_Factory.h \ @@ -28071,8 +27941,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -28345,8 +28215,8 @@ realclean: Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ Invocation_Endpoint_Selectors.h \ @@ -28724,13 +28594,11 @@ realclean: $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ Cache_Entries.h \ Transport_Descriptor_Interface.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h TAO_Export.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -28741,6 +28609,9 @@ realclean: $(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 \ @@ -28910,13 +28781,11 @@ realclean: $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ Cache_Entries.h \ Transport_Descriptor_Interface.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h TAO_Export.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -28927,6 +28796,9 @@ realclean: $(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 \ @@ -29140,9 +29012,8 @@ realclean: .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 \ - $(ACE_ROOT)/ace/pre.h \ - Queued_Message.h corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/pre.h Queued_Message.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 \ @@ -29240,9 +29111,8 @@ realclean: .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 \ - $(ACE_ROOT)/ace/pre.h \ - Queued_Message.h corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/pre.h Queued_Message.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 \ @@ -29339,8 +29209,7 @@ realclean: 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 \ @@ -29476,13 +29345,11 @@ realclean: $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ Cache_Entries.h \ Transport_Descriptor_Interface.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ @@ -29492,6 +29359,9 @@ realclean: $(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 \ @@ -29526,8 +29396,7 @@ realclean: .obj/Connection_Purging_Strategy.o .obj/Connection_Purging_Strategy.so .shobj/Connection_Purging_Strategy.o .shobj/Connection_Purging_Strategy.so: Connection_Purging_Strategy.cpp \ Connection_Purging_Strategy.h \ $(ACE_ROOT)/ace/pre.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -29536,99 +29405,13 @@ realclean: $(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 \ Connection_Purging_Strategy.inl .obj/LRU_Connection_Purging_Strategy.o .obj/LRU_Connection_Purging_Strategy.so .shobj/LRU_Connection_Purging_Strategy.o .shobj/LRU_Connection_Purging_Strategy.so: LRU_Connection_Purging_Strategy.cpp \ LRU_Connection_Purging_Strategy.h \ $(ACE_ROOT)/ace/pre.h \ Connection_Purging_Strategy.h \ - corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -29637,6 +29420,9 @@ realclean: $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ + Connection_Purging_Strategy.inl \ + Transport.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 \ @@ -29720,15 +29506,93 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ - TAO_Export.h \ corbafwd.i \ - Connection_Purging_Strategy.inl \ - Cache_Entries.h \ + Exception.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ Transport_Descriptor_Interface.h \ Endpoint.h \ Endpoint.i \ Transport_Descriptor_Interface.inl \ - Cache_Entries.inl + Transport_Cache_Manager.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 \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(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 \ + Cache_Entries.h \ + Transport_Descriptor_Interface.h \ + Cache_Entries.inl \ + Transport_Cache_Manager.inl \ + Transport_Timer.h TAO_Export.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/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/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 \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(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 \ + Transport.inl .obj/Services.o .obj/Services.so .shobj/Services.o .shobj/Services.so: Services.cpp \ Services.h \ @@ -30628,8 +30492,8 @@ realclean: CONV_FRAMEC.i \ Tagged_Components.i \ PolicyC.h \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -30777,6 +30641,7 @@ realclean: $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ LocalObject.h \ + Object.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -30848,7 +30713,6 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - Object.h \ Object_Proxy_Broker.h \ Object_Proxy_Impl.h \ Object.i \ @@ -31169,8 +31033,8 @@ realclean: CONV_FRAMEC.h \ CONV_FRAMEC.i \ Tagged_Components.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -32332,8 +32196,8 @@ realclean: CONV_FRAMEC.h \ CONV_FRAMEC.i \ Tagged_Components.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -32906,7 +32770,8 @@ realclean: $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ - ORB_Core.i + ORB_Core.i \ + debug.h .obj/RT_ORB.o .obj/RT_ORB.so .shobj/RT_ORB.o .shobj/RT_ORB.so: RT_ORB.cpp \ RT_ORB.h \ @@ -33668,8 +33533,7 @@ realclean: Pluggable.h \ Pluggable.i \ Protocol_Factory.h \ - params.h \ - params.i \ + params.h params.i \ TAO_Singleton_Manager.h TAO_Singleton.h Adapter.h Adapter.i \ PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h DynamicC.i \ MessagingC.h orbconf.h ValueBase.h \ @@ -33791,8 +33655,8 @@ realclean: TAO_Export.h \ corbafwd.i \ RTCORBAC.h \ - corbafwd.h \ - IOPC.h TAO_Export.h Any.h \ + corbafwd.h IOPC.h \ + TAO_Export.h Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -33809,8 +33673,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 \ @@ -33818,15 +33682,13 @@ realclean: Sequence.h \ Sequence_T.i \ Sequence_T.cpp \ - IOPC.i \ - PolicyC.h \ + IOPC.i PolicyC.h \ CurrentC.h \ CurrentC.i \ Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - TimeBaseC.h \ - Any.h \ + TimeBaseC.h Any.h \ SmartProxies/Smart_Proxies.h \ SmartProxies/smartproxies_export.h \ TAO_Singleton.h \ @@ -33878,8 +33740,8 @@ realclean: CONV_FRAMEC.h \ CONV_FRAMEC.i \ Tagged_Components.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -34354,8 +34216,8 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - IOPC.h TAO_Export.h Any.h \ + corbafwd.i IOPC.h \ + TAO_Export.h Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -34372,8 +34234,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 \ @@ -34381,15 +34243,13 @@ realclean: Sequence.h \ Sequence_T.i \ Sequence_T.cpp \ - IOPC.i \ - PolicyC.h \ + IOPC.i PolicyC.h \ CurrentC.h \ CurrentC.i \ Encodable.h \ Remote_Object_Proxy_Impl.h \ PolicyC.i \ - TimeBaseC.h \ - Any.h \ + TimeBaseC.h Any.h \ SmartProxies/Smart_Proxies.h \ SmartProxies/smartproxies_export.h \ TAO_Singleton.h \ @@ -34414,8 +34274,8 @@ realclean: CONV_FRAMEC.h \ CONV_FRAMEC.i \ Tagged_Components.i \ - GIOP_Message_State.h \ - GIOP_Message_State.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ Profile.i \ MProfile.i \ ORB.h \ @@ -35588,6 +35448,8 @@ realclean: GIOP_Message_Generator_Parser_Impl.inl \ GIOP_Message_Reactive_Handler.h \ GIOP_Message_State.h \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ GIOP_Message_State.i \ GIOP_Message_Reactive_Handler.inl \ GIOP_Utils.h \ @@ -35726,7 +35588,8 @@ realclean: Cache_Entries.h \ Transport_Descriptor_Interface.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -35884,6 +35747,8 @@ realclean: GIOP_Utils.h \ GIOP_Utils.i \ GIOP_Message_State.h \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ GIOP_Message_State.i \ GIOP_Message_Lite.i \ debug.h \ @@ -36038,6 +35903,8 @@ realclean: 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 \ $(ACE_ROOT)/ace/Strategies.h \ @@ -36166,6 +36033,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ GIOP_Message_State.i \ GIOP_Message_Reactive_Handler.inl \ GIOP_Message_Generator_Parser_Impl.h \ @@ -36335,6 +36204,8 @@ realclean: 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 \ $(ACE_ROOT)/ace/Strategies.h \ @@ -36645,6 +36516,8 @@ realclean: Pluggable_Messaging_Utils.i \ TAO_Server_Request.h Tagged_Profile.h Object.h TAO_Server_Request.i \ GIOP_Message_State.h \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ GIOP_Message_State.i \ CORBA_String.h \ CORBA_String.inl @@ -36890,6 +36763,8 @@ realclean: IOPC.i \ GIOP_Utils.i \ GIOP_Message_State.h \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ GIOP_Message_State.i \ GIOP_Message_Locate_Header.h \ Tagged_Profile.h \ @@ -36906,8 +36781,7 @@ 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 \ CurrentC.h \ CurrentC.i \ Encodable.h \ @@ -36942,8 +36816,7 @@ realclean: Services.i \ CORBA_String.h \ CORBA_String.inl \ - PolicyC.h \ - ORB.i \ + PolicyC.h ORB.i \ Environment.h Policy_Manager.h \ Policy_Manager.i \ Resource_Factory.h \ @@ -37027,7 +36900,8 @@ realclean: Cache_Entries.h \ Transport_Descriptor_Interface.h \ Cache_Entries.inl \ - debug.h \ + Connection_Purging_Strategy.h \ + Connection_Purging_Strategy.inl \ Transport_Cache_Manager.inl \ Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -37418,6 +37292,8 @@ realclean: 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 \ $(ACE_ROOT)/ace/Strategies.h \ @@ -37807,6 +37683,8 @@ realclean: $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ + GIOP_Message_Version.h \ + GIOP_Message_Version.inl \ GIOP_Message_State.i \ GIOP_Utils.h \ Object.h \ diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp index 185af03a458..ee5f9647379 100644 --- a/TAO/tao/Muxed_TMS.cpp +++ b/TAO/tao/Muxed_TMS.cpp @@ -2,7 +2,7 @@ #include "tao/Muxed_TMS.h" #include "tao/Reply_Dispatcher.h" -#include "tao/GIOP_Message_State.h" +#include "tao/GIOP_Message_Version.h" #include "tao/debug.h" #include "tao/Pluggable_Messaging_Utils.h" #include "Transport.h" diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile index 0ca344bb520..aacf71b3502 100644 --- a/TAO/tao/PortableServer/Makefile +++ b/TAO/tao/PortableServer/Makefile @@ -526,7 +526,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i POA.i \ + $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ @@ -946,7 +948,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i ImplRepoS.h ImplRepoC.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(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 \ @@ -963,9 +968,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + portableserver_export.h \ ImplRepoC.i \ PortableServer.h \ - portableserver_export.h \ RTPortableServerC.h \ Servant_Base.h \ Collocated_Object.h \ @@ -973,17 +978,19 @@ CPPFLAGS += -I$(TAO_ROOT) ThruPOA_Object_Proxy_Impl.h \ Direct_Object_Proxy_Impl.h \ ServerRequestInfo.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ ServerRequestInfo.inl \ - ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp ImplRepoS.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ + ImplRepoS_T.h \ + ImplRepoS_T.i \ + ImplRepoS_T.cpp \ + ImplRepoS.i \ + ImplRepo_i.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 \ + $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ @@ -1020,8 +1027,8 @@ 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/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Stub.i \ @@ -1387,7 +1394,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i Strategized_Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/OctetSeqC.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 \ @@ -1439,8 +1448,6 @@ CPPFLAGS += -I$(TAO_ROOT) ServerRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ ServerRequestInfo.inl \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ @@ -1458,8 +1465,8 @@ 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/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Stub.i \ @@ -2044,11 +2051,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(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 \ @@ -2451,7 +2459,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i Operation_Table.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i POA.i \ + Operation_Table.h \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -2509,8 +2519,8 @@ 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/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Stub.i \ @@ -2519,8 +2529,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ $(ACE_ROOT)/ace/Dynamic_Service.h \ @@ -2748,7 +2756,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/OctetSeqC.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 \ @@ -2804,8 +2814,8 @@ 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/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Stub.i @@ -3538,8 +3548,8 @@ 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/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Stub.i @@ -3842,8 +3852,8 @@ 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/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Stub.i \ @@ -3859,8 +3869,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Dynamic_Service.cpp .obj/ORB_Manager.o .obj/ORB_Manager.so .shobj/ORB_Manager.o .shobj/ORB_Manager.so: ORB_Manager.cpp ORB_Manager.h \ - $(ACE_ROOT)/ace/pre.h \ - PortableServer.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h PortableServer.h \ + portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4016,6 +4026,205 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/ORB.i +.obj/ImplRepo_i.o .obj/ImplRepo_i.so .shobj/ImplRepo_i.o .shobj/ImplRepo_i.so: ImplRepo_i.cpp \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/pre.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 \ + ImplRepo_i.h \ + ImplRepoS.h \ + ImplRepoC.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/Message_Block.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/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 \ + $(TAO_ROOT)/tao/try_macros.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + $(TAO_ROOT)/tao/varbase.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.i \ + $(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.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/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/Encodable.h \ + $(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 \ + RTPortableServerC.h \ + PortableServerC.h \ + PortableServerC.i \ + $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/RTCORBAC.i \ + RTPortableServerC.i \ + Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + Servant_Base.i \ + Collocated_Object.h \ + Collocated_Object.i \ + ThruPOA_Object_Proxy_Impl.h \ + Direct_Object_Proxy_Impl.h \ + ServerRequestInfo.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + ServerRequestInfo.inl \ + ImplRepoS_T.h \ + ImplRepoS_T.i \ + ImplRepoS_T.cpp \ + ImplRepoS.i \ + $(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 + .obj/ServerRequestInfo.o .obj/ServerRequestInfo.so .shobj/ServerRequestInfo.o .shobj/ServerRequestInfo.so: ServerRequestInfo.cpp ServerRequestInfo.h \ $(ACE_ROOT)/ace/pre.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -4790,8 +4999,8 @@ 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/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB.h \ @@ -4899,8 +5108,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RequestInfo_Util.h .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 \ @@ -5202,8 +5410,8 @@ 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/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Stub.i \ @@ -5241,8 +5449,7 @@ 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 \ @@ -5518,8 +5725,8 @@ 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/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/Stub.i \ @@ -5693,8 +5900,8 @@ 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/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i @@ -5920,7 +6127,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Array_Base.cpp \ $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ - POA.i \ + $(TAO_ROOT)/tao/OctetSeqC.h \ + $(TAO_ROOT)/tao/OctetSeqC.i POA.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -5974,8 +6182,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOPC.h \ $(TAO_ROOT)/tao/GIOPC.i \ $(TAO_ROOT)/tao/Tagged_Profile.i \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.i \ $(TAO_ROOT)/tao/debug.h diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index 5dfcfef48ce..b7b4f9b17a2 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -316,7 +316,7 @@ TAO_Unknown_Profile::TAO_Unknown_Profile (CORBA::ULong tag, TAO_ORB_Core *orb_core) : TAO_Profile (tag, orb_core, - TAO_GIOP_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)), + TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)), tagged_profile_ () { } diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h index 6a06069240d..22afbde113d 100644 --- a/TAO/tao/Profile.h +++ b/TAO/tao/Profile.h @@ -23,7 +23,7 @@ #include "Tagged_Components.h" #include "PolicyC.h" -#include "GIOP_Message_State.h" +#include "GIOP_Message_Version.h" class TAO_MProfile; class TAO_Stub; @@ -45,7 +45,7 @@ public: /// Constructor TAO_Profile (CORBA::ULong tag, TAO_ORB_Core *orb_core, - const TAO_GIOP_Version &version); + const TAO_GIOP_Message_Version &version); /// If you have a virtual method you need a virtual dtor. virtual ~TAO_Profile (void); @@ -55,7 +55,7 @@ public: /// Return a pointer to this profile's version. This object /// maintains ownership. - const TAO_GIOP_Version &version (void) const; + const TAO_GIOP_Message_Version &version (void) const; /// Get a poiter to the TAO_ORB_Core TAO_ORB_Core *orb_core (void) const; @@ -179,7 +179,7 @@ private: protected: /// IIOP version number. - TAO_GIOP_Version version_; + TAO_GIOP_Message_Version version_; /// The tagged components TAO_Tagged_Components tagged_components_; diff --git a/TAO/tao/Profile.i b/TAO/tao/Profile.i index 5fa01edfba2..d7f47d05eda 100644 --- a/TAO/tao/Profile.i +++ b/TAO/tao/Profile.i @@ -4,7 +4,7 @@ ACE_INLINE TAO_Profile::TAO_Profile (CORBA::ULong tag, TAO_ORB_Core *orb_core, - const TAO_GIOP_Version &version) + const TAO_GIOP_Message_Version &version) : version_ (version), are_policies_parsed_ (0), stub_ (0), @@ -22,7 +22,7 @@ TAO_Profile::tag (void) const return this->tag_; } -ACE_INLINE const TAO_GIOP_Version & +ACE_INLINE const TAO_GIOP_Message_Version & TAO_Profile::version (void) const { return this->version_; diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h index 56bb57aeec8..ad6ffd4c516 100644 --- a/TAO/tao/Reply_Dispatcher.h +++ b/TAO/tao/Reply_Dispatcher.h @@ -27,7 +27,7 @@ // Forward Declarations. class TAO_GIOP_Message_State; -class TAO_GIOP_Version; +class TAO_GIOP_Message_Version; class TAO_Transport; class TAO_Pluggable_Reply_Params; diff --git a/TAO/tao/Strategies/Makefile b/TAO/tao/Strategies/Makefile index 3059c0cbac4..5714ad7fd28 100644 --- a/TAO/tao/Strategies/Makefile +++ b/TAO/tao/Strategies/Makefile @@ -332,7 +332,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ @@ -415,8 +416,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/Connector_Registry.h \ $(TAO_ROOT)/tao/Connector_Registry.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ UIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Connector.cpp \ @@ -674,7 +675,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ @@ -757,8 +759,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/Connector_Registry.h \ $(TAO_ROOT)/tao/Connector_Registry.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ UIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Connector.cpp \ @@ -909,8 +911,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ strategies_export.h \ $(TAO_ROOT)/tao/Object_KeyC.h \ @@ -952,12 +954,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -968,6 +968,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -1105,6 +1108,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RT_Policy_i.i \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/debug.h \ uiop_endpoints.h uiop_endpoints.i .obj/UIOP_Transport.o .obj/UIOP_Transport.so .shobj/UIOP_Transport.o .shobj/UIOP_Transport.so: UIOP_Transport.cpp UIOP_Transport.h \ @@ -1244,12 +1248,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -1260,6 +1262,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -1369,8 +1374,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -1452,6 +1457,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/GIOP_Message_Base.h \ $(TAO_ROOT)/tao/Pluggable_Messaging.h \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ @@ -1468,6 +1474,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.inl \ $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.inl \ $(TAO_ROOT)/tao/GIOP_Message_Reactive_Handler.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/GIOP_Message_Reactive_Handler.inl \ $(TAO_ROOT)/tao/GIOP_Utils.h \ $(TAO_ROOT)/tao/GIOP_Utils.i \ @@ -1722,7 +1730,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ @@ -1755,12 +1764,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ UIOP_Endpoint.h UIOP_Endpoint.i UIOP_Profile.i \ + $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -2065,7 +2075,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ @@ -2149,8 +2160,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/Connector_Registry.h \ $(TAO_ROOT)/tao/Connector_Registry.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ UIOP_Profile.h \ $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ @@ -2162,12 +2173,12 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ UIOP_Endpoint.h UIOP_Endpoint.i UIOP_Profile.i \ $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/MProfile.i + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/debug.h .obj/UIOP_Connection_Handler.o .obj/UIOP_Connection_Handler.so .shobj/UIOP_Connection_Handler.o .shobj/UIOP_Connection_Handler.so: UIOP_Connection_Handler.cpp \ UIOP_Connection_Handler.h \ - $(ACE_ROOT)/ace/pre.h \ - UIOP_Transport.h \ + $(ACE_ROOT)/ace/pre.h UIOP_Transport.h \ $(TAO_ROOT)/tao/Transport.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -2303,12 +2314,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -2319,6 +2328,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -2394,6 +2406,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Wait_Strategy.h \ $(TAO_ROOT)/tao/Wait_Strategy.inl \ UIOP_Connection_Handler.inl UIOP_Endpoint.h UIOP_Endpoint.i \ + $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -2500,6 +2513,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOP_Utils.h \ $(TAO_ROOT)/tao/GIOP_Utils.i \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/GIOP_Message_Lite.i @@ -2646,12 +2661,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Array_Base.h \ - $(ACE_ROOT)/ace/Array_Base.inl \ - $(ACE_ROOT)/ace/Array_Base.cpp \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -2662,6 +2675,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ @@ -2966,7 +2982,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ @@ -3073,8 +3090,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/MEM_Addr.h \ $(ACE_ROOT)/ace/MEM_Addr.i \ $(ACE_ROOT)/ace/MEM_Acceptor.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ SHMIOP_Acceptor.i SHMIOP_Connector.h \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Connector.cpp \ @@ -3223,8 +3240,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -3569,7 +3586,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ @@ -3615,8 +3633,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -3701,6 +3719,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/GIOP_Message_Lite.h \ $(TAO_ROOT)/tao/Pluggable_Messaging.h \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ @@ -3708,6 +3727,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Pluggable_Messaging.i \ $(TAO_ROOT)/tao/GIOP_Utils.h \ $(TAO_ROOT)/tao/GIOP_Utils.i \ + $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/GIOP_Message_Lite.i \ GIOP_Message_NonReactive_Base.h GIOP_Message_NonReactive_Handler.h \ $(TAO_ROOT)/tao/GIOP_Message_Reactive_Handler.h \ @@ -3989,7 +4010,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ @@ -4013,8 +4035,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ @@ -4026,6 +4048,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/ORB.i \ SHMIOP_Endpoint.i SHMIOP_Profile.i \ + $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/Base_Transport_Property.h \ $(TAO_ROOT)/tao/Base_Transport_Property.inl \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -4312,7 +4335,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ @@ -4420,8 +4444,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/MEM_Addr.h \ $(ACE_ROOT)/ace/MEM_Addr.i \ $(ACE_ROOT)/ace/MEM_Acceptor.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ SHMIOP_Acceptor.i SHMIOP_Profile.h \ $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ @@ -4433,7 +4457,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ SHMIOP_Endpoint.h SHMIOP_Endpoint.i SHMIOP_Profile.i \ $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/MProfile.i + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/debug.h .obj/SHMIOP_Connection_Handler.o .obj/SHMIOP_Connection_Handler.so .shobj/SHMIOP_Connection_Handler.o .shobj/SHMIOP_Connection_Handler.so: SHMIOP_Connection_Handler.cpp \ SHMIOP_Connection_Handler.h \ @@ -4640,7 +4665,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ @@ -4665,6 +4691,7 @@ CPPFLAGS += -I$(TAO_ROOT) SHMIOP_Transport.i SHMIOP_Connection_Handler.inl \ $(TAO_ROOT)/tao/Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ + $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -4775,6 +4802,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.inl \ $(TAO_ROOT)/tao/GIOP_Message_Reactive_Handler.h \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/GIOP_Message_Reactive_Handler.inl \ $(TAO_ROOT)/tao/GIOP_Utils.h \ @@ -5029,7 +5058,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ - $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Transport_Timer.h \ $(TAO_ROOT)/tao/Transport.inl \ @@ -5049,7 +5079,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Process_Semaphore.inl \ $(ACE_ROOT)/ace/MEM_IO.i \ $(ACE_ROOT)/ace/MEM_Stream.i \ - SHMIOP_Transport.i SHMIOP_Connection_Handler.inl + SHMIOP_Transport.i SHMIOP_Connection_Handler.inl \ + $(TAO_ROOT)/tao/debug.h .obj/GIOP_Message_NonReactive_Base.o .obj/GIOP_Message_NonReactive_Base.so .shobj/GIOP_Message_NonReactive_Base.o .shobj/GIOP_Message_NonReactive_Base.so: GIOP_Message_NonReactive_Base.cpp \ GIOP_Message_NonReactive_Base.h \ @@ -5157,6 +5188,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/GIOP_Message_Reactive_Handler.h \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/GIOP_Message_Reactive_Handler.inl \ GIOP_Message_NonReactive_Handler.inl \ @@ -5429,6 +5462,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/GIOP_Message_Reactive_Handler.h \ $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/GIOP_Message_State.i \ $(TAO_ROOT)/tao/GIOP_Message_Reactive_Handler.inl \ GIOP_Message_NonReactive_Handler.inl GIOP_Message_NonReactive_Base.h \ @@ -5600,6 +5635,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ $(TAO_ROOT)/tao/Cache_Entries.h \ $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ $(TAO_ROOT)/tao/Transport_Timer.h \ $(ACE_ROOT)/ace/Strategies.h \ @@ -6577,6 +6614,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ + $(TAO_ROOT)/tao/Transport.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -6662,15 +6702,91 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ - $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ - $(TAO_ROOT)/tao/Cache_Entries.inl + $(TAO_ROOT)/tao/Transport_Cache_Manager.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 \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(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 \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/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/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/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 \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(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 \ + $(TAO_ROOT)/tao/Transport.inl .obj/FIFO_Connection_Purging_Strategy.o .obj/FIFO_Connection_Purging_Strategy.so .shobj/FIFO_Connection_Purging_Strategy.o .shobj/FIFO_Connection_Purging_Strategy.so: \ FIFO_Connection_Purging_Strategy.cpp \ @@ -6686,6 +6802,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ + $(TAO_ROOT)/tao/Transport.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -6771,15 +6890,91 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ - $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ $(TAO_ROOT)/tao/Endpoint.h \ $(TAO_ROOT)/tao/Endpoint.i \ $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ - $(TAO_ROOT)/tao/Cache_Entries.inl + $(TAO_ROOT)/tao/Transport_Cache_Manager.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 \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(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 \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/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/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/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 \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(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 \ + $(TAO_ROOT)/tao/Transport.inl .obj/NULL_Connection_Purging_Strategy.o .obj/NULL_Connection_Purging_Strategy.so .shobj/NULL_Connection_Purging_Strategy.o .shobj/NULL_Connection_Purging_Strategy.so: \ NULL_Connection_Purging_Strategy.cpp \ @@ -6795,6 +6990,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \ + $(TAO_ROOT)/tao/TAO_Export.h \ + $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \ + $(TAO_ROOT)/tao/Transport.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -6880,9 +7078,91 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ - $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl + $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ + $(TAO_ROOT)/tao/Endpoint.h \ + $(TAO_ROOT)/tao/Endpoint.i \ + $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.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 \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(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 \ + $(TAO_ROOT)/tao/Cache_Entries.h \ + $(TAO_ROOT)/tao/Cache_Entries.inl \ + $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \ + $(TAO_ROOT)/tao/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/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/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 \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(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 \ + $(TAO_ROOT)/tao/Transport.inl .obj/Linear_Priority_Mapping.o .obj/Linear_Priority_Mapping.so .shobj/Linear_Priority_Mapping.o .shobj/Linear_Priority_Mapping.so: Linear_Priority_Mapping.cpp \ $(TAO_ROOT)/tao/orbconf.h \ diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.h b/TAO/tao/Strategies/SHMIOP_Acceptor.h index a49d6ceee22..de7e801cf94 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.h +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.h @@ -34,7 +34,7 @@ #include "tao/Acceptor_Impl.h" #include "ace/Acceptor.h" #include "ace/MEM_Acceptor.h" -#include "tao/GIOP_Message_State.h" +#include "tao/GIOP_Message_Version.h" // TAO SHMIOP_Acceptor concrete call defination class TAO_Strategies_Export TAO_SHMIOP_Acceptor : public TAO_Acceptor @@ -112,7 +112,7 @@ protected: ACE_MEM_Addr address_; // A local endpoint. - TAO_GIOP_Version version_; + TAO_GIOP_Message_Version version_; // The GIOP version for this endpoint TAO_ORB_Core *orb_core_; diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp index 1aff1b8966b..927afcb74fe 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.cpp +++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp @@ -32,7 +32,7 @@ TAO_SHMIOP_Profile::object_key_delimiter (void) const TAO_SHMIOP_Profile::TAO_SHMIOP_Profile (const ACE_MEM_Addr &addr, const TAO_ObjectKey &object_key, - const TAO_GIOP_Version &version, + const TAO_GIOP_Message_Version &version, TAO_ORB_Core *orb_core) : TAO_Profile (TAO_TAG_SHMEM_PROFILE, orb_core, version), endpoint_ (addr, @@ -47,7 +47,7 @@ TAO_SHMIOP_Profile::TAO_SHMIOP_Profile (const char* host, CORBA::UShort port, const TAO_ObjectKey &object_key, const ACE_INET_Addr &addr, - const TAO_GIOP_Version &version, + const TAO_GIOP_Message_Version &version, TAO_ORB_Core *orb_core) : TAO_Profile (TAO_TAG_SHMEM_PROFILE, orb_core, version), endpoint_ (host, port, addr), @@ -60,7 +60,7 @@ TAO_SHMIOP_Profile::TAO_SHMIOP_Profile (const char* host, TAO_SHMIOP_Profile::TAO_SHMIOP_Profile (TAO_ORB_Core *orb_core) : TAO_Profile (TAO_TAG_SHMEM_PROFILE, orb_core, - TAO_GIOP_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)), + TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)), endpoint_ (), count_ (1), object_key_ (), diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h index 4d8cc0ec3b9..3e4a8ee8761 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.h +++ b/TAO/tao/Strategies/SHMIOP_Profile.h @@ -58,7 +58,7 @@ public: /// already been marshaled. TAO_SHMIOP_Profile (const ACE_MEM_Addr &addr, const TAO_ObjectKey &object_key, - const TAO_GIOP_Version &version, + const TAO_GIOP_Message_Version &version, TAO_ORB_Core *orb_core); /// Profile constructor, this is the most efficient since it @@ -67,7 +67,7 @@ public: CORBA::UShort port, const TAO_ObjectKey &object_key, const ACE_INET_Addr &addr, - const TAO_GIOP_Version &version, + const TAO_GIOP_Message_Version &version, TAO_ORB_Core *orb_core); /// Profile constructor, default. diff --git a/TAO/tao/Strategies/UIOP_Acceptor.h b/TAO/tao/Strategies/UIOP_Acceptor.h index 186b3cad00b..cd7fb42a95e 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.h +++ b/TAO/tao/Strategies/UIOP_Acceptor.h @@ -35,7 +35,7 @@ #include "ace/LSOCK_Acceptor.h" #include "UIOP_Connection_Handler.h" #include "tao/Acceptor_Impl.h" -#include "tao/GIOP_Message_State.h" +#include "tao/GIOP_Message_Version.h" // TAO UIOP_Acceptor concrete call defination @@ -117,7 +117,7 @@ private: TAO_UIOP_ACCEPT_STRATEGY *accept_strategy_; // Acceptor strategies. - TAO_GIOP_Version version_; + TAO_GIOP_Message_Version version_; // The GIOP version for this endpoint TAO_ORB_Core *orb_core_; diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp index c95b49a91ce..6a2991fe989 100644 --- a/TAO/tao/Strategies/UIOP_Profile.cpp +++ b/TAO/tao/Strategies/UIOP_Profile.cpp @@ -34,7 +34,7 @@ TAO_UIOP_Profile::object_key_delimiter (void) const TAO_UIOP_Profile::TAO_UIOP_Profile (const ACE_UNIX_Addr &addr, const TAO_ObjectKey &object_key, - const TAO_GIOP_Version &version, + const TAO_GIOP_Message_Version &version, TAO_ORB_Core *orb_core) : TAO_Profile (TAO_TAG_UIOP_PROFILE, orb_core, version), endpoint_ (addr), @@ -47,7 +47,7 @@ TAO_UIOP_Profile::TAO_UIOP_Profile (const ACE_UNIX_Addr &addr, TAO_UIOP_Profile::TAO_UIOP_Profile (const char *, const TAO_ObjectKey &object_key, const ACE_UNIX_Addr &addr, - const TAO_GIOP_Version &version, + const TAO_GIOP_Message_Version &version, TAO_ORB_Core *orb_core) : TAO_Profile (TAO_TAG_UIOP_PROFILE, orb_core, version), endpoint_ (addr), @@ -60,7 +60,7 @@ TAO_UIOP_Profile::TAO_UIOP_Profile (const char *, TAO_UIOP_Profile::TAO_UIOP_Profile (TAO_ORB_Core *orb_core) : TAO_Profile (TAO_TAG_UIOP_PROFILE, orb_core, - TAO_GIOP_Version (TAO_DEF_GIOP_MAJOR, + TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)), endpoint_ (), count_ (1), diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h index 3209f18c948..b8c1f47f800 100644 --- a/TAO/tao/Strategies/UIOP_Profile.h +++ b/TAO/tao/Strategies/UIOP_Profile.h @@ -59,14 +59,14 @@ public: /// already been marshaled. (actually, no marshalling for this protocol) TAO_UIOP_Profile (const ACE_UNIX_Addr &addr, const TAO_ObjectKey &object_key, - const TAO_GIOP_Version &version, + const TAO_GIOP_Message_Version &version, TAO_ORB_Core *orb_core); /// Profile constructor TAO_UIOP_Profile (const char *rendezvous_point, const TAO_ObjectKey &object_key, const ACE_UNIX_Addr &addr, - const TAO_GIOP_Version &version, + const TAO_GIOP_Message_Version &version, TAO_ORB_Core *orb_core); /// Profile constructor, default. diff --git a/TAO/tao/Synch_Reply_Dispatcher.h b/TAO/tao/Synch_Reply_Dispatcher.h index 331ed2fc8e5..571948a9dbb 100644 --- a/TAO/tao/Synch_Reply_Dispatcher.h +++ b/TAO/tao/Synch_Reply_Dispatcher.h @@ -20,7 +20,7 @@ #include "ace/pre.h" #include "tao/Reply_Dispatcher.h" -#include "tao/GIOP_Message_State.h" +#include "tao/GIOP_Message_Version.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/TypeCodeFactory/Makefile b/TAO/tao/TypeCodeFactory/Makefile index cf5481e9b92..b0be4b4c3dd 100644 --- a/TAO/tao/TypeCodeFactory/Makefile +++ b/TAO/tao/TypeCodeFactory/Makefile @@ -372,8 +372,8 @@ realclean: clean $(TAO_ROOT)/tao/Encodable.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ $(TAO_ROOT)/tao/Profile.i \ $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB.h \ |