diff options
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tao/ORB.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 46bbefd778b..714a86710fe 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Fri Jun 17 09:24:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/ORB.{h,cpp}: + Removed some unneeded emulated exeption macros + Fri Jun 17 09:20:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc: diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 8d7ae330e11..f22977d0b59 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -969,7 +969,7 @@ CORBA::ORB::resolve_root_poa (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_ptr CORBA::ORB::resolve_poa_current (void) { - return this->orb_core_->poa_current (void); + return this->orb_core_->poa_current (); } CORBA::Object_ptr |