diff options
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog-99c | 5 | ||||
| -rw-r--r-- | TAO/tao/IORManipulation.cpp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index ebe6e1b6219..813956e7185 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,8 @@ +Tue Jun 22 21:49:38 1999 Fred Kuhns <fredk@cs.wustl.edu> + * IORManipultion.cpp - fixed usage of type_id + was if (type_id) now if (type_id.in ()) + This will ensure a const char * is returned for the if. + Tue Jun 22 21:11:56 1999 Balachandran Natarajan <bala@cs.wustl.edu> * orbsvcs/ImplRepo_Service/Repository.cpp:Added missing template diff --git a/TAO/tao/IORManipulation.cpp b/TAO/tao/IORManipulation.cpp index 30bb984721f..ede77a4ab7f 100644 --- a/TAO/tao/IORManipulation.cpp +++ b/TAO/tao/IORManipulation.cpp @@ -87,7 +87,7 @@ TAO_IOR_Manipulation_impl::merge_iors ( CORBA::Object::_nil ()); // If the object type_is's differ then raise an exception. - if (type_id && iors[i]->_stubobj ()->type_id && + if (type_id.in () && iors[i]->_stubobj ()->type_id.in () && ACE_OS::strcmp (type_id, iors[i]->_stubobj ()->type_id)) ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (), CORBA::Object::_nil ()); @@ -167,7 +167,7 @@ TAO_IOR_Manipulation_impl::remove_profiles ( { // First verify they are the same type! CORBA::String_var type_id = ior1->_stubobj ()->type_id; - if (type_id && ior2->_stubobj ()->type_id && + if (type_id.in () && ior2->_stubobj ()->type_id.in () && ACE_OS::strcmp (type_id, ior2->_stubobj ()->type_id)) ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (), CORBA::Object::_nil ()); |