diff options
Diffstat (limited to 'TAO/tao/Object.cpp')
| -rw-r--r-- | TAO/tao/Object.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 11e310b36ab..fbb2a5def86 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -270,10 +270,10 @@ CORBA_Object::_create_request (CORBA::Context_ptr ctx, { TAO_THROW (CORBA::NO_IMPLEMENT ()); } - request = new CORBA::Request (this, - operation, - arg_list, - result, + request = new CORBA::Request (this, + operation, + arg_list, + result, req_flags, TAO_IN_ENV); } @@ -295,10 +295,10 @@ CORBA_Object::_create_request2 (CORBA::Context_ptr ctx, { TAO_THROW (CORBA::NO_IMPLEMENT ()); } - request = new CORBA::Request (this, - operation, - arg_list, - result, + request = new CORBA::Request (this, + operation, + arg_list, + result, req_flags, TAO_IN_ENV); } @@ -308,7 +308,7 @@ CORBA_Object::_request (const CORBA::Char *operation, CORBA::Environment &TAO_IN_ENV) { TAO_IN_ENV.clear (); - return new CORBA::Request (this, + return new CORBA::Request (this, operation, TAO_IN_ENV); } @@ -493,7 +493,7 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x) } // get a profile container to store all profiles in the IOR. - auto_ptr<TAO_MProfile> mp (new TAO_MProfile (profile_count)); + TAO_MProfile mp (profile_count); while (profile_count-- != 0 && cdr.good_bit ()) { @@ -574,7 +574,7 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x) break; case 1: default: - mp->give_profile (pfile); + mp.give_profile (pfile); // all other return values indicate success // we do not decrement reference count on profile since we // are giving it to the MProfile! @@ -584,7 +584,7 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x) } // while loop // make sure we got some profiles! - if (mp->profile_count () == 0) + if (mp.profile_count () == 0) { ACE_DEBUG ((LM_DEBUG, "no IIOP v%d.%d (or earlier) profile in IOR!\n", @@ -597,7 +597,7 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x) // TAO_Stub will make a copy of mp! TAO_Stub *objdata; ACE_NEW_RETURN (objdata, TAO_Stub (type_hint._retn (), - mp.get (), + mp, cdr.orb_core ()), 0); if (objdata == 0) |