diff options
| author | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-01 18:07:26 +0000 |
|---|---|---|
| committer | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-01 18:07:26 +0000 |
| commit | cf6d80c3d4ac392c4619cae0868928a2facb3028 (patch) | |
| tree | a3ddbac406c34393d0133a3d85a7fd4d7acd47a2 | |
| parent | 59610057501facac66e6adf38b48dadc67434ebc (diff) | |
| download | ATCD-cf6d80c3d4ac392c4619cae0868928a2facb3028.tar.gz | |
ChangeLogTag: Wed Nov 1 10:04:27 2000 Priyanka Gontla <pgontla@ece.uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/tao/Messaging_Policy_i.cpp | 3 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 198a921e3bb..697069ebe09 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Wed Nov 1 10:04:27 2000 Priyanka Gontla <pgontla@ece.uci.edu> + + * tao/Messaging_Policy_i.cpp (relative_expiry): + * tao/ORB_Core.cpp: + Removed unnecessary TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY + guards. + Wed Nov 1 09:47:47 2000 Priyanka Gontla <pgontla@ece.uci.edu> * tao/Stub.cpp: diff --git a/TAO/tao/Messaging_Policy_i.cpp b/TAO/tao/Messaging_Policy_i.cpp index 9c9090147e6..282a709716d 100644 --- a/TAO/tao/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging_Policy_i.cpp @@ -10,8 +10,6 @@ ACE_RCSID(TAO, Messaging_Policy_i, "$Id$") -#if (TAO_HAS_REALTIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (const TimeBase::TimeT& relative_expiry) : relative_expiry_ (relative_expiry) { @@ -164,7 +162,6 @@ TAO_RelativeRoundtripTimeoutPolicy::set_time_value (ACE_Time_Value &time_value) } } -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ // **************************************************************** diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 3626976e878..f397b7a131a 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -2598,8 +2598,6 @@ TAO_ORB_Core::set_timeout_hook (Timeout_Hook hook) return; } -#if (TAO_HAS_RELATIVE_ROUNTRIP_POLICY == 1) - CORBA::Policy * TAO_ORB_Core::stubless_relative_roundtrip_timeout (void) { @@ -2626,7 +2624,6 @@ TAO_ORB_Core::stubless_relative_roundtrip_timeout (void) return result; } -#endif /* TAO_HAS_RELATIVE_ROUNTRIP_POLICY == 1*/ #if (TAO_HAS_RT_CORBA == 1) |