From 501ebb67b50fc0a314715b5c99151eb42ede5a3d Mon Sep 17 00:00:00 2001 From: fredk Date: Sun, 30 May 1999 03:43:17 +0000 Subject: Fixed a cruddy interface for is_equivalent --- TAO/tao/MProfile.cpp | 11 +++++------ TAO/tao/MProfile.h | 8 ++++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp index fc5b1192b6d..6dfbf56207f 100644 --- a/TAO/tao/MProfile.cpp +++ b/TAO/tao/MProfile.cpp @@ -126,17 +126,16 @@ TAO_MProfile::add_profile (TAO_Profile *pfile) } CORBA::Boolean -TAO_MProfile::is_equivalent (TAO_MProfile *first, - TAO_MProfile *second, +TAO_MProfile::is_equivalent (TAO_MProfile *rhs, CORBA::Environment &env) { // Two profile lists are equivalent iff at least one of the profiles // form the first list is_equivalent to at least one of the profiles // from the second list!! - TAO_Profile_ptr *pfiles1 = first->pfiles (); - TAO_Profile_ptr *pfiles2 = second->pfiles (); - TAO_PHandle first_cnt = first->profile_count (); - TAO_PHandle second_cnt = second->profile_count (); + TAO_Profile_ptr *pfiles1 = this->pfiles_; + TAO_Profile_ptr *pfiles2 = rhs->pfiles_; + TAO_PHandle first_cnt = this->profile_count (); + TAO_PHandle second_cnt = rhs->profile_count (); for (TAO_PHandle h1 = 0; h1 < first_cnt;h1++) for (TAO_PHandle h2 = 0; h2 < second_cnt; h2++ ) diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h index 13de8fa3330..93055b59ad9 100644 --- a/TAO/tao/MProfile.h +++ b/TAO/tao/MProfile.h @@ -128,18 +128,22 @@ public: TAO_MProfile *forward_from (void); // Returns a pointer to the profile which was forwarded. - CORBA::Boolean is_equivalent (TAO_MProfile *first, - TAO_MProfile *second, + CORBA::Boolean is_equivalent (TAO_MProfile *rhs, CORBA::Environment &env); // Returns true of there is at least one profile in first which // is_equivalent with at least one profile in second. @@ FRED: The // lost should be locked for this! + // Yes, the Stub object has been the only object that manipulated + // these list and thus it took care of locking. This is changing + // though so we may have to add a lock to this list. Althouch I + // really don't want to. CORBA::ULong hash (CORBA::ULong max, CORBA::Environment &env); // use all registered profiles. The hash() method is called on each // profile and the results are averaged together. // @@ FRED: The list should be locked for this! + // See above comment. protected: TAO_Profile_ptr *pfiles (void) const; -- cgit v1.2.1