diff options
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/Utils/RIR_Narrow.cpp | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3b7f935f197..d760086df79 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Sun Nov 14 05:11:42 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/Utils/RIR_Narrow.cpp: + + Fixed a simple compilation error when exceptions are turned off. + Sun Nov 14 05:01:28 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tao/PortableServer/Object_Adapter.cpp: diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp index 6c340121e4e..1dbd0e94b96 100644 --- a/TAO/tao/Utils/RIR_Narrow.cpp +++ b/TAO/tao/Utils/RIR_Narrow.cpp @@ -47,7 +47,8 @@ TAO::Utils::RIR_Narrow<T>::narrow_object (CORBA::Object_ptr object if (CORBA::is_nil (narrowed_object.in ())) { - ACE_THROW (CORBA::INV_OBJREF ()); + ACE_THROW_RETURN (CORBA::INV_OBJREF (), + T::_nil ()); } return narrowed_object._retn (); } |