feedc0de/boost_config
1
0
Fork 0
forked from boostorg/config
Code Pull Requests Activity

Change detection logic for optional feature BOOST_HAS_PRAGMA_DETECT_MISSMATCH to match the way we've done these in the past.

Browse Source
This commit is contained in:
jzmaddock
2014-08-19 17:58:48 +01:00
parent 3138b2b747
commit 81acb3f788
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/boost/config/compiler/visualc.hpp
View File

@ -36,9 +36,6 @@
#define BOOST_HAS_PRAGMA_ONCE #define BOOST_HAS_PRAGMA_ONCE
// Will be undefined for old compilers lower in this file
#define BOOST_HAS_PRAGMA_DETECT_MISSMATCH
// //
// versions check: // versions check:
// we don't support Visual C++ prior to version 7.1: // we don't support Visual C++ prior to version 7.1:
@ -62,7 +59,6 @@
#if _MSC_VER < 1500 // 140X == VC++ 8.0 #if _MSC_VER < 1500 // 140X == VC++ 8.0
# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS # define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
# undef BOOST_HAS_PRAGMA_DETECT_MISSMATCH
#endif #endif
#if _MSC_VER < 1600 // 150X == VC++ 9.0 #if _MSC_VER < 1600 // 150X == VC++ 9.0
@ -108,6 +104,9 @@
#if (_MSC_VER >= 1400) && !defined(_DEBUG) #if (_MSC_VER >= 1400) && !defined(_DEBUG)
# define BOOST_HAS_NRVO # define BOOST_HAS_NRVO
#endif #endif
#if _MSC_VER >= 1500 // 150X == VC++ 9.0
# define BOOST_HAS_PRAGMA_DETECT_MISSMATCH
#endif
// //
// disable Win32 API's if compiler extensions are // disable Win32 API's if compiler extensions are
// turned off: // turned off: