diff options
| -rw-r--r-- | TAO/ChangeLog | 17 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FtRtEvent.mpc | 1 | ||||
| -rw-r--r-- | TAO/performance-tests/Protocols/client.cpp | 2 | ||||
| -rw-r--r-- | TAO/performance-tests/Protocols/server.cpp | 5 |
4 files changed, 21 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 8caa5d1789e..3a0b1821aa0 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,20 @@ +Sun Jun 20 12:17:50 2004 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/FtRtEvent.mpc (FTRT_EventChannel): + + Removed "avoids += minimum_corba". It is now inherited via the + ftrtevent base project. + + * performance-tests/Protocols/client.cpp (run): + + Fixed another emulated exception problem compile-time problem. + ACE_ENV_SINGLE_ARG_PARAMETER in this case, not + ACE_ENV_ARG_PARAMETER. + + * performance-tests/Protocols/server.cpp (end_test): + + Fixed "unused parameter warning in emulated exception builds. + Sun Jun 20 20:23:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * examples/Callback_Quoter/Consumer_Input_Handler.h: diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc index 84f2e4d84c7..f3039238266 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc @@ -58,7 +58,6 @@ project (FTRT_EventChannel) : orbsvcslib, ftrtevent, utils { includes += $(TAO_ROOT)/orbsvcs/orbsvcs/FtRtEvent/EventChannel after += FTORB_Utils requires += corba_messaging - avoids += minimum_corba IDL_Files { } diff --git a/TAO/performance-tests/Protocols/client.cpp b/TAO/performance-tests/Protocols/client.cpp index 3e776bc9d18..444cea53602 100644 --- a/TAO/performance-tests/Protocols/client.cpp +++ b/TAO/performance-tests/Protocols/client.cpp @@ -389,7 +389,7 @@ Paced_Worker::run (ACE_ENV_SINGLE_ARG_DECL) ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->test_->end_test (ACE_ENV_ARG_PARAMETER); + this->test_->end_test (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->print_stats (); diff --git a/TAO/performance-tests/Protocols/server.cpp b/TAO/performance-tests/Protocols/server.cpp index 274ec7a0a8c..d7c97b8fe3e 100644 --- a/TAO/performance-tests/Protocols/server.cpp +++ b/TAO/performance-tests/Protocols/server.cpp @@ -130,14 +130,15 @@ test_i::start_test (CORBA::ULong iterations } void -test_i::end_test (ACE_ENV_SINGLE_ARG_DECL) +test_i::end_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->test_end_ = ACE_OS::gethrtime (); ACE_DEBUG ((LM_DEBUG, - "\nTotal invocations expected / received / missed = %d / %d / %d\n", + "\nTotal invocations expected / received / missed = " + "%d / %d / %d\n", this->iterations_, this->number_of_invocations_received_, this->iterations_ - this->number_of_invocations_received_)); |