From 0f2f6b6dfcbe57361ee387a80abb768060346eb0 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Fri, 18 Jul 2003 11:25:34 +0000 Subject: [PATCH] changed MSVC calling convention setup - can't use __fastcall in debug mode especially with /RTC [SVN r19190] --- include/boost/regex/config.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/boost/regex/config.hpp b/include/boost/regex/config.hpp index e10b416b..0ab0aa39 100644 --- a/include/boost/regex/config.hpp +++ b/include/boost/regex/config.hpp @@ -232,8 +232,12 @@ using std::distance; * ****************************************************************************/ -#if defined(_MSC_VER) && (_MSC_VER >= 1200) && defined(_MSC_EXTENSIONS) +#if defined(BOOST_MSVC) && (BOOST_MSVC >= 1200) && defined(_MSC_EXTENSIONS) +#if defined(_DEBUG) || defined(__MSVC_RUNTIME_CHECKS) +# define BOOST_REGEX_CALL __cdecl +#else # define BOOST_REGEX_CALL __fastcall +#endif # define BOOST_REGEX_CCALL __cdecl #endif