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

Merge branch 'develop' of https://github.com/boostorg/config into develop

Browse Source
This commit is contained in:
jzmaddock
2014-08-22 17:40:52 +01:00
parent 05604f00d0 6b2d9b249e
commit e659a7e487
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/macro_reference.qbk
View File

@@ -399,7 +399,7 @@ containing header should be included only once while preprocessing the
current translation unit. The pragma may improve compile times of large projects current translation unit. The pragma may improve compile times of large projects
with some compilers. with some compilers.
]] ]]
[[`BOOST_HAS_PRAGMA_DETECT_MISSMATCH`][Compiler][ [[`BOOST_HAS_PRAGMA_DETECT_MISMATCH`][Compiler][
The compiler recognizes the `#pragma detect_mismatch("name", "value")` directive which tells that the The compiler recognizes the `#pragma detect_mismatch("name", "value")` directive which tells that the
link stage should be terminated with error if values for provided `"name"` missmatch. link stage should be terminated with error if values for provided `"name"` missmatch.
This pragma may be a help in preventing ODR violations and ensuring that different modules This pragma may be a help in preventing ODR violations and ensuring that different modules

2
include/boost/config/compiler/clang.hpp
View File

@@ -12,7 +12,7 @@
// Detecting `-fms-extension` compiler flag assuming that _MSC_VER defined when that flag is used. // Detecting `-fms-extension` compiler flag assuming that _MSC_VER defined when that flag is used.
#if defined (_MSC_VER) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4)) #if defined (_MSC_VER) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4))
# define BOOST_HAS_PRAGMA_DETECT_MISSMATCH # define BOOST_HAS_PRAGMA_DETECT_MISMATCH
#endif #endif
// When compiling with clang before __has_extension was defined, // When compiling with clang before __has_extension was defined,

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

@@ -105,7 +105,7 @@
# define BOOST_HAS_NRVO # define BOOST_HAS_NRVO
#endif #endif
#if _MSC_VER >= 1500 // 150X == VC++ 9.0 #if _MSC_VER >= 1500 // 150X == VC++ 9.0
# define BOOST_HAS_PRAGMA_DETECT_MISSMATCH # define BOOST_HAS_PRAGMA_DETECT_MISMATCH
#endif #endif
// //
// disable Win32 API's if compiler extensions are // disable Win32 API's if compiler extensions are