Mon Mar 4 15:35:08 2002 Jaiganesh Balasubramanian <jai@doc.ece.uci.edu>

7 files changed, 32 insertions, 10 deletions

diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp
index da5aae17679..3a0dad679b8 100644
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ b/TAO/tao/Messaging/MessagingC.cpp
@@ -20,7 +20,6 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "MessagingC.h"
-#include "messaging_export.h"
 
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
@@ -5187,6 +5186,7 @@ TAO_NAMESPACE_END
 
 
 
+#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
 
 static const CORBA::Long _oc_Messaging_ExceptionHolder[] =
 {
@@ -5420,7 +5420,6 @@ Messaging::ExceptionHolder_out::operator-> (void)
   return this->ptr_;
 }
 
-#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
 
 Messaging::ExceptionHolder* Messaging::ExceptionHolder::_downcast (CORBA::ValueBase* v)
 {
@@ -7429,6 +7428,8 @@ TAO_Messaging_Export CORBA::Boolean operator>>= (
 #  pragma instantiate TAO_Object_Manager<Messaging::QueueOrderPolicy,Messaging::QueueOrderPolicy_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
+
 TAO_Messaging_Export void
 operator<<= (CORBA::Any &any, Messaging::ExceptionHolder *value) // copying
 {
@@ -7641,7 +7642,6 @@ CORBA::remove_ref (Messaging::ExceptionHolder * vt)
 }
 TAO_NAMESPACE_CLOSE
 
-#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
 
 //@@ Boris: end experimental
 CORBA::Boolean
diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h
index d6ca4d2014e..eca2eba705e 100644
--- a/TAO/tao/Messaging/MessagingC.h
+++ b/TAO/tao/Messaging/MessagingC.h
@@ -2208,6 +2208,8 @@ TAO_NAMESPACE  Messaging
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_QueueOrderPolicy;
   
+#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
+
   // Valuetype class
   class ExceptionHolder;
   
@@ -2274,7 +2276,7 @@ TAO_NAMESPACE  Messaging
   
   
 #endif /* end #if !defined */
-  
+
   
 #if !defined (_MESSAGING_EXCEPTIONHOLDER_CH_)
 #define _MESSAGING_EXCEPTIONHOLDER_CH_
@@ -2675,10 +2677,12 @@ TAO_NAMESPACE  Messaging
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ReplyHandler;
   
+#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
   
 }
 TAO_NAMESPACE_CLOSE // module Messaging
 
+
 // Proxy Broker Factory function pointer declarations.
 
 #if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1 )
@@ -2860,13 +2864,13 @@ TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::
 
 #endif /* TAO_HAS_QUEUE_ORDER_POLICY == 1 */
 
+#if (TAO_HAS_AMI_CALLBACK == 1)
+
 // Any operators for valuetype Messaging::ExceptionHolder
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ExceptionHolder *); // copying
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ExceptionHolder **); // non-copying
 TAO_Messaging_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::ExceptionHolder *&);
 
-#if (TAO_HAS_AMI_CALLBACK == 1)
-
 // Any operators for interface Messaging::ReplyHandler
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyHandler_ptr); // copying
 TAO_Messaging_Export void operator<<= (CORBA::Any &, Messaging::ReplyHandler_ptr *); // non-copying
@@ -2890,6 +2894,8 @@ TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::Routi
 
 #endif /* TAO_HAS_ROUTING_POLICY == 1 */
 
+#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
+
 //@@ Boris: begin experimental
 TAO_NAMESPACE CORBA
 {
@@ -2900,7 +2906,6 @@ TAO_NAMESPACE_CLOSE
 //@@ Boris: end experimental
 //
 //
-#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
 
 TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder *);
 TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder *&);
diff --git a/TAO/tao/Messaging/MessagingC.i b/TAO/tao/Messaging/MessagingC.i
index 28ee9dbc835..dcd3073932b 100644
--- a/TAO/tao/Messaging/MessagingC.i
+++ b/TAO/tao/Messaging/MessagingC.i
@@ -513,7 +513,6 @@ TAO_NAMESPACE CORBA
 }
 TAO_NAMESPACE_CLOSE
 //@@ Boris: end experimental
-#endif /*__ACE_INLINE__*/
 TAO_Messaging_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder *);
 TAO_Messaging_Export CORBA::Boolean operator>> (TAO_InputCDR &, Messaging::ExceptionHolder *&);
 TAO_Messaging_Export CORBA::Boolean operator<< (
@@ -527,3 +526,4 @@ TAO_Messaging_Export CORBA::Boolean operator>> (
   );
 
 #endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
+#endif /*__ACE_INLINE__*/
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index 9de8b0d3d14..360d8a5d869 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -48,6 +48,8 @@
 #include "MessagingS.i"
 #endif /* !defined INLINE */
 
+#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
+
 class TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -154,6 +156,7 @@ static TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable tao_Messaging_ReplyHandle
 #if (TAO_HAS_INTERCEPTORS == 1)
 #endif /* TAO_HAS_INTERCEPTORS */
 
+
 ///////////////////////////////////////////////////////////////////////
 //            Strategized Proxy Broker Implementation
 //
@@ -244,6 +247,8 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::create_proxy (
   }
 }
 
+#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
+
 
 //
 //        End Strategized Proxy Broker Implementation
@@ -276,6 +281,7 @@ static int Messaging__TAO_ReplyHandler_Proxy_Broker_Stub_Factory_Initializer_Sca
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
+#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1 )
 
 POA_Messaging::_TAO_ReplyHandler_ThruPOA_Proxy_Impl::_TAO_ReplyHandler_ThruPOA_Proxy_Impl (void)
 {}
@@ -468,6 +474,6 @@ POA_Messaging::ReplyHandler::_this (ACE_ENV_SINGLE_ARG_DECL)
   return ::Messaging::ReplyHandler::_unchecked_narrow (obj.in ());
 }
 
-
+#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
 
 #endif /* ifndef */
diff --git a/TAO/tao/Messaging/MessagingS.h b/TAO/tao/Messaging/MessagingS.h
index 1aaf6fa06e7..1286d421b71 100644
--- a/TAO/tao/Messaging/MessagingS.h
+++ b/TAO/tao/Messaging/MessagingS.h
@@ -51,8 +51,10 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+
 TAO_NAMESPACE  POA_Messaging
 {
+#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
   class ReplyHandler;
   typedef ReplyHandler *ReplyHandler_ptr;
   // Forward Classes Declaration
@@ -107,6 +109,7 @@ TAO_NAMESPACE  POA_Messaging
         ACE_ENV_ARG_DECL
       );
 
+
     ::Messaging::ReplyHandler *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
@@ -115,8 +118,10 @@ TAO_NAMESPACE  POA_Messaging
 
 
   };
+#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
 
   
+#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
   ///////////////////////////////////////////////////////////////////////
   //               Strategized Proxy Broker Declaration 
   //
@@ -203,6 +208,7 @@ public:
 //                Direct  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
+#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
 
 }
 TAO_NAMESPACE_CLOSE // module Messaging
diff --git a/TAO/tao/Messaging/MessagingS_T.h b/TAO/tao/Messaging/MessagingS_T.h
index b7fe1ed0d2a..b06ff047310 100644
--- a/TAO/tao/Messaging/MessagingS_T.h
+++ b/TAO/tao/Messaging/MessagingS_T.h
@@ -33,6 +33,8 @@
 #if defined (ACE_HAS_USING_KEYWORD)
 TAO_NAMESPACE  POA_Messaging
 {
+#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
+
   // TIE class: Refer to CORBA v2.2, Section 20.34.4
   template <class T>
   class  ReplyHandler_tie : public ReplyHandler
@@ -74,6 +76,7 @@ TAO_NAMESPACE  POA_Messaging
     ReplyHandler_tie (const ReplyHandler_tie &);
     void operator= (const ReplyHandler_tie &);
   };
+#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
 
 }
 TAO_NAMESPACE_CLOSE // module Messaging
diff --git a/TAO/tao/Messaging/MessagingS_T.i b/TAO/tao/Messaging/MessagingS_T.i
index fc794771bd4..936f15e9355 100644
--- a/TAO/tao/Messaging/MessagingS_T.i
+++ b/TAO/tao/Messaging/MessagingS_T.i
@@ -21,6 +21,8 @@
 
 #if defined (ACE_HAS_USING_KEYWORD)
 
+#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
+
 template <class T> ACE_INLINE
 POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t)
 	: ptr_ (&t),
@@ -97,6 +99,6 @@ POA_Messaging::ReplyHandler_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 
   return this->ReplyHandler::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
-
+#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
 #endif /* ACE_HAS_USING_KEYWORD */