diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-08-29 00:38:14 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-08-29 00:38:14 +0000 |
| commit | dce3fe786696c53a540c2fd1d731f04a328f6f0d (patch) | |
| tree | 0969efa11aef973449adf89a06cab58eae1b2376 | |
| parent | 8068883dc63b4b4993c3b99bf37632a74d68ae93 (diff) | |
| download | ATCD-dce3fe786696c53a540c2fd1d731f04a328f6f0d.tar.gz | |
ChangeLogTag:Thu Aug 28 17:34:51 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Functor.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl | 4 |
3 files changed, 13 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 511a977a53f..aad3d90558a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Aug 28 17:34:51 2003 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/performance-tests/RTEvent/lib/Auto_Functor.cpp + (~Auto_Functor): + + Fixed emulated exception macro. "ACE_ENV_ARG_PARAMETER", not + "ACE_ENV_SINGLE_ARG_PARAMETER" (in this case). + Thu Aug 28 23:39:28 UTC 2003 Scott Harris <harris_s@ociweb.com> * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Functor.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Functor.cpp index 058045125e8..1145ea6f18a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Functor.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Functor.cpp @@ -40,7 +40,8 @@ Auto_Functor<Client,Functor>::~Auto_Functor () ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { Functor functor; - functor (this->client_ ACE_ENV_SINGLE_ARG_PARAMETER); + functor (this->client_ + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { // @@ TODO This event should be logged. Cannot throw because that diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl index c0864ee4aa7..783792ecdd4 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl @@ -1,3 +1,5 @@ +// -*- C++ -*- + /** * @file ORB_Shutdown.inl * @@ -11,5 +13,5 @@ ORB_Shutdown::operator () (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) { orb->shutdown (0 - ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } |