diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-06-17 09:24:24 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-06-17 09:24:24 +0000 |
| commit | 7f8eb7daa471f7d60c1f0ea50fdd91181dce9626 (patch) | |
| tree | 1a94ffd942ce91f014dde88bd289a335975f9d6c | |
| parent | 1c0310729fe103ddfaade5c7bf9022d731cafae3 (diff) | |
| download | ATCD-7f8eb7daa471f7d60c1f0ea50fdd91181dce9626.tar.gz | |
ChangeLogTag: Fri Jun 17 09:20:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/ORB.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/ORB.h | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c19012eaa1e..46bbefd778b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Fri Jun 17 09:20:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc: + Fixed typo in exename, wanted to commit this yesterday but couldn't + reach cvs + Fri Jun 17 09:11:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tests/DLL_ORB/client.cpp: diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index b090a3be18f..8d7ae330e11 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -967,9 +967,9 @@ CORBA::ORB::resolve_root_poa (ACE_ENV_SINGLE_ARG_DECL) } CORBA::Object_ptr -CORBA::ORB::resolve_poa_current (ACE_ENV_SINGLE_ARG_DECL) +CORBA::ORB::resolve_poa_current (void) { - return this->orb_core_->poa_current (ACE_ENV_SINGLE_ARG_PARAMETER); + return this->orb_core_->poa_current (void); } CORBA::Object_ptr diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index b989bf8fb0a..87a26093caa 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -594,7 +594,7 @@ namespace CORBA ~ORB (void); /// Resolve the POA current. - CORBA::Object_ptr resolve_poa_current (ACE_ENV_SINGLE_ARG_DECL); + CORBA::Object_ptr resolve_poa_current (void); /// Resolve the Policy Manager for this ORB. CORBA::Object_ptr resolve_policy_manager (void); |