diff options
Diffstat (limited to 'TAO/tao/Messaging/Messaging_Policy_i.cpp')
| -rw-r--r-- | TAO/tao/Messaging/Messaging_Policy_i.cpp | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp index f4e244a8696..dc98c862747 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp @@ -1,4 +1,5 @@ // $Id$ + #include "tao/Messaging/Messaging_Policy_i.h" #include "tao/Stub.h" #include "tao/ORB_Core.h" @@ -6,20 +7,22 @@ #include "tao/AnyTypeCode/Any.h" #if ! defined (__ACE_INLINE__) -#include "Messaging_Policy_i.i" +#include "tao/Messaging/Messaging_Policy_i.i" #endif /* __ACE_INLINE__ */ ACE_RCSID (Messaging, Messaging_Policy_i, "$Id$") +TAO_BEGIN_VERSIONED_NAMESPACE_DECL + #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy ( const TimeBase::TimeT& relative_expiry) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , Messaging::RelativeRoundtripTimeoutPolicy () , TAO_Local_RefCounted_Object () , relative_expiry_ (relative_expiry) @@ -28,9 +31,9 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy ( TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy ( const TAO_RelativeRoundtripTimeoutPolicy &rhs) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , Messaging::RelativeRoundtripTimeoutPolicy () , TAO_Local_RefCounted_Object () , relative_expiry_ (rhs.relative_expiry_) @@ -127,7 +130,7 @@ TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE), CORBA::Policy::_nil ()); - TAO_RelativeRoundtripTimeoutPolicy *tmp; + TAO_RelativeRoundtripTimeoutPolicy *tmp = 0; ACE_NEW_THROW_EX (tmp, TAO_RelativeRoundtripTimeoutPolicy (value), CORBA::NO_MEMORY (TAO::VMCID, @@ -200,9 +203,9 @@ TAO_RelativeRoundtripTimeoutPolicy::set_time_value (ACE_Time_Value &time_value) #if (TAO_HAS_SYNC_SCOPE_POLICY == 1) TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (Messaging::SyncScope synchronization) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , Messaging::SyncScopePolicy () , TAO_Local_RefCounted_Object () , synchronization_ (synchronization) @@ -210,9 +213,9 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (Messaging::SyncScope synchronizati } TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () + : ::CORBA::Object () + , ::CORBA::Policy () + , ::CORBA::LocalObject () , Messaging::SyncScopePolicy () , TAO_Local_RefCounted_Object () , synchronization_ (rhs.synchronization_) @@ -339,3 +342,5 @@ TAO_Sync_Scope_Policy::_tao_cached_type (void) const } #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ + +TAO_END_VERSIONED_NAMESPACE_DECL |