ChangeLogTag: Fri Jun 24 08:33:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

12 files changed, 4 insertions, 58 deletions

diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
index 478b1f31d28..0b737f36a92 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
@@ -29,7 +29,6 @@
 #include "tao/Basic_Types.h"
 #include "tao/ORB_Constants.h"
 
-class TAO_GIOP_Invocation;
 class TAO_Profile;
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
index baed8c471ae..97e94cab63e 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
@@ -41,8 +41,6 @@ namespace ACE
   }
 }
 
-class TAO_GIOP_Invocation;
-
 // ****************************************************************
 
 namespace TAO
diff --git a/TAO/tao/ClientRequestInfo.cpp b/TAO/tao/ClientRequestInfo.cpp
index 735e0c197b8..40332c8d035 100644
--- a/TAO/tao/ClientRequestInfo.cpp
+++ b/TAO/tao/ClientRequestInfo.cpp
@@ -280,12 +280,6 @@ TAO_ClientRequestInfo::get_reply_service_context (
                                                  ACE_ENV_ARG_PARAMETER);
 }
 
-TAO_GIOP_Invocation *
-TAO_ClientRequestInfo::invocation (void)
-{
-  return this->invocation_;
-}
-
 // -------------------------------------------------------------------
 
 
diff --git a/TAO/tao/ClientRequestInfo.h b/TAO/tao/ClientRequestInfo.h
index 1b503b31476..2cf18674e14 100644
--- a/TAO/tao/ClientRequestInfo.h
+++ b/TAO/tao/ClientRequestInfo.h
@@ -35,7 +35,6 @@
 #include "tao/ORB_Constants.h"
 
 class TAO_ClientRequestInfo_i;
-class TAO_GIOP_Invocation;
 
 /**
  * @class TAO_ClientRequestInfo
@@ -220,9 +219,6 @@ public:
   /// forwards all method call to.
   TAO_ClientRequestInfo_i * info (void) const;
 
-  /// Accessor to underlying invocation_
-  TAO_GIOP_Invocation *invocation ();
-
 private:
 
   /// Check if this ClientRequestInfo object is called within the
@@ -234,10 +230,6 @@ private:
   /// Pointer to the object that actually implements the
   /// ClientRequestInfo functionality.
   TAO_ClientRequestInfo_i * info_;
-
-  /// Pointer to the GIOP invocation object.
-  TAO_GIOP_Invocation *invocation_;
-
 };
 
 // -------------------------------------------------------------------
diff --git a/TAO/tao/ClientRequestInfo_i.cpp b/TAO/tao/ClientRequestInfo_i.cpp
index d4fb71fa64a..2c953767fca 100644
--- a/TAO/tao/ClientRequestInfo_i.cpp
+++ b/TAO/tao/ClientRequestInfo_i.cpp
@@ -106,31 +106,6 @@ CORBA::Object_ptr
 TAO_ClientRequestInfo_i::effective_target (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  /*if (this->reply_status_ == PortableInterceptor::LOCATION_FORWARD)
-    {
-      // TAO_GIOP_Invocation::forward_reference() already duplicates
-      // the reference before returning it so there is no need to
-      // duplicate it here.
-      return this->invocation_->forwarded_reference ();
-    }
-
-  if (CORBA::is_nil (this->target_))
-    {
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
-        {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            CORBA::Object::_nil ());
-        }
-
-      return adapter->abstractbase_to_object (this->abstract_target_);
-    }
-  */
-
   return CORBA::Object::_duplicate (this->invocation_->effective_target ());
 }
 
@@ -538,7 +513,7 @@ TAO_ClientRequestInfo_i::forward_reference (ACE_ENV_SINGLE_ARG_DECL)
                         CORBA::Object::_nil ());
     }
 
-  // TAO_GIOP_Invocation::forward_reference() already duplicates the
+  // TAO::Invocation_Base::forward_reference() already duplicates the
   // reference before returning it so there is no need to duplicate it
   // here.
   return this->invocation_->forwarded_reference ();
diff --git a/TAO/tao/ClientRequestInfo_i.h b/TAO/tao/ClientRequestInfo_i.h
index f6e42ef5dc2..61784c0c731 100644
--- a/TAO/tao/ClientRequestInfo_i.h
+++ b/TAO/tao/ClientRequestInfo_i.h
@@ -259,9 +259,6 @@ protected:
   /// Pointer to the invocation object.
   TAO::Invocation_Base *invocation_;
 
-  /// Reference to the abstract interface target.
-  // CORBA::AbstractBase_ptr abstract_target_;
-
   /// Pointer to the caught exception.
   CORBA::Exception *caught_exception_;
 
diff --git a/TAO/tao/ClientRequestInfo_i.inl b/TAO/tao/ClientRequestInfo_i.inl
index bfd09c613d4..0418d785570 100644
--- a/TAO/tao/ClientRequestInfo_i.inl
+++ b/TAO/tao/ClientRequestInfo_i.inl
@@ -26,7 +26,7 @@ TAO_ClientRequestInfo_i::forward_reference (
   // LOCATION_FORWARD reply, so we do not set the exception status.
   //
   // The forward object reference is not handled here.  Rather, it is
-  // handled by the TAO_GIOP_Invocation object so that its profiles
+  // handled by the TAO::Invocation_Base object so that its profiles
   // can be added to the list of forward profiles.
 
   this->reply_status_ = PortableInterceptor::LOCATION_FORWARD;
diff --git a/TAO/tao/Codeset_Manager.h b/TAO/tao/Codeset_Manager.h
index fbe3ea29044..273948d39bd 100644
--- a/TAO/tao/Codeset_Manager.h
+++ b/TAO/tao/Codeset_Manager.h
@@ -121,7 +121,7 @@ public:
   ///  Char/Wchar in to the Object Reference.
   void set_codeset (TAO_Tagged_Components& ) const;
 
-  /// Called from an object of "TAO_GIOP_Invocation" to set TCS on the
+  /// Called from an object of TAO::Invocation_Base to set TCS on the
   /// Transport
   void set_tcs (TAO_Profile &theProfile, TAO_Transport &);
 
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp
index f9de6afb8eb..4df6a5844fd 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.cpp
+++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp
@@ -40,11 +40,6 @@ TAO::ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   // For 64-bit platforms, only the lower 32 bits are used.  Hopefully
   // that will be enough to ensure uniqueness.
 
-  // This is basically the same trick used in
-  // TAO_GIOP_Invocation::generate_request_id().  However, no right
-  // shifting of 64 bit addresses is performed since the
-  // TAO_ServerRequest object is not large enough to allow that trick.
-
   CORBA::ULong id = 0;
 
   // Note that we reinterpret_cast to an "unsigned long" instead of
diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h
index 775abbde250..6bf8e516faa 100644
--- a/TAO/tao/Protocols_Hooks.h
+++ b/TAO/tao/Protocols_Hooks.h
@@ -34,7 +34,6 @@ namespace CORBA
 }
 
 class TAO_ORB_Core;
-class TAO_GIOP_Invocation;
 class TAO_Resource_Factory;
 class TAO_Service_Context;
 class TAO_Acceptor_Registry;
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
index d918ef4a12b..26dd559c5c7 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
@@ -27,8 +27,6 @@
 
 #include "tao/Policy_ForwardC.h"
 
-class TAO_GIOP_Invocation;
-
 namespace TAO
 {
   class Profile_Transport_Resolver;
@@ -43,7 +41,7 @@ namespace TAO
 class TAO_RTCORBA_Export TAO_RT_Endpoint_Utils
 {
 public:
-  static 
+  static
   CORBA::Policy *policy (TAO_Cached_Policy_Type type,
                          TAO::Profile_Transport_Resolver &r
                          ACE_ENV_ARG_DECL);
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index e75e1024816..16b4781e842 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -37,7 +37,6 @@ class TAO_Client_Priority_Policy;
 class TAO_Sync_Scope_Policy;
 class TAO_Buffering_Constraint_Policy;
 class TAO_Sync_Strategy;
-class TAO_GIOP_Invocation;
 class TAO_Policy_Set;
 class TAO_Profile;