diff options
Diffstat (limited to 'TAO/tao/Utils/RIR_Narrow.cpp')
| -rw-r--r-- | TAO/tao/Utils/RIR_Narrow.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp index 6c340121e4e..18299880b5a 100644 --- a/TAO/tao/Utils/RIR_Narrow.cpp +++ b/TAO/tao/Utils/RIR_Narrow.cpp @@ -3,7 +3,9 @@ #include "RIR_Narrow.h" #include "tao/SystemException.h" -#include <stdexcept> +#if defined (ACE_HAS_EXCEPTIONS) + #include <stdexcept> +#endif ACE_RCSID (Utils, RIR_Narror, @@ -47,7 +49,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 (); } |