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

Merge from trunk, thus enabling support for VC++ 2013.

Browse Source 
[SVN r86432]
This commit is contained in:
Beman Dawes
2013-10-25 21:57:04 +00:00
parent 0a34d7b07e
commit 19d3287bf6
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@
# error "Compiler not supported or configured - please reconfigure" # error "Compiler not supported or configured - please reconfigure"
#endif #endif
#if _MSC_VER < 1800 #if _MSC_FULL_VER < 180020827
# define BOOST_NO_FENV_H # define BOOST_NO_FENV_H
#endif #endif
@@ -170,7 +170,7 @@
// C++11 features supported by VC++ 12 (aka 2013). // C++11 features supported by VC++ 12 (aka 2013).
// //
#if _MSC_VER < 1800 #if _MSC_FULL_VER < 180020827
# define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS # define BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
# define BOOST_NO_CXX11_DELETED_FUNCTIONS # define BOOST_NO_CXX11_DELETED_FUNCTIONS
# define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS # define BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
@@ -178,8 +178,8 @@
# define BOOST_NO_CXX11_RAW_LITERALS # define BOOST_NO_CXX11_RAW_LITERALS
# define BOOST_NO_CXX11_TEMPLATE_ALIASES # define BOOST_NO_CXX11_TEMPLATE_ALIASES
# define BOOST_NO_CXX11_TRAILING_RESULT_TYPES # define BOOST_NO_CXX11_TRAILING_RESULT_TYPES
# define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
# define BOOST_NO_CXX11_VARIADIC_TEMPLATES # define BOOST_NO_CXX11_VARIADIC_TEMPLATES
# define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
#endif #endif
// C++11 features not supported by any versions // C++11 features not supported by any versions
@@ -228,6 +228,8 @@
# define BOOST_COMPILER_VERSION evc10 # define BOOST_COMPILER_VERSION evc10
# elif _MSC_VER < 1800 # elif _MSC_VER < 1800
# define BOOST_COMPILER_VERSION evc11 # define BOOST_COMPILER_VERSION evc11
# elif _MSC_VER < 1900
# define BOOST_COMPILER_VERSION evc12
# else # else
# if defined(BOOST_ASSERT_CONFIG) # if defined(BOOST_ASSERT_CONFIG)
# error "Unknown EVC++ compiler version - please run the configure tests and report the results" # error "Unknown EVC++ compiler version - please run the configure tests and report the results"