summaryrefslogtreecommitdiff
path: root/TAO/tao/Invocation_Base.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/Invocation_Base.cpp')
-rw-r--r--TAO/tao/Invocation_Base.cpp29
1 files changed, 10 insertions, 19 deletions
diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp
index dd2ab25d2cf..61f210e8d08 100644
--- a/TAO/tao/Invocation_Base.cpp
+++ b/TAO/tao/Invocation_Base.cpp
@@ -1,19 +1,19 @@
-#include "tao/Invocation_Base.h"
-#include "tao/Stub.h"
-#include "tao/operation_details.h"
-#include "tao/ORB_Core.h"
-#include "tao/SystemException.h"
-#include "tao/PortableInterceptor.h" /* Must always be visible. */
+#include "Invocation_Base.h"
+#include "Stub.h"
+#include "operation_details.h"
+#include "ORB_Core.h"
+#include "SystemException.h"
+#include "PortableInterceptor.h" /* Must always be visible. */
#include "ace/Dynamic_Service.h"
#if TAO_HAS_INTERCEPTORS == 1
-# include "tao/PortableInterceptorC.h"
-# include "tao/ClientRequestInterceptor_Adapter_Factory.h"
+# include "PortableInterceptorC.h"
+# include "ClientRequestInterceptor_Adapter_Factory.h"
#endif /* TAO_HAS_INTERCEPTORS == 1*/
#if !defined (__ACE_INLINE__)
-# include "tao/Invocation_Base.inl"
+# include "Invocation_Base.inl"
#endif /* __ACE_INLINE__ */
@@ -22,16 +22,13 @@ ACE_RCSID (tao,
"$Id$")
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
namespace TAO
{
Invocation_Base::Invocation_Base (CORBA::Object_ptr ot,
CORBA::Object_ptr t,
TAO_Stub *stub,
TAO_Operation_Details &details,
- bool response_expected,
- bool request_is_remote)
+ bool response_expected)
: details_ (details)
, forwarded_to_ (0)
, response_expected_ (response_expected)
@@ -44,12 +41,8 @@ namespace TAO
, stack_size_ (0)
, invoke_status_ (TAO_INVOKE_START)
, caught_exception_ (0)
- , is_remote_request_ (request_is_remote)
#endif /*TAO_HAS_INTERCEPTORS == 1*/
{
-#if TAO_HAS_INTERCEPTORS == 0
- ACE_UNUSED_ARG (request_is_remote);
-#endif /*TAO_HAS_INTERCEPTORS == 0*/
}
Invocation_Base::~Invocation_Base (void)
@@ -276,5 +269,3 @@ namespace TAO
}
#endif /*TAO_HAS_INTERCEPTORS == 1*/
}
-
-TAO_END_VERSIONED_NAMESPACE_DECL