diff options
| author | Phil Mesnier <mesnierp@ociweb.com> | 2016-04-14 19:37:09 -0500 |
|---|---|---|
| committer | Phil Mesnier <mesnierp@ociweb.com> | 2016-04-14 19:37:09 -0500 |
| commit | fd904693d47bc0f9c3c110e1b6beff016581926d (patch) | |
| tree | e904dca5ca259295738fbf07ab68c2f4200e5148 | |
| parent | 011132f78db51f75839f7a7c181d3711980aa38d (diff) | |
| parent | 80cae59427ae6006b9ec139428982a37ed320b32 (diff) | |
| download | ATCD-fd904693d47bc0f9c3c110e1b6beff016581926d.tar.gz | |
Merge pull request #235 from pmesnier/master
scoreboard cleanup
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp | 4 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index a06e329026e..dc66ae97d43 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -1611,7 +1611,7 @@ ImR_Locator_i::connect_server (UpdateableServerInfo& info) } - catch (const CORBA::Exception& ex) + catch (const CORBA::Exception& ) { sip->reset_runtime (); } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp index 4cead98b098..3b2a7dfc988 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp @@ -593,7 +593,7 @@ TAO::PG_Object_Group::locations_of_members (void) PortableGroup::Locations * result = 0; - size_t count = this->members_.current_size (); + CORBA::ULong count = static_cast<CORBA::ULong> (this->members_.current_size ()); ACE_NEW_THROW_EX ( result, @@ -602,7 +602,7 @@ TAO::PG_Object_Group::locations_of_members (void) result->length (count); - size_t pos = 0; + CORBA::ULong pos = 0; for (MemberMap_Iterator it = this->members_.begin(); it != this->members_.end(); ++it) diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl index 78a5615e468..8003c40e812 100755 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/run_test.pl @@ -250,6 +250,7 @@ sub validate_servers } } close FILE; + return $count != 2; } |