diff options
Diffstat (limited to 'TAO/orbsvcs/Naming_Service/NS_CosNaming.cpp')
-rw-r--r-- | TAO/orbsvcs/Naming_Service/NS_CosNaming.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/TAO/orbsvcs/Naming_Service/NS_CosNaming.cpp b/TAO/orbsvcs/Naming_Service/NS_CosNaming.cpp index 6cc90cacb95..6c2c45fe1e5 100644 --- a/TAO/orbsvcs/Naming_Service/NS_CosNaming.cpp +++ b/TAO/orbsvcs/Naming_Service/NS_CosNaming.cpp @@ -2,13 +2,13 @@ // // = LIBRARY // cos -// +// // = FILENAME // NS_CosNaming.C // // = AUTHOR // Marina Spivak <marina@cs.wustl.edu> -// +// // ============================================================================ #include "NS_CosNaming.h" @@ -23,7 +23,7 @@ NS_IntId::NS_IntId (CORBA::Object_ptr obj, CosNaming::BindingType type) : type_ (type) { - ref_ = CORBA::Object::_duplicate (obj); + ref_ = CORBA::Object::_duplicate (obj); } NS_IntId::NS_IntId (const NS_IntId &rhs) @@ -37,7 +37,7 @@ NS_IntId::~NS_IntId (void) CORBA::release (ref_); } -void +void NS_IntId::operator= (const NS_IntId &rhs) { // check for self assignment. @@ -45,7 +45,7 @@ NS_IntId::operator= (const NS_IntId &rhs) return; type_ = rhs.type_; - + CORBA::release (ref_); ref_ = CORBA::Object::_duplicate (rhs.ref_); } @@ -56,7 +56,7 @@ NS_ExtId::NS_ExtId (void) { } -NS_ExtId::NS_ExtId (const char *id, +NS_ExtId::NS_ExtId (const char *id, const char *kind) : kind_ (kind), id_ (id) @@ -66,14 +66,14 @@ NS_ExtId::NS_ExtId (const char *id, NS_ExtId::NS_ExtId (const NS_ExtId &rhs) { id_ = rhs.id_; - kind_ = rhs.kind_; + kind_ = rhs.kind_; } NS_ExtId::~NS_ExtId (void) { } -void +void NS_ExtId::operator= (const NS_ExtId &rhs) { // Check for self assignment. @@ -81,16 +81,16 @@ NS_ExtId::operator= (const NS_ExtId &rhs) return; id_ = rhs.id_; - kind_ = rhs.kind_; + kind_ = rhs.kind_; } - -int + +int NS_ExtId::operator== (const NS_ExtId &rhs) const { return id_ == rhs.id_ && kind_ == rhs.kind_; } -int +int NS_ExtId::operator!= (const NS_ExtId &rhs) const { return id_ != rhs.id_ || kind_ != rhs.kind_; @@ -104,4 +104,3 @@ NS_ExtId::hash (void) const return temp.hash (); } - |