diff options
Diffstat (limited to 'TAO/tao/Profile.cpp')
-rw-r--r-- | TAO/tao/Profile.cpp | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index a2735761762..2860a202041 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -13,7 +13,10 @@ #include "Profile.i" #endif /* __ACE_INLINE__ */ -ACE_RCSID(tao, Profile, "$Id$") + +ACE_RCSID (tao, + Profile, + "$Id$") // **************************************************************** @@ -36,7 +39,10 @@ TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component // ---------------------------------------------------------------- // Add the given tagged component to this profile. - this->tagged_components ().set_component (component); + // + // Note that multiple tagged profiles with the same tag value may be + // added, unless the tagged component is known to be unique by TAO. + this->tagged_components_.set_component (component); } void @@ -63,7 +69,8 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list // This loop iterates through CORBA::PolicyList to convert // each CORBA::Policy into a CORBA::PolicyValue - for (size_t i = 0; i < policy_list->length (); ++i) + const size_t plen = policy_list->length (); + for (size_t i = 0; i < plen; ++i) { TAO_OutputCDR out_CDR; policy_value_seq[i].ptype = @@ -78,7 +85,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list buf = policy_value_seq[i].pvalue.get_buffer (); - // Copy the CDR buffer data into the sequence<octect> buffer. + // Copy the CDR buffer data into the octet sequence buffer. for (const ACE_Message_Block *iterator = out_CDR.begin (); iterator != 0; @@ -277,7 +284,7 @@ TAO_Profile::verify_orb_configuration (ACE_ENV_SINGLE_ARG_DECL) // @todo: We need the proper minor code as soon as the spec is // updated. ACE_THROW (CORBA::BAD_PARAM ( - CORBA_SystemException::_tao_minor_code ( + CORBA::SystemException::_tao_minor_code ( TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO)); @@ -306,7 +313,7 @@ TAO_Profile::verify_profile_version (ACE_ENV_SINGLE_ARG_DECL) // @todo: We need the proper minor code as soon as the spec is // updated. ACE_THROW (CORBA::BAD_PARAM ( - CORBA_SystemException::_tao_minor_code ( + CORBA::SystemException::_tao_minor_code ( TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO)); @@ -336,7 +343,7 @@ TAO_Profile::addressing_mode (CORBA::Short addr default: ACE_THROW (CORBA::BAD_PARAM ( - CORBA_SystemException::_tao_minor_code ( + CORBA::SystemException::_tao_minor_code ( TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO)); @@ -350,7 +357,8 @@ TAO_Unknown_Profile::TAO_Unknown_Profile (CORBA::ULong tag, TAO_ORB_Core *orb_core) : TAO_Profile (tag, orb_core, - TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)), + TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR, + TAO_DEF_GIOP_MINOR)), tagged_profile_ () { } |