diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/EventType.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/EventType.cpp | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp index e86593e9583..490317aa64f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp @@ -1,23 +1,21 @@ // $Id$ -#include "orbsvcs/Notify/EventType.h" +#include "EventType.h" #include "ace/ACE.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" #if ! defined (__ACE_INLINE__) -#include "orbsvcs/Notify/EventType.inl" +#include "EventType.inl" #endif /* __ACE_INLINE__ */ -#include "orbsvcs/Notify/Topology_Saver.h" +#include "Topology_Saver.h" ACE_RCSID (Notify, TAO_Notify_EventType, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_Notify_EventType TAO_Notify_EventType::special (void) { @@ -104,8 +102,8 @@ TAO_Notify_EventType::operator==(const TAO_Notify_EventType& event_type) const if (this->hash () != event_type.hash ()) return false; else // compare the strings - return (ACE_OS::strcmp (this->event_type_.type_name, event_type.event_type_.type_name) == 0 && - ACE_OS::strcmp (this->event_type_.domain_name, event_type.event_type_.domain_name) == 0 + return (ACE_OS::strcmp (this->event_type_.type_name.in(), event_type.event_type_.type_name.in()) == 0 && + ACE_OS::strcmp (this->event_type_.domain_name.in(), event_type.event_type_.domain_name.in()) == 0 ); } @@ -115,8 +113,8 @@ TAO_Notify_EventType::operator!=(const TAO_Notify_EventType& event_type) const if (this->hash () != event_type.hash ()) return true; else // compare the strings - return (ACE_OS::strcmp (this->event_type_.type_name, event_type.event_type_.type_name) != 0 || - ACE_OS::strcmp (this->event_type_.domain_name, event_type.event_type_.domain_name) != 0 + return (ACE_OS::strcmp (this->event_type_.type_name.in(), event_type.event_type_.type_name.in()) != 0 || + ACE_OS::strcmp (this->event_type_.domain_name.in(), event_type.event_type_.domain_name.in()) != 0 ); } @@ -124,12 +122,12 @@ CORBA::Boolean TAO_Notify_EventType::is_special (void) const { if ((this->event_type_.domain_name == 0 || - ACE_OS::strcmp (this->event_type_.domain_name, "") == 0 || - ACE_OS::strcmp (this->event_type_.domain_name, "*") == 0) && + ACE_OS::strcmp (this->event_type_.domain_name.in(), "") == 0 || + ACE_OS::strcmp (this->event_type_.domain_name.in(), "*") == 0) && (this->event_type_.type_name == 0 || - ACE_OS::strcmp (this->event_type_.type_name, "") == 0 || - ACE_OS::strcmp (this->event_type_.type_name, "*") == 0 || - ACE_OS::strcmp (this->event_type_.type_name, "%ALL") == 0)) + ACE_OS::strcmp (this->event_type_.type_name.in(), "") == 0 || + ACE_OS::strcmp (this->event_type_.type_name.in(), "*") == 0 || + ACE_OS::strcmp (this->event_type_.type_name.in(), "%ALL") == 0)) return 1; else return 0; @@ -176,5 +174,3 @@ TAO_Notify_EventType::save_persistent (TAO_Notify::Topology_Saver& saver ACE_ENV saver.end_object(0, "subscription" ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - -TAO_END_VERSIONED_NAMESPACE_DECL |