boostorg/exception
1
0
Fork 1
mirror of https://github.com/boostorg/exception.git synced 2025-07-21 00:12:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

properly ifdeffing the X86 MSVC non-intrusive exception_ptr support

Browse Source 
[SVN r65346]
This commit is contained in:
Emil Dotchevski
2010-09-07 21:46:10 +00:00
parent 976e89a137
commit c98deb1e40
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/boost/exception/detail/clone_current_exception.hpp
View File

@ -26,18 +26,17 @@ boost
} }
class clone_base; class clone_base;
int clone_current_exception_msvc( clone_base const * & cloned ); int clone_current_exception_msvc_x86( clone_base const * & cloned );
inline inline
int int
clone_current_exception( clone_base const * & cloned ) clone_current_exception( clone_base const * & cloned )
{ {
#ifdef BOOST_ENABLE_NON_INTRUSIVE_EXCEPTION_PTR #if defined(BOOST_ENABLE_NON_INTRUSIVE_EXCEPTION_PTR) && defined(_MSC_VER) && defined(_M_IX86) && !defined(_M_X64)
#ifdef _MSC_VER return clone_current_exception_msvc_x86(cloned);
return clone_current_exception_msvc(cloned); #else
#endif
#endif
return clone_current_exception_result::not_supported; return clone_current_exception_result::not_supported;
#endif
} }
} }
} }

6
src/clone_current_exception_msvc.cpp
View File

@ -10,6 +10,8 @@
#error This file requires exception handling to be enabled. #error This file requires exception handling to be enabled.
#endif #endif
#if defined(_MSC_VER) && defined(_M_IX86) && !defined(_M_X64)
#include <boost/exception/detail/clone_current_exception.hpp> #include <boost/exception/detail/clone_current_exception.hpp>
#include <boost/exception/exception.hpp> #include <boost/exception/exception.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
@ -266,7 +268,7 @@ boost
exception_detail exception_detail
{ {
int int
clone_current_exception_msvc( clone_base const * & cloned ) clone_current_exception_msvc_x86( clone_base const * & cloned )
{ {
BOOST_ASSERT(!cloned); BOOST_ASSERT(!cloned);
int result = clone_current_exception_result::not_supported; int result = clone_current_exception_result::not_supported;
@ -288,3 +290,5 @@ boost
} }
} }
} }
#endif