*** empty log message ***

21 files changed, 39 insertions, 132 deletions

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/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/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/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/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/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