diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2007-01-30 01:00:39 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2007-01-30 01:00:39 +0000 |
commit | 1aad8cb8c4e505a8ae39d4059ebec8799e943655 (patch) | |
tree | c65859cb1a47c7aaeb270d75e156f35c768ed089 /TAO/tao/ORB.cpp | |
parent | 711cbc63d109836fc6227b2799ea839d6f3e95da (diff) | |
download | ATCD-remove-tao-exception-specifications.tar.gz |
ChangeLogTag:Mon Jan 30 00:10:57 UTC 2007 Ossama Othman <ossama_othman at symantec dot com>remove-tao-exception-specifications
Diffstat (limited to 'TAO/tao/ORB.cpp')
-rw-r--r-- | TAO/tao/ORB.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 63312b4bfac..9c133b2a1aa 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -46,21 +46,9 @@ ACE_RCSID (tao, #include "ace/OS_NS_string.h" #include "ace/os_include/os_ctype.h" -void TAO_unexpected_exception_handler (void) -{ - throw ::CORBA::UNKNOWN (); -} static const char ior_prefix[] = "IOR:"; -// = Static initialization. - -namespace -{ - // Count of the number of ORBs. - int orb_init_count = 0; -} - // **************************************************************** TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -1149,20 +1137,6 @@ TAO::ORB::init_orb_globals (void) { ++orb_init_count; } - - // 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. - /** - * @note The new TypeCode implementation obviates the above - * comment. Standard CORBA exception TypeCodes are now - * available before CORBA::ORB_init() is ever called. - */ - TAO_Singleton_Manager::instance ()->_set_unexpected ( - ::TAO_unexpected_exception_handler); } CORBA::ORB_ptr |