ChangeLogTag:Wed Nov 1 08:19:12 2000 Darrell Brunsch <brunsch@uci.edu>

6 files changed, 43 insertions, 4 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index f67f00e5e4d..2f8d182a3bd 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,25 @@
+Wed Nov  1 08:19:12 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * tao/Messaging_ORBInitializer.cpp:
+
+          Added TAO_HAS_ROUNDTRIP_TIMEOUT_POLICY protection 
+          around call to TAO_ORB_Core::set_timeout_hook.
+
+        * tao/Messaging_PolicyFactory.cpp:
+
+          Added TAO_HAS_ROUNDTRIP_TIMEOUT_POLICY protection
+          for one case statement.
+
+        * tao/Messaging_Policy_i.cpp:
+        * tao/Messaging_Policy_i.h:
+        * tao/Messaging_Policy_i.i:
+
+          Standardized the use of the protection macros, since the .h
+          file was using TAO_HAS_CORBA_MESSAGING, but the .cpp file
+          was using TAO_HAS_SYNC_SCOPE_POLICY or nothing at all.  Made
+          them consistent.  Granted, I don't know if this is the 
+          "correct" way of doing it, but it links for me though.
+
 Wed Nov 01 09:58:29 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* tao/PortableServer/Object_Adapter.h (prepare_for_upcall): Added
diff --git a/TAO/tao/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging_ORBInitializer.cpp
index 11f2ff1b87d..5b3f0b97dee 100644
--- a/TAO/tao/Messaging_ORBInitializer.cpp
+++ b/TAO/tao/Messaging_ORBInitializer.cpp
@@ -18,8 +18,10 @@ TAO_Messaging_ORBInitializer::pre_init (
     TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+#if (TAO_HAS_ROUNDTRIP_TIMEOUT_POLICY == 1)
   TAO_ORB_Core::set_timeout_hook
     (TAO_RelativeRoundtripTimeoutPolicy::hook);
+#endif /* TAO_HAS_ROUNDTRIP_TIMEOUT_POLICY == 1 */
   
   TAO_ORB_Core::set_sync_scope_hook
   (TAO_Sync_Scope_Policy::hook);
diff --git a/TAO/tao/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging_PolicyFactory.cpp
index 89a29ccb016..13887b9d5b9 100644
--- a/TAO/tao/Messaging_PolicyFactory.cpp
+++ b/TAO/tao/Messaging_PolicyFactory.cpp
@@ -26,11 +26,15 @@ TAO_Messaging_PolicyFactory::create_policy (
   switch (type)
     {
 
-    case TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE:
+#if (TAO_HAS_ROUNDTRIP_TIMEOUT_POLICY == 1)
+
+  case TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE:
       return TAO_RelativeRoundtripTimeoutPolicy::create (
                value
                TAO_ENV_ARG_PARAMETER);
 
+#endif /* TAO_HAS_ROUNDTRIP_TIMEOUT_POLICY == 1 */
+
 #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1)
 
     case TAO_CLIENT_PRIORITY_POLICY_TYPE:
diff --git a/TAO/tao/Messaging_Policy_i.cpp b/TAO/tao/Messaging_Policy_i.cpp
index f63c8fb60eb..8ec4d65ccb6 100644
--- a/TAO/tao/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging_Policy_i.cpp
@@ -10,6 +10,8 @@
 
 ACE_RCSID(TAO, Messaging_Policy_i, "$Id$")
 
+#if (TAO_HAS_ROUNDTRIP_TIMEOUT_POLICY == 1)
+
 TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (const TimeBase::TimeT& relative_expiry)
   :  relative_expiry_ (relative_expiry)
 {
@@ -162,6 +164,8 @@ TAO_RelativeRoundtripTimeoutPolicy::set_time_value (ACE_Time_Value &time_value)
     }
 }
 
+#endif /* TAO_HAS_ROUNDTRIP_TIMEOUT_POLICY == 1 */
+
 // ****************************************************************
 
 #if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
diff --git a/TAO/tao/Messaging_Policy_i.h b/TAO/tao/Messaging_Policy_i.h
index 2dec37f5c9b..2615b5fa644 100644
--- a/TAO/tao/Messaging_Policy_i.h
+++ b/TAO/tao/Messaging_Policy_i.h
@@ -32,7 +32,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#if (TAO_HAS_CORBA_MESSAGING == 1)
+#if (TAO_HAS_ROUNDTRIP_TIMEOUT_POLICY == 1)
 
 class TAO_Export TAO_RelativeRoundtripTimeoutPolicy
   : public Messaging::RelativeRoundtripTimeoutPolicy,
@@ -87,9 +87,12 @@ private:
   TimeBase::TimeT relative_expiry_;
   // The attribute
 };
+#endif /* TAO_HAS_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
 ////////////////////////////////////////////////////////////////////////////////
 
+#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
+
 class TAO_Export TAO_Sync_Scope_Policy
   : public Messaging::SyncScopePolicy,
     public TAO_Local_RefCounted_Object
@@ -145,6 +148,8 @@ private:
   // The attribute
 };
 
+#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
+
 #if defined (__ACE_INLINE__)
 #include "tao/Messaging_Policy_i.i"
 #endif /* __ACE_INLINE__ */
@@ -153,7 +158,5 @@ private:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#endif /*TAO_HAS_CORBA_MESSAGING == 1 */
-
 #include "ace/post.h"
 #endif /* TAO_MESSAGING_POLICY_I_H */
diff --git a/TAO/tao/Messaging_Policy_i.i b/TAO/tao/Messaging_Policy_i.i
index 799d8d51dfa..2915eaae01e 100644
--- a/TAO/tao/Messaging_Policy_i.i
+++ b/TAO/tao/Messaging_Policy_i.i
@@ -1,7 +1,11 @@
 // $Id$
 
+#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
+
 ACE_INLINE void
 TAO_Sync_Scope_Policy::get_synchronization (Messaging::SyncScope &s) const
 {
   s = this->synchronization_;
 }
+
+#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */