diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | TAO/tests/BiDirectional/test_i.cpp | 3 | ||||
| -rw-r--r-- | TAO/tests/BiDirectional_NestedUpcall/test_i.cpp | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 929d43e7332..569db6376b3 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Sat Dec 30 10:39:41 2000 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/BiDirectional/test_i.cpp: + * tests/BiDirectional_NestedUpcall/test_i.cpp: Fixed warnings in + g++ builds. + Fri Dec 29 12:05:02 2000 Balachandran Natarajan <bala@cs.wustl.edu> * tests/BiDirectional/test_i.cpp: Changed the wrong usage of diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp index 98117fe98d8..220d287cbd6 100644 --- a/TAO/tests/BiDirectional/test_i.cpp +++ b/TAO/tests/BiDirectional/test_i.cpp @@ -58,8 +58,7 @@ Simple_Server_i::call_client (CORBA::Environment &ACE_TRY_ENV) this->callback_->callback_method (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - TAO_ORB_Core *orb_core = this->orb_->orb_core (); - ACE_ASSERT (orb_core->connection_cache ().total_size () > 1); + ACE_ASSERT (this->orb_->orb_core ()->connection_cache ().total_size () > 1); } this->callback_->shutdown (ACE_TRY_ENV); diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp index e8dd87ec690..a632c52ff6f 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp @@ -43,9 +43,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback, this->callback_->callback_method (ACE_TRY_ENV); ACE_CHECK_RETURN (0); - TAO_ORB_Core *orb_core = this->orb_->orb_core (); - if (orb_core->connection_cache ().total_size () > 1) - ACE_ASSERT (-1); + ACE_ASSERT(this->orb_->orb_core ()->connection_cache ().total_size () > 1); } } |