diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp index ac174723aa3..f7be8f65e2c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp @@ -1,9 +1,9 @@ // $Id$ -#include "orbsvcs/Notify/Topology_Object.h" +#include "Topology_Object.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/Topology_Object.inl" +#include "Topology_Object.inl" #endif /* __ACE_INLINE__ */ // question: is there a race_conditon with self_changed and children_changed? @@ -13,8 +13,6 @@ // children have been saved in Topology_Object::save_persistent (). // If these rules are followed, the only risk is a (harmless) extra save. -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - namespace TAO_Notify { Topology_Savable::~Topology_Savable (void) @@ -28,10 +26,10 @@ namespace TAO_Notify Topology_Object::Topology_Object () : TAO_Notify_Object () - , Topology_Savable () - , self_changed_ (false) - , children_changed_ (false) - , topology_parent_ (0) + , Topology_Savable () + , self_changed_ (false) + , children_changed_ (false) + , topology_parent_ (0) { } @@ -42,7 +40,7 @@ namespace TAO_Notify void Topology_Object::initialize (Topology_Parent* topology_parent ACE_ENV_ARG_DECL_NOT_USED) { - ACE_ASSERT (topology_parent != 0 && this->topology_parent_ == 0); + ACE_ASSERT (topology_parent != 0 && this->topology_parent_ == 0); this->topology_parent_ = topology_parent; TAO_Notify_Object::initialize (topology_parent); } @@ -68,13 +66,13 @@ namespace TAO_Notify { bool result = false; if (this->qos_properties_.event_reliability().is_valid ()) - { - result = CosNotification::Persistent == this->qos_properties_.event_reliability().value (); - } + { + result = CosNotification::Persistent == this->qos_properties_.event_reliability().value (); + } else if (this->topology_parent () != 0) - { - result = this->topology_parent ()->is_persistent (); - } + { + result = this->topology_parent ()->is_persistent (); + } return result; } @@ -118,7 +116,6 @@ namespace TAO_Notify if (parent != 0) { result = parent->child_change(ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); } return result; } @@ -145,7 +142,4 @@ namespace TAO_Notify // if it is called in a release build, provide 'em a value return -1; } - } // namespace TAO_Notify - -TAO_END_VERSIONED_NAMESPACE_DECL |