diff options
Diffstat (limited to 'TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp')
| -rw-r--r-- | TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp index 1cf3a172f6a..cadf68653ce 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp @@ -1,7 +1,7 @@ //$Id$ -#include "tao/DynamicInterface/DII_Invocation_Adapter.h" -#include "tao/DynamicInterface/DII_Invocation.h" -#include "tao/DynamicInterface/DII_Reply_Dispatcher.h" +#include "DII_Invocation_Adapter.h" +#include "DII_Invocation.h" +#include "DII_Reply_Dispatcher.h" #include "tao/Exception.h" #include "tao/ORB_Constants.h" @@ -9,7 +9,7 @@ #include "tao/Transport.h" #include "tao/Transport.h" #include "tao/Pluggable_Messaging.h" -#include "tao/DynamicInterface/Request.h" +#include "Request.h" #include "ace/os_include/os_errno.h" @@ -18,8 +18,6 @@ ACE_RCSID (tao, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO { DII_Invocation_Adapter::DII_Invocation_Adapter (CORBA::Object *target, @@ -85,15 +83,8 @@ namespace TAO effective_target = synch.steal_forwarded_reference (); -#if TAO_HAS_INTERCEPTORS == 1 - const CORBA::Boolean permanent_forward = - (synch.reply_status() == TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM); -#else - const CORBA::Boolean permanent_forward = false; -#endif this->object_forwarded (effective_target, - r.stub (), - permanent_forward + r.stub () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (TAO_INVOKE_FAILURE); } @@ -190,5 +181,3 @@ namespace TAO return status; } } // End namespace TAO - -TAO_END_VERSIONED_NAMESPACE_DECL |