summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/tao/Asynch_Invocation.cpp11
-rw-r--r--TAO/tao/Asynch_Invocation.h12
-rw-r--r--TAO/tao/Asynch_Invocation.i8
-rw-r--r--TAO/tao/MessagingC.h4
-rw-r--r--TAO/tao/Reply_Dispatcher.cpp7
-rw-r--r--TAO/tao/Reply_Dispatcher.h8
-rw-r--r--TAO/tao/Reply_Dispatcher.i3
-rw-r--r--TAO/tao/Request.cpp16
-rw-r--r--TAO/tao/Request.h9
-rw-r--r--TAO/tao/Stub.cpp8
-rw-r--r--TAO/tao/Stub.h9
11 files changed, 34 insertions, 61 deletions
diff --git a/TAO/tao/Asynch_Invocation.cpp b/TAO/tao/Asynch_Invocation.cpp
index 2e9c9246a6a..b6675ca0988 100644
--- a/TAO/tao/Asynch_Invocation.cpp
+++ b/TAO/tao/Asynch_Invocation.cpp
@@ -2,9 +2,6 @@
#include "tao/Asynch_Invocation.h"
-#if defined (TAO_HAS_CORBA_MESSAGING)
-#if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER)
-
#include "tao/Timeprobe.h"
#include "tao/Stub.h"
#include "tao/Principal.h"
@@ -51,6 +48,9 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Asynch_Invocation_Timeprobe_Description,
#endif /* ACE_ENABLE_TIMEPROBES */
+#if defined (TAO_HAS_CORBA_MESSAGING)
+#if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER)
+
void
TAO_GIOP_Twoway_Asynch_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
ACE_THROW_SPEC ((CORBA::SystemException))
@@ -106,6 +106,9 @@ TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
return TAO_INVOKE_OK;
}
+#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
+#endif /* TAO_HAS_CORBA_MESSAGING */
+
//**************************************************************************
void
@@ -164,5 +167,3 @@ TAO_GIOP_DII_Deferred_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
return TAO_INVOKE_OK;
}
-#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
-#endif /* TAO_HAS_CORBA_MESSAGING */
diff --git a/TAO/tao/Asynch_Invocation.h b/TAO/tao/Asynch_Invocation.h
index bacf8b97174..14f66f304b1 100644
--- a/TAO/tao/Asynch_Invocation.h
+++ b/TAO/tao/Asynch_Invocation.h
@@ -27,12 +27,12 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include "tao/MessagingC.h"
+
#if defined (TAO_HAS_CORBA_MESSAGING)
# if defined (TAO_HAS_AMI_CALLBACK) || (TAO_HAS_AMI_POLLER)
-#include "tao/MessagingC.h"
-
class TAO_Export TAO_GIOP_Twoway_Asynch_Invocation : public TAO_GIOP_Invocation
{
// = TITLE
@@ -81,6 +81,10 @@ private:
// Reply dispatcher for the current synchronous Asynch_Invocation.
};
+# endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
+
+#endif /* TAO_HAS_CORBA_MESSAGING */
+
//***********************************************************************
class TAO_Export TAO_GIOP_DII_Deferred_Invocation : public TAO_GIOP_Invocation
@@ -133,8 +137,4 @@ private:
# include "tao/Asynch_Invocation.i"
#endif /* __ACE_INLINE__ */
-# endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
#endif /* TAO_ASYNCH_INVOCATION_H */
diff --git a/TAO/tao/Asynch_Invocation.i b/TAO/tao/Asynch_Invocation.i
index 12895c64383..b2c95733fed 100644
--- a/TAO/tao/Asynch_Invocation.i
+++ b/TAO/tao/Asynch_Invocation.i
@@ -3,6 +3,10 @@
// $Id$
//
+#if defined (TAO_HAS_CORBA_MESSAGING)
+
+# if defined (TAO_HAS_AMI_CALLBACK) || (TAO_HAS_AMI_POLLER)
+
ACE_INLINE
TAO_GIOP_Twoway_Asynch_Invocation::
TAO_GIOP_Twoway_Asynch_Invocation (TAO_Stub *stub,
@@ -25,6 +29,10 @@ TAO_GIOP_Twoway_Asynch_Invocation (TAO_Stub *stub,
reply_handler_ptr));
}
+# endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
+
+#endif /* TAO_HAS_CORBA_MESSAGING */
+
//****************************************************************************
ACE_INLINE
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h
index 557ff629b31..fe29304f28f 100644
--- a/TAO/tao/MessagingC.h
+++ b/TAO/tao/MessagingC.h
@@ -2058,8 +2058,6 @@ TAO_NAMESPACE_CLOSE
class TAO_InputCDR;
-#if defined (TAO_HAS_AMI_CALLBACK)
-
// @@ Michael: Addition
enum TAO_AMI_Reply_Status
@@ -2078,6 +2076,8 @@ enum TAO_AMI_Reply_Status
};
+#if defined (TAO_HAS_AMI_CALLBACK)
+
typedef void (*TAO_Reply_Handler_Skeleton)(
TAO_InputCDR &,
Messaging::ReplyHandler *,
diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp
index d0982203235..c05a37e4ff4 100644
--- a/TAO/tao/Reply_Dispatcher.cpp
+++ b/TAO/tao/Reply_Dispatcher.cpp
@@ -229,6 +229,10 @@ TAO_Asynch_Reply_Dispatcher::message_state (void)
return this->message_state_;
}
+#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
+
+#endif /* TAO_HAS_CORBA_MESSAGING */
+
// *********************************************************************
// Constructor.
@@ -318,6 +322,3 @@ TAO_DII_Deferred_Reply_Dispatcher::message_state (void)
return this->message_state_;
}
-#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h
index 127d698f35c..1e481fc4df1 100644
--- a/TAO/tao/Reply_Dispatcher.h
+++ b/TAO/tao/Reply_Dispatcher.h
@@ -206,6 +206,10 @@ private:
// Reply Handler passed in the Asynchronous Invocation.
};
+# endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
+
+#endif /* TAO_HAS_CORBA_MESSAGING */
+
// *********************************************************************
class TAO_Export TAO_DII_Deferred_Reply_Dispatcher : public TAO_Reply_Dispatcher
@@ -266,10 +270,6 @@ private:
// Where the reply needs to go.
};
-# endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
// *********************************************************************
#if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Reply_Dispatcher.i b/TAO/tao/Reply_Dispatcher.i
index f8c31c897ab..82a351f96f4 100644
--- a/TAO/tao/Reply_Dispatcher.i
+++ b/TAO/tao/Reply_Dispatcher.i
@@ -26,6 +26,8 @@ TAO_Asynch_Reply_Dispatcher::version (void) const
return this->version_;
}
+#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
+
//*********************************************************************
ACE_INLINE CORBA::ULong
@@ -40,4 +42,3 @@ TAO_DII_Deferred_Reply_Dispatcher::version (void) const
return this->version_;
}
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
diff --git a/TAO/tao/Request.cpp b/TAO/tao/Request.cpp
index d1f8ad42600..1f5668c80b0 100644
--- a/TAO/tao/Request.cpp
+++ b/TAO/tao/Request.cpp
@@ -139,10 +139,6 @@ CORBA_Request::send_oneway (CORBA::Environment &ACE_TRY_ENV)
ACE_TRY_ENV);
}
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-#if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER)
-
void
CORBA_Request::send_deferred (CORBA::Environment &ACE_TRY_ENV)
{
@@ -160,10 +156,6 @@ CORBA_Request::send_deferred (CORBA::Environment &ACE_TRY_ENV)
ACE_TRY_ENV);
}
-#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
void
CORBA_Request::get_response (CORBA::Environment &ACE_TRY_ENV)
{
@@ -190,10 +182,6 @@ CORBA_Request::poll_response (CORBA::Environment &)
return this->response_received_;
}
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-# if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER)
-
void
CORBA_Request::handle_response (TAO_InputCDR &incoming,
CORBA::ULong reply_status,
@@ -234,10 +222,6 @@ CORBA_Request::handle_response (TAO_InputCDR &incoming,
}
}
-# endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
// constructor.
CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (CORBA::ULong max)
: TAO_Unbounded_Pseudo_Sequence <CORBA_Request,CORBA_Request_var> (max)
diff --git a/TAO/tao/Request.h b/TAO/tao/Request.h
index 2652215b4d5..bb8a057d0e9 100644
--- a/TAO/tao/Request.h
+++ b/TAO/tao/Request.h
@@ -117,19 +117,12 @@ public:
CORBA::Boolean poll_response (CORBA::Environment &ACE_TRY_ENV =
CORBA::Environment::default_environment ());
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-# if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER)
-
+ // Callback method for deferred synchronous requests.
void handle_response (TAO_InputCDR &incoming,
CORBA::ULong reply_status,
CORBA::Environment &ACE_TRY_ENV =
CORBA::Environment::default_environment ());
-# endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
// Pseudo object methods
static CORBA_Request* _duplicate (CORBA_Request*);
static CORBA_Request* _nil (void);
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index aae425791e9..34f4c6d53ba 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -687,10 +687,6 @@ TAO_Stub::do_dynamic_call (const char *opname,
}
}
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-#if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER)
-
void
TAO_Stub::do_deferred_call (const CORBA::Request_ptr req,
CORBA::Environment &ACE_TRY_ENV)
@@ -758,10 +754,6 @@ TAO_Stub::do_deferred_call (const CORBA::Request_ptr req,
}
}
-#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
void
TAO_Stub::put_params (TAO_GIOP_Invocation &call,
CORBA::NVList_ptr args,
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index f76f1e36643..8296f6b3b36 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -268,18 +268,11 @@ public:
// - exceptions ... list of legal user-defined exceptions
// - ACE_TRY_ENV ... used for exception reporting.
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-# if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER)
-
+ // Used with DII deferred synchronous requests.
void do_deferred_call (const CORBA::Request_ptr req,
CORBA_Environment &ACE_TRY_ENV =
TAO_default_environment ());
-# endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
#endif /* TAO_HAS_MINIMUM_CORBA */
#if defined (TAO_HAS_CORBA_MESSAGING)
View Lorry Controller Status