diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-10-30 01:55:43 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-10-30 01:55:43 +0000 |
| commit | 95405abb52f8fd4dc0398ceb6ce082611d01fda6 (patch) | |
| tree | d841763e279e13b9cf9200561b3fbc1150551f18 /TAO | |
| parent | c22e05230e122a619652c458584d41fe9c9e6ad5 (diff) | |
| download | ATCD-95405abb52f8fd4dc0398ceb6ce082611d01fda6.tar.gz | |
ChangeLogTag:Tue Oct 29 17:50:59 2002 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/TAO_Singleton_Manager.cpp | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 93e6ff8dc09..dc977a8f9d8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Tue Oct 29 17:50:59 2002 Ossama Othman <ossama@uci.edu> + + * tao/TAO_Singleton_Manager.cpp (fini, _set_unexpected): + + Call set_unexpected() in the global namespace when using + MSVC++. MSVC++ doesn't place set_unexpected() in the "std" + namespace. Thanks to Irfan for pointing the build problem. + Tue Oct 29 19:20:29 2002 Yamuna Krishnamurthy <yamuna@cs.wustl.edu> * orbsvcs/orbsvcs/Notify/Service.h: diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp index 4dcf3af6751..120ab4d968a 100644 --- a/TAO/tao/TAO_Singleton_Manager.cpp +++ b/TAO/tao/TAO_Singleton_Manager.cpp @@ -252,7 +252,8 @@ TAO_Singleton_Manager::fini (void) // 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 (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) \ +# if !defined (_MSC_VER) \ + && defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) \ && (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) (void) std::set_unexpected (this->old_unexpected_); # else @@ -306,7 +307,8 @@ TAO_Singleton_Manager::_set_unexpected (TAO_unexpected_handler u) // transforms all unexpected exceptions to CORBA::UNKNOWN, which of // course requires the TypeCode constants and system exceptions to // have been initialized. -# if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) \ +# if !defined (_MSC_VER) \ + && defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) \ && (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0) this->old_unexpected_ = std::set_unexpected (u); # else |