diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp index cef7a4b7..6245a051 100644 --- a/include/boost/config/compiler/visualc.hpp +++ b/include/boost/config/compiler/visualc.hpp @@ -168,7 +168,7 @@ # define BOOST_NO_CXX11_DECLTYPE_N3276 #endif -// C++11 features supported by VC++ 14 CTP1 +// C++11 features supported by VC++ 14 (aka 2014) CTP1 // Because the CTP is unsupported, unrelease, and only alpha quality, // it is only supported if BOOST_MSVC_ENABLE_2014_JUN_CTP is defined. // @@ -261,8 +261,8 @@ #endif // -// last known and checked version is 18.00.21730.1 (VC14 CTP1): -#if (_MSC_VER > 1800 && _MSC_FULL_VER > 190021730) +// last known and checked version is 19.00.21901.1 (VC14 CTP2): +#if (_MSC_VER > 1800 && _MSC_FULL_VER > 190021901) # if defined(BOOST_ASSERT_CONFIG) # error "Unknown compiler version - please run the configure tests and report the results" # else diff --git a/include/boost/version.hpp b/include/boost/version.hpp index fc4c9697..c156fd79 100644 --- a/include/boost/version.hpp +++ b/include/boost/version.hpp @@ -19,7 +19,7 @@ // BOOST_VERSION / 100 % 1000 is the minor version // BOOST_VERSION / 100000 is the major version -#define BOOST_VERSION 105600 +#define BOOST_VERSION 105700 // // BOOST_LIB_VERSION must be defined to be the same as BOOST_VERSION @@ -27,6 +27,6 @@ // number, y is the minor version number, and z is the patch level if not 0. // This is used by to select which library version to link to. -#define BOOST_LIB_VERSION "1_56" +#define BOOST_LIB_VERSION "1_57" #endif diff --git a/test/boost_no_cxx11_user_lit.ipp b/test/boost_no_cxx11_user_lit.ipp index d1c2054a..090e0c03 100644 --- a/test/boost_no_cxx11_user_lit.ipp +++ b/test/boost_no_cxx11_user_lit.ipp @@ -16,10 +16,10 @@ namespace boost_no_cxx11_user_defined_literals { struct my_literal { - constexpr my_literal() : val(0) {} - constexpr my_literal(int i) : val(i) {} - constexpr my_literal(const my_literal& a) : val(a.val) {} - constexpr bool operator==(const my_literal& a) const { return val == a.val; } + my_literal() : val(0) {} + my_literal(int i) : val(i) {} + my_literal(const my_literal& a) : val(a.val) {} + bool operator==(const my_literal& a) const { return val == a.val; } int val; }; @@ -47,20 +47,20 @@ struct parse_int char_value, Digits...>::value }; }; -constexpr my_literal operator "" _suf1(unsigned long long v) +my_literal operator "" _suf1(unsigned long long v) { return my_literal(v); } template -constexpr my_literal operator "" _bin() +my_literal operator "" _bin() { return parse_int<2, 0, PACK...>::value; } int test() { - constexpr my_literal a = 0x23_suf1; - constexpr my_literal b = 1001_bin; + my_literal a = 0x23_suf1; + my_literal b = 1001_bin; return ((a == my_literal(0x23)) && (b == my_literal(9))) ? 0 : 1; }