diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 1999-07-29 00:03:09 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 1999-07-29 00:03:09 +0000 |
| commit | 689b7d2067163d284dd4db63074970d5a5899ad3 (patch) | |
| tree | c86b34ab1b2adad4e82ff45a92761a42f96cf405 | |
| parent | 6c7d9347594a1f60effef3721dc933d1693a0401 (diff) | |
| download | ATCD-689b7d2067163d284dd4db63074970d5a5899ad3.tar.gz | |
Fixed warnings from gcc 2.95 that complained about choosing the
best string conversion operator.
| -rw-r--r-- | TAO/tao/IORManipulation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/TAO/tao/IORManipulation.cpp b/TAO/tao/IORManipulation.cpp index 47fd4987b3b..498cb7e1de5 100644 --- a/TAO/tao/IORManipulation.cpp +++ b/TAO/tao/IORManipulation.cpp @@ -68,7 +68,7 @@ TAO_IOR_Manipulation_impl::merge_iors ( if (Merged_Profiles.add_profiles (tmp_pfiles.get ())< 0) ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (), CORBA::Object::_nil ()); - CORBA::String id = CORBA::string_dup (iors[0]->_stubobj ()->type_id); + CORBA::String id = CORBA::string_dup (iors[0]->_stubobj ()->type_id.in ()); for (i = 1; i < iors.length () ; i++) { @@ -166,7 +166,7 @@ TAO_IOR_Manipulation_impl::remove_profiles ( )) { // First verify they are the same type! - CORBA::String id = CORBA::string_dup (ior1->_stubobj ()->type_id); + CORBA::String id = CORBA::string_dup (ior1->_stubobj ()->type_id.in ()); if (id && ior2->_stubobj ()->type_id.in () && ACE_OS::strcmp (id, ior2->_stubobj ()->type_id.in ())) ACE_THROW_RETURN (TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR (), |