summaryrefslogtreecommitdiff
path: root/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp')
-rw-r--r--TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp21
1 files changed, 4 insertions, 17 deletions
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
index b88ff2855ae..ddbd6c62b5a 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
@@ -1,7 +1,7 @@
//$Id$
-#include "tao/Messaging/Asynch_Invocation_Adapter.h"
-#include "tao/Messaging/Asynch_Reply_Dispatcher.h"
-#include "tao/Messaging/Asynch_Invocation.h"
+#include "Asynch_Invocation_Adapter.h"
+#include "Asynch_Reply_Dispatcher.h"
+#include "Asynch_Invocation.h"
#include "tao/Profile_Transport_Resolver.h"
#include "tao/operation_details.h"
@@ -12,7 +12,6 @@
#include "tao/debug.h"
#include "tao/ORB_Core.h"
#include "tao/Thread_Lane_Resources.h"
-#include "tao/GIOP_Utils.h"
ACE_RCSID (Messaging,
@@ -20,8 +19,6 @@ ACE_RCSID (Messaging,
"$Id$")
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
namespace TAO
{
Asynch_Invocation_Adapter::Asynch_Invocation_Adapter (
@@ -175,16 +172,8 @@ namespace TAO
{
effective_target = asynch.steal_forwarded_reference ();
-#if TAO_HAS_INTERCEPTORS == 1
- const CORBA::Boolean permanent_forward =
- (asynch.reply_status() == TAO_GIOP_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);
}
@@ -193,5 +182,3 @@ namespace TAO
}
} // End namespace TAO
-
-TAO_END_VERSIONED_NAMESPACE_DECL