diff options
Diffstat (limited to 'TAO/tao/TAO_Singleton_Manager.cpp')
| -rw-r--r-- | TAO/tao/TAO_Singleton_Manager.cpp | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp index 9fa29b29fe6..345d30cb3f9 100644 --- a/TAO/tao/TAO_Singleton_Manager.cpp +++ b/TAO/tao/TAO_Singleton_Manager.cpp @@ -1,7 +1,6 @@ // $Id$ #include "tao/TAO_Singleton_Manager.h" -#include "tao/Exception.h" #include "ace/Guard_T.h" #include "ace/Recursive_Thread_Mutex.h" @@ -12,16 +11,6 @@ # include "tao/TAO_Singleton_Manager.inl" #endif /* ! __ACE_INLINE__ */ -#if defined (ACE_MVS) -# include /**/ <unexpect.h> -#else -# if defined (ACE_HAS_STANDARD_CPP_LIBRARY) -# include /**/ <exception> -# else -# include /**/ <exception.h> -# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ -#endif /* ACE_MVS */ - ACE_RCSID (tao, TAO_Singleton_Manager, "$Id$") @@ -62,7 +51,6 @@ TAO_Singleton_Manager::TAO_Singleton_Manager (void) #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) , internal_lock_ (0) # endif /* ACE_MT_SAFE */ - , old_unexpected_ (0) { #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) ACE_NEW (this->internal_lock_, @@ -264,17 +252,6 @@ TAO_Singleton_Manager::fini (void) this->internal_lock_ = 0; #endif /* ACE_MT_SAFE */ - // Restore the old unexpected exception handler since TAO will no - // longer be handling exceptions. Allow the application to once - // again handle unexpected exceptions. -# if (!defined (_MSC_VER) \ - && defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) \ - && (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0)) || defined (ghs) - (void) std::set_unexpected (this->old_unexpected_); -# else - (void) set_unexpected (this->old_unexpected_); -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - // Indicate that this TAO_Singleton_Manager instance has been shut down. this->object_manager_state_ = OBJ_MAN_SHUT_DOWN; @@ -307,24 +284,6 @@ TAO_Singleton_Manager::shutting_down (void) : 1; } -void -TAO_Singleton_Manager::_set_unexpected (TAO_unexpected_handler u) -{ - // This must be done after the system TypeCodes and Exceptions have - // been initialized. An unexpected exception will cause TAO's - // unexpected exception handler to be called. That handler - // transforms all unexpected exceptions to CORBA::UNKNOWN, which of - // course requires the TypeCode constants and system exceptions to - // have been initialized. -# if (!defined (_MSC_VER) \ - && defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) \ - && (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0)) || defined (ghs) - this->old_unexpected_ = std::set_unexpected (u); -# else - this->old_unexpected_ = set_unexpected (u); -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ -} - int TAO_Singleton_Manager::at_exit_i (void *object, ACE_CLEANUP_FUNC cleanup_hook, |