diff options
Diffstat (limited to 'TAO/tao/Profile.cpp')
| -rw-r--r-- | TAO/tao/Profile.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index 35ea0e01e23..4f48a3ad126 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -22,14 +22,14 @@ TAO_Profile::~TAO_Profile (void) } void -TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component, - CORBA::Environment &ACE_TRY_ENV) +TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component + TAO_ENV_ARG_DECL) { // Sanity checks. - this->verify_orb_configuration (ACE_TRY_ENV); + this->verify_orb_configuration (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->verify_profile_version (ACE_TRY_ENV); + this->verify_profile_version (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ---------------------------------------------------------------- @@ -39,8 +39,8 @@ TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component, } void -TAO_Profile::policies (CORBA::PolicyList *policy_list, - CORBA::Environment &ACE_TRY_ENV) +TAO_Profile::policies (CORBA::PolicyList *policy_list + TAO_ENV_ARG_DECL) { #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -66,7 +66,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list, { TAO_OutputCDR out_CDR; policy_value_seq[i].ptype = - (*policy_list)[i]->policy_type (ACE_TRY_ENV); + (*policy_list)[i]->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; out_CDR << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER); @@ -121,14 +121,14 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list, #else /* TAO_HAS_CORBA_MESSAGING == 1 */ ACE_UNUSED_ARG (policy_list); - ACE_UNUSED_ARG (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check + TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ } CORBA::PolicyList& -TAO_Profile::policies (CORBA::Environment &) +TAO_Profile::policies (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { #if (TAO_HAS_CORBA_MESSAGING == 1) @@ -187,8 +187,8 @@ TAO_Profile::policies (CORBA::Environment &) policy = this->orb_core_->orb ()->create_policy ( policy_value_seq[i].ptype, - dummy_any, - ACE_TRY_ENV); + dummy_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (!CORBA::is_nil (policy.in ())) @@ -254,7 +254,7 @@ TAO_Profile::the_stub (void) } void -TAO_Profile::verify_orb_configuration (CORBA::Environment &ACE_TRY_ENV) +TAO_Profile::verify_orb_configuration (TAO_ENV_SINGLE_ARG_DECL) { // If the ORB isn't configured to support tagged components, then // throw an exception. @@ -285,7 +285,7 @@ TAO_Profile::verify_orb_configuration (CORBA::Environment &ACE_TRY_ENV) } void -TAO_Profile::verify_profile_version (CORBA::Environment &ACE_TRY_ENV) +TAO_Profile::verify_profile_version (TAO_ENV_SINGLE_ARG_DECL) { // GIOP 1.0 does not support tagged components. Throw an exception // if the profile is a GIOP 1.0 profile. @@ -337,8 +337,8 @@ TAO_Unknown_Profile::endpoint_count (void) } void -TAO_Unknown_Profile::parse_string (const char *, - CORBA::Environment &) +TAO_Unknown_Profile::parse_string (const char * + TAO_ENV_ARG_DECL_NOT_USED) { // @@ THROW something???? } @@ -350,7 +350,7 @@ TAO_Unknown_Profile::object_key_delimiter (void) const } char * -TAO_Unknown_Profile::to_string (CORBA::Environment &) +TAO_Unknown_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { // @@ THROW something? return 0; @@ -404,8 +404,8 @@ TAO_Unknown_Profile::is_equivalent (const TAO_Profile* other_profile) } CORBA::ULong -TAO_Unknown_Profile::hash (CORBA::ULong max, - CORBA::Environment &) +TAO_Unknown_Profile::hash (CORBA::ULong max + TAO_ENV_ARG_DECL_NOT_USED) { return (ACE::hash_pjw (ACE_reinterpret_cast (const char*, this->body_.get_buffer ()), |