ChangeLogTag: Tue Aug 24 13:20:00 1999 Michael Kircher <Michael.Kircher@mchp.siemens.de>

3 files changed, 33 insertions, 10 deletions

diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index add430e4dc4..c9458d22f36 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -1293,9 +1293,11 @@ Points of contact: <a href="mailto:alex@cs.wustl.edu">Alexander Arulanthu</a>
 <p>Status:
 <ul>
 Currently only the callback model of the Messaging Specification is implemented. 
+To activate the AMI for TAO and the TAO IDL
+compiler define <tt>TAO_HAS_CORBA_MESSAGING</tt> and <tt>TAO_HAS_AMI_CALLBACK</tt>
+in your config.h file.
 The TAO IDL compiler can generate the stubs and client-side skeletons
-using the -GC switch.
-</ul>
+using the -GC switch.</ul>
 <p> Future Work:
 <ul>
 <li>Support for exceptions</li>
diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp
index a00e88979c8..b16e51256d4 100644
--- a/TAO/tao/MessagingC.cpp
+++ b/TAO/tao/MessagingC.cpp
@@ -2200,10 +2200,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::Poller_ptr &_
 
   template class TAO_Unbounded_Sequence<Messaging::PolicyValue>;
 
-#if defined(TAO_HAS_AMI_POLLER)
+#if defined(TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER)
   template class TAO_Object_Field_T<Messaging::ReplyHandler,Messaging::ReplyHandler_var>;
-  template class TAO_Object_Field_T<Messaging::Poller,Messaging::Poller_var>;
   template class TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var>;
+#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
+
+#if defined(TAO_HAS_AMI_POLLER)
+  template class TAO_Object_Field_T<Messaging::Poller,Messaging::Poller_var>;
   template class TAO_Object_Manager<Messaging::Poller,Messaging::Poller_var>;
 #endif /* TAO_HAS_AMI_POLLER */
 
@@ -2211,10 +2214,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::Poller_ptr &_
 
 #pragma instantiate TAO_Unbounded_Sequence<Messaging::PolicyValue>
 
-#if defined(TAO_HAS_AMI_POLLER)
+#if defined(TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER)
 #  pragma instantiate TAO_Object_Field_T<Messaging::ReplyHandler,Messaging::ReplyHandler_var>
-#  pragma instantiate TAO_Object_Field_T<Messaging::Poller,Messaging::Poller_var>
 #  pragma instantiate TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var>
+#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
+
+#if defined(TAO_HAS_AMI_POLLER)
+#  pragma instantiate TAO_Object_Field_T<Messaging::Poller,Messaging::Poller_var>
 #  pragma instantiate TAO_Object_Manager<Messaging::Poller,Messaging::Poller_var>
 #endif /* TAO_HAS_AMI_POLLER */
 
diff --git a/TAO/tao/MessagingC.i b/TAO/tao/MessagingC.i
index 089a9683786..a99aba5b151 100644
--- a/TAO/tao/MessagingC.i
+++ b/TAO/tao/MessagingC.i
@@ -3007,7 +3007,7 @@ Messaging::PolicyValueSeq_out::operator[] (CORBA::ULong slot)
   return this->ptr_->operator[] (slot);
 }
 
-#if defined(TAO_POLLER)
+#if defined(TAO_HAS_AMI_POLLER)
 // *************************************************************
 // Inline operations for class Messaging::ExceptionHolder_var
 // *************************************************************
@@ -3177,8 +3177,12 @@ Messaging::ExceptionHolder_out::operator-> (void)
   return this->ptr_;
 }
 
+#endif /* TAO_HAS_AMI_POLLER */
+
 // ****************************************************************
 
+#if defined (TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER)
+
 ACE_INLINE
 Messaging::ReplyHandler::ReplyHandler (void) // default constructor
 {}
@@ -3366,7 +3370,10 @@ Messaging::ReplyHandler_out::operator-> (void)
   return this->ptr_;
 }
 
-#if defined(TAO_POLLER)
+#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */
+
+#if defined(TAO_HAS_AMI_POLLER)
+
 ACE_INLINE
 Messaging::Poller::Poller (void) // default constructor
 {}
@@ -3553,7 +3560,6 @@ Messaging::Poller_out::operator-> (void)
 {
   return this->ptr_;
 }
-#endif
 
 // ****************************************************************
 
@@ -3813,6 +3819,10 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::ExceptionHo
 
 }
 
+#endif /* TAO_HAS_AMI_POLLER */
+
+#if defined (TAO_HAS_AMI_CALLBACK)
+
 // ****************************************************************
 
 ACE_INLINE CORBA::Boolean
@@ -3864,8 +3874,12 @@ operator>> (
   return 0;
 }
 
+#endif /* TAO_HAS_AMI_CALLBACK */
+
 // ****************************************************************
 
+#if defined (TAO_HAS_AMI_POLLER)6
+
 ACE_INLINE CORBA::Boolean
 operator<< (
     TAO_OutputCDR &,
@@ -3914,4 +3928,5 @@ operator>> (
   ACE_ENDTRY;
   return 0;
 }
-#endif
+
+#endif /* TAO_HAS_AMI_POLLER */