ChangeLogTag: Wed Nov 1 09:47:47 2000 Priyanka Gontla <pgontla@ece.uci.edu>

6 files changed, 24 insertions, 13 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 2f8d182a3bd..198a921e3bb 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Wed Nov  1 09:47:47 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+	* tao/Stub.cpp: 
+	* tao/Messaging_Policy_i.h: 
+	* tao/Messaging_Policy_i.cpp: 
+	* tao/Messaging_PolicyFactory.cpp (create_policy): 
+	* tao/Messaging_ORBInitializer.cpp (pre_init): 
+	  Changed TAO_HAS_ROUNDTRIP_TIMEOUT_POLICY to
+	  TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY
+	
 Wed Nov  1 08:19:12 2000  Darrell Brunsch <brunsch@uci.edu>
 
         * tao/Messaging_ORBInitializer.cpp:
diff --git a/TAO/tao/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging_ORBInitializer.cpp
index 5b3f0b97dee..3cd86ef139e 100644
--- a/TAO/tao/Messaging_ORBInitializer.cpp
+++ b/TAO/tao/Messaging_ORBInitializer.cpp
@@ -18,10 +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)
+#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
   TAO_ORB_Core::set_timeout_hook
     (TAO_RelativeRoundtripTimeoutPolicy::hook);
-#endif /* TAO_HAS_ROUNDTRIP_TIMEOUT_POLICY == 1 */
+#endif /* TAO_HAS_RELATIVE_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 13887b9d5b9..c690dd04ebb 100644
--- a/TAO/tao/Messaging_PolicyFactory.cpp
+++ b/TAO/tao/Messaging_PolicyFactory.cpp
@@ -26,14 +26,14 @@ TAO_Messaging_PolicyFactory::create_policy (
   switch (type)
     {
 
-#if (TAO_HAS_ROUNDTRIP_TIMEOUT_POLICY == 1)
+#if (TAO_HAS_RELATIVE_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 */
+#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
 #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1)
 
diff --git a/TAO/tao/Messaging_Policy_i.cpp b/TAO/tao/Messaging_Policy_i.cpp
index 8ec4d65ccb6..9c9090147e6 100644
--- a/TAO/tao/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging_Policy_i.cpp
@@ -10,7 +10,7 @@
 
 ACE_RCSID(TAO, Messaging_Policy_i, "$Id$")
 
-#if (TAO_HAS_ROUNDTRIP_TIMEOUT_POLICY == 1)
+#if (TAO_HAS_REALTIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
 
 TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (const TimeBase::TimeT& relative_expiry)
   :  relative_expiry_ (relative_expiry)
@@ -52,7 +52,7 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
     policy = orb_core->stubless_relative_roundtrip_timeout ();
   else
     policy = stub->relative_roundtrip_timeout ();
-   
+
   if (CORBA::is_nil (policy.in ()))
     {
       has_timeout = 0;
@@ -164,7 +164,7 @@ TAO_RelativeRoundtripTimeoutPolicy::set_time_value (ACE_Time_Value &time_value)
     }
 }
 
-#endif /* TAO_HAS_ROUNDTRIP_TIMEOUT_POLICY == 1 */
+#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
 // ****************************************************************
 
diff --git a/TAO/tao/Messaging_Policy_i.h b/TAO/tao/Messaging_Policy_i.h
index 2615b5fa644..a951b4cab5f 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_ROUNDTRIP_TIMEOUT_POLICY == 1)
+#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
 
 class TAO_Export TAO_RelativeRoundtripTimeoutPolicy
   : public Messaging::RelativeRoundtripTimeoutPolicy,
@@ -87,7 +87,8 @@ private:
   TimeBase::TimeT relative_expiry_;
   // The attribute
 };
-#endif /* TAO_HAS_ROUNDTRIP_TIMEOUT_POLICY == 1 */
+
+#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index 1b9300a1923..b493ddfba53 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -731,7 +731,7 @@ TAO_Stub::sync_strategy (void)
   return this->orb_core_->transport_sync_strategy ();
 }
 
-#if (TAO_HAS_ROUNDTRIP_TIMEOUT_POLICY == 1)
+#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
 
 CORBA::Policy *
 TAO_Stub::relative_roundtrip_timeout (void)
@@ -770,7 +770,7 @@ TAO_Stub::relative_roundtrip_timeout (void)
   return result;
 }
 
-#endif /* TAO_HAS_ROUNDTRIP_TIMEOUT_POLICY == 1 */
+#endif /* TAO_HAS_REALTIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
 #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1)
 
@@ -822,9 +822,9 @@ TAO_Stub::sync_scope (void)
   // construction time...
   if (this->policies_ != 0)
     result = this->policies_->sync_scope ();
-  
+
   this->orb_core_->stubless_sync_scope (result);
-  
+
   return result;
 }