ChangeLogTag: Thu Nov 16 11:16:17 2000 Jeff Parsons <parsons@cs.wustl.edu>

6 files changed, 48 insertions, 38 deletions

diff --git a/TAO/tao/Asynch_Invocation.cpp b/TAO/tao/Asynch_Invocation.cpp
index f857f75368e..bb705fc55db 100644
--- a/TAO/tao/Asynch_Invocation.cpp
+++ b/TAO/tao/Asynch_Invocation.cpp
@@ -5,10 +5,6 @@
 
 ACE_RCSID(tao, Asynch_Invocation, "$Id$")
 
-#if (TAO_HAS_AMI_CALLBACK == 1)	\
-     ||	(TAO_HAS_AMI_POLLER == 1) \
-     ||	(TAO_HAS_MINIMUM_CORBA == 0)
-
 #include "tao/Timeprobe.h"
 #include "tao/Stub.h"
 #include "tao/Object_KeyC.h"
@@ -18,6 +14,8 @@ ACE_RCSID(tao, Asynch_Invocation, "$Id$")
 # include "tao/Asynch_Invocation.i"
 #endif /* ! __ACE_INLINE__ */
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 #if defined (ACE_ENABLE_TIMEPROBES)
 
 static const char *TAO_Asynch_Invocation_Timeprobe_Description[] =
@@ -65,8 +63,12 @@ TAO_GIOP_Asynch_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
   return this->invoke_i	(ACE_TRY_ENV);
 }
 
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
 // **************************************************************************
 
+#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
+
 int
 TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (CORBA::Environment	&ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -76,23 +78,26 @@ TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (CORBA::Environment	&ACE_TRY_ENV)
 
   int retval =
     this->transport_->tms ()->bind_dispatcher (this->op_details_.request_id (),
-					       this->rd_);
+					                                     this->rd_);
   if (retval ==	-1)
     {
       // @@ What is the	right way to handle this error?
       this->close_connection ();
+
       ACE_THROW_RETURN (CORBA::INTERNAL	(TAO_DEFAULT_MINOR_CODE,
-					 CORBA::COMPLETED_NO),
-			TAO_INVOKE_EXCEPTION);
+					                               CORBA::COMPLETED_NO),
+			                  TAO_INVOKE_EXCEPTION);
     }
 
   // Just send the request, without trying to wait for the reply.
   retval = TAO_GIOP_Invocation::invoke (0,
-					ACE_TRY_ENV);
+					                              ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
   if (retval !=	TAO_INVOKE_OK)
-    return retval;
+    {
+      return retval;
+    }
 
   // Everything	executed ok; lets remember the transport for later.
   this->rd_->transport (this->transport_);
@@ -101,6 +106,4 @@ TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (CORBA::Environment	&ACE_TRY_ENV)
   return TAO_INVOKE_OK;
 }
 
-#endif /* TAO_HAS_AMI_CALLBACK == 1
-	  || TAO_HAS_AMI_POLLER	== 1
-	  || TAO_HAS_MINIMUM_CORBA == 0	*/
+#endif /* (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) == 0 */
diff --git a/TAO/tao/Asynch_Invocation.h b/TAO/tao/Asynch_Invocation.h
index 4854a38ff29..80992302ced 100644
--- a/TAO/tao/Asynch_Invocation.h
+++ b/TAO/tao/Asynch_Invocation.h
@@ -26,12 +26,15 @@
 #  pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if (TAO_HAS_AMI_CALLBACK == 1) \
-     || (TAO_HAS_AMI_POLLER == 1) \
-     || (TAO_HAS_MINIMUM_CORBA == 0)
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+#include "tao/Asynch_Reply_Dispatcher.h"
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
+#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
 #include "tao/MessagingC.h"
-#include "tao/Asynch_Reply_Dispatcher.h"
+#endif /* (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) == 0 */
+
+#if (TAO_HAS_MINIMUM_CORBA == 0)
 
 class TAO_Export TAO_GIOP_Asynch_Invocation
   : public TAO_GIOP_Invocation
@@ -69,6 +72,10 @@ protected:
   // Reply dispatcher for the current asynchronous invocation.
 };
 
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
+
 class TAO_Export TAO_GIOP_Twoway_Asynch_Invocation
   : public TAO_GIOP_Asynch_Invocation
 {
@@ -100,13 +107,11 @@ protected:
   // send/reply code and the system exceptions.
 };
 
+#endif /* (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) == 0 */
+
 #if defined (__ACE_INLINE__)
 #  include "tao/Asynch_Invocation.i"
 #endif /* __ACE_INLINE__ */
 
-#endif /* TAO_HAS_AMI_CALLBACK == 1
-          || TAO_HAS_AMI_POLLER == 1
-          || TAO_HAS_MINIMUM_CORBA == 0 */
-
 #include "ace/post.h"
 #endif /* TAO_ASYNCH_INVOCATION_H */
diff --git a/TAO/tao/Asynch_Invocation.i b/TAO/tao/Asynch_Invocation.i
index bc73206b139..1d682531221 100644
--- a/TAO/tao/Asynch_Invocation.i
+++ b/TAO/tao/Asynch_Invocation.i
@@ -3,6 +3,8 @@
 // $Id$
 //
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
 ACE_INLINE
 TAO_GIOP_Asynch_Invocation::TAO_GIOP_Asynch_Invocation (
     TAO_Stub *stub,
@@ -20,8 +22,12 @@ TAO_GIOP_Asynch_Invocation::TAO_GIOP_Asynch_Invocation (
 {
 }
 
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
 // ********************************************************************
 
+#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
+
 ACE_INLINE
 TAO_GIOP_Twoway_Asynch_Invocation::TAO_GIOP_Twoway_Asynch_Invocation (
     TAO_Stub *stub,
@@ -47,3 +53,5 @@ TAO_GIOP_Twoway_Asynch_Invocation::TAO_GIOP_Twoway_Asynch_Invocation (
 	   TAO_Asynch_Reply_Dispatcher (reply_handler_skel,
 					reply_handler_ptr));
 }
+
+#endif /* (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) == 0 */
diff --git a/TAO/tao/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Asynch_Reply_Dispatcher.cpp
index f47ac03087c..538aab733fb 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Asynch_Reply_Dispatcher.cpp
@@ -14,9 +14,7 @@ ACE_RCSID(tao, Asynch_Reply_Dispatcher, "$Id$")
 #include "tao/Asynch_Reply_Dispatcher.i"
 #endif /* __ACE_INLINE__ */
 
-#if (TAO_HAS_AMI_CALLBACK == 1) \
-     || (TAO_HAS_AMI_POLLER == 1) \
-     || (TAO_HAS_MINIMUM_CORBA == 0)
+#if (TAO_HAS_MINIMUM_CORBA == 0)
 
 // Constructor.
 TAO_Asynch_Reply_Dispatcher_Base::TAO_Asynch_Reply_Dispatcher_Base (void)
@@ -62,9 +60,7 @@ TAO_Asynch_Reply_Dispatcher_Base::connection_closed (void)
 {
 }
 
-#endif /* (TAO_HAS_AMI_CALLBACK == 1) \
-           || (TAO_HAS_AMI_POLLER == 1) \
-           || (TAO_HAS_MINIMUM_CORBA == 0) */
+#endif /* (TAO_HAS_MINIMUM_CORBA == 0) */
 
 // ************************************************************************
 
diff --git a/TAO/tao/Asynch_Reply_Dispatcher.h b/TAO/tao/Asynch_Reply_Dispatcher.h
index bb6eba5d147..4cf6f3eaec4 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher.h
+++ b/TAO/tao/Asynch_Reply_Dispatcher.h
@@ -12,6 +12,7 @@
 //
 // = AUTHOR
 //     Alexander Babu Arulanthu <alex@cs.wustl.edu>
+//     Jeff Parsons <parsons@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -25,12 +26,15 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
 #include "tao/Reply_Dispatcher.h"
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
 #include "tao/MessagingC.h"
+#endif /* (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) == 0 */
 
-#if (TAO_HAS_AMI_CALLBACK == 1) \
-    || (TAO_HAS_AMI_POLLER == 1) \
-    || (TAO_HAS_MINIMUM_CORBA == 0)
+#if (TAO_HAS_MINIMUM_CORBA == 0)
 
 class TAO_Export TAO_Asynch_Reply_Dispatcher_Base 
   : public TAO_Reply_Dispatcher
@@ -78,9 +82,7 @@ protected:
   // This invocation is using this transport, may change...
 };
 
-#endif /* (TAO_HAS_AMI_CALLBACK == 1) \
-           || (TAO_HAS_AMI_POLLER == 1) \
-           || (TAO_HAS_MINIMUM_CORBA == 0) */
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // *********************************************************************
 
diff --git a/TAO/tao/Asynch_Reply_Dispatcher.i b/TAO/tao/Asynch_Reply_Dispatcher.i
index 3e002fac8bd..e21ef9fe2b1 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher.i
+++ b/TAO/tao/Asynch_Reply_Dispatcher.i
@@ -1,8 +1,6 @@
 // $Id$
 
-#if (TAO_HAS_AMI_CALLBACK == 1) \
-    || (TAO_HAS_AMI_POLLER == 1) \
-    || (TAO_HAS_MINIMUM_CORBA == 0)
+#if (TAO_HAS_MINIMUM_CORBA == 0)
 
 ACE_INLINE void
 TAO_Asynch_Reply_Dispatcher_Base::transport (TAO_Transport *t)
@@ -10,7 +8,5 @@ TAO_Asynch_Reply_Dispatcher_Base::transport (TAO_Transport *t)
   this->transport_ = t;
 }
 
-#endif /* (TAO_HAS_AMI_CALLBACK == 1) \
-           || (TAO_HAS_AMI_POLLER == 1) \
-           || (TAO_HAS_MINIMUM_CORBA == 0) */
+#endif /* (TAO_HAS_MINIMUM_CORBA == 0) */