ChangeLogTag : Wed Jul 7 10:55:06 1999 Alexander Babu Arulanthu <alex@cs.wustl.edu>

9 files changed, 34 insertions, 5 deletions

diff --git a/TAO/tao/Asynch_Invocation.cpp b/TAO/tao/Asynch_Invocation.cpp
index af1e13e09cc..204805dd43e 100644
--- a/TAO/tao/Asynch_Invocation.cpp
+++ b/TAO/tao/Asynch_Invocation.cpp
@@ -1,6 +1,9 @@
 // $Id$
 
 #include "tao/Asynch_Invocation.h"
+
+#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
+
 #include "tao/Timeprobe.h"
 #include "tao/Stub.h"
 #include "tao/Principal.h"
@@ -122,3 +125,5 @@ TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
diff --git a/TAO/tao/Asynch_Invocation.h b/TAO/tao/Asynch_Invocation.h
index fe318e91aa6..6ec6a1f5518 100644
--- a/TAO/tao/Asynch_Invocation.h
+++ b/TAO/tao/Asynch_Invocation.h
@@ -22,6 +22,8 @@
 #define TAO_ASYNCH_INVOCATION_H
 
 #include "tao/Invocation.h"
+
+#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
 #include "tao/MessagingC.h"
 
 class TAO_Export TAO_GIOP_Twoway_Asynch_Invocation : public TAO_GIOP_Invocation
@@ -87,5 +89,5 @@ private:
 #if defined (__ACE_INLINE__)
 # include "tao/Asynch_Invocation.i"
 #endif /* __ACE_INLINE__ */
-
+#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
 #endif /* TAO_ASYNCH_INVOCATION_H */
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h
index 5727be80881..707fa10de06 100644
--- a/TAO/tao/MessagingC.h
+++ b/TAO/tao/MessagingC.h
@@ -1839,7 +1839,7 @@ TAO_NAMESPACE  Messaging
   };
 
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Poller;
-#endif /* 0 */
+#endif /* TAO_POLLER */
 
 }; // module Messaging
 
@@ -1848,11 +1848,13 @@ TAO_NAMESPACE  Messaging
 
 class TAO_InputCDR;
 
+#if defined (TAO_POLLER)
 typedef void (*TAO_Reply_Handler_Skeleton)(
     TAO_InputCDR &,
     Messaging::ReplyHandler *,
     CORBA::Environment &
     );
+#endif /* TAO_POLLER */
 
 void TAO_Export operator<<= (CORBA::Any &, Messaging::PriorityRange*); // noncopying version
 CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::PriorityRange *&);
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index feaef39ab1f..72165638be9 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -18,6 +18,9 @@
 // ================================================================
 
 #include "tao/PollableC.h"
+
+#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
+
 #include "tao/POA_CORBA.h"
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
@@ -1092,3 +1095,5 @@ operator>> (
   ACE_ENDTRY;
   return 0;
 }
+
+#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
index 135728c5266..ff42f82ba62 100644
--- a/TAO/tao/PollableC.h
+++ b/TAO/tao/PollableC.h
@@ -21,6 +21,9 @@
 #define TAO_IDL_POLLABLEC_H
 
 #include "tao/corbafwd.h"
+
+#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
+
 #include "tao/Object.h"
 #include "tao/Exception.h"
 #include "tao/CDR.h"
@@ -434,4 +437,6 @@ CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CORBA_PollableSet::Unknown
 #pragma warning(default:4250)
 #endif /* _MSC_VER */
 
+#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
+
 #endif /* TAO_IDL_POLLABLEC_H */
diff --git a/TAO/tao/PollableS.cpp b/TAO/tao/PollableS.cpp
index f4fecbe3bac..7471731932d 100644
--- a/TAO/tao/PollableS.cpp
+++ b/TAO/tao/PollableS.cpp
@@ -18,6 +18,9 @@
 // ================================================================
 
 #include "tao/PollableS.h"
+
+#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
+
 #include "tao/Operation_Table.h"
 #include "tao/Server_Request.h"
 
@@ -944,3 +947,4 @@ POA_CORBA::PollableSet::_this (CORBA_Environment &ACE_TRY_ENV)
   ACE_CHECK_RETURN (0);
   return new POA_CORBA::_tao_collocated_PollableSet (this, stub);
 }
+#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
diff --git a/TAO/tao/PollableS.h b/TAO/tao/PollableS.h
index abacbd7b139..744988d56ed 100644
--- a/TAO/tao/PollableS.h
+++ b/TAO/tao/PollableS.h
@@ -21,6 +21,9 @@
 #define TAO_IDL_POLLABLES_H
 
 #include "tao/PollableC.h"
+
+#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
+
 #include "tao/POA_CORBA.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -229,4 +232,6 @@ private:
 #pragma warning(default:4250)
 #endif /* _MSC_VER */
 
+#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
+
 #endif /* ifndef */
diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp
index a630ba42e7b..2cbbf99fa41 100644
--- a/TAO/tao/Reply_Dispatcher.cpp
+++ b/TAO/tao/Reply_Dispatcher.cpp
@@ -91,7 +91,7 @@ TAO_Synch_Reply_Dispatcher::reply_cdr (void) const
 
 
 // *********************************************************************
-
+#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
 // Constructor.
 TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher (const TAO_Reply_Handler_Skeleton &reply_handler_skel,
                                                           Messaging::ReplyHandler_ptr reply_handler_ptr)
@@ -150,3 +150,4 @@ TAO_Asynch_Reply_Dispatcher::message_state (void) const
 {
   return this->message_state_;
 }
+#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h
index 1c728600aa5..488a18b0b50 100644
--- a/TAO/tao/Reply_Dispatcher.h
+++ b/TAO/tao/Reply_Dispatcher.h
@@ -122,7 +122,7 @@ private:
 };
 
 // *********************************************************************
-
+#if defined (TAO_HAS_CORBA_MESSAGING) && defined (TAO_POLLER)
 class TAO_Export TAO_Asynch_Reply_Dispatcher : public TAO_Reply_Dispatcher
 {
   // = TITLE
@@ -181,7 +181,7 @@ private:
   Messaging::ReplyHandler_ptr reply_handler_;
   // Reply Handler passed in the Asynchronous Invocation.
 };
-
+#endif /* TAO_HAS_CORBA_MESSAGING && TAO_POLLER */
 // *********************************************************************
 
 #if defined (__ACE_INLINE__)