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-15 18:17:54 +01:00
parent ab45a2c7e6 e0a53a3a84
commit 54d53f307f
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,7 @@
# define BOOST_NO_CXX11_DECLTYPE_N3276 # define BOOST_NO_CXX11_DECLTYPE_N3276
#endif #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, // Because the CTP is unsupported, unrelease, and only alpha quality,
// it is only supported if BOOST_MSVC_ENABLE_2014_JUN_CTP is defined. // it is only supported if BOOST_MSVC_ENABLE_2014_JUN_CTP is defined.
// //
@ -261,8 +261,8 @@
#endif #endif
// //
// last known and checked version is 18.00.21730.1 (VC14 CTP1): // last known and checked version is 19.00.21901.1 (VC14 CTP2):
#if (_MSC_VER > 1800 && _MSC_FULL_VER > 190021730) #if (_MSC_VER > 1800 && _MSC_FULL_VER > 190021901)
# if defined(BOOST_ASSERT_CONFIG) # if defined(BOOST_ASSERT_CONFIG)
# error "Unknown compiler version - please run the configure tests and report the results" # error "Unknown compiler version - please run the configure tests and report the results"
# else # else

4
include/boost/version.hpp
View File

@ -19,7 +19,7 @@
// BOOST_VERSION / 100 % 1000 is the minor version // BOOST_VERSION / 100 % 1000 is the minor version
// BOOST_VERSION / 100000 is the major 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 // 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. // number, y is the minor version number, and z is the patch level if not 0.
// This is used by <config/auto_link.hpp> to select which library version to link to. // This is used by <config/auto_link.hpp> to select which library version to link to.
#define BOOST_LIB_VERSION "1_56" #define BOOST_LIB_VERSION "1_57"
#endif #endif

16
test/boost_no_cxx11_user_lit.ipp
View File

@ -16,10 +16,10 @@ namespace boost_no_cxx11_user_defined_literals {
struct my_literal struct my_literal
{ {
constexpr my_literal() : val(0) {} my_literal() : val(0) {}
constexpr my_literal(int i) : val(i) {} my_literal(int i) : val(i) {}
constexpr my_literal(const my_literal& a) : val(a.val) {} my_literal(const my_literal& a) : val(a.val) {}
constexpr bool operator==(const my_literal& a) const { return val == a.val; } bool operator==(const my_literal& a) const { return val == a.val; }
int val; int val;
}; };
@ -47,20 +47,20 @@ struct parse_int<base, val, c, Digits...>
char_value, Digits...>::value }; 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); return my_literal(v);
} }
template <char...PACK> template <char...PACK>
constexpr my_literal operator "" _bin() my_literal operator "" _bin()
{ {
return parse_int<2, 0, PACK...>::value; return parse_int<2, 0, PACK...>::value;
} }
int test() int test()
{ {
constexpr my_literal a = 0x23_suf1; my_literal a = 0x23_suf1;
constexpr my_literal b = 1001_bin; my_literal b = 1001_bin;
return ((a == my_literal(0x23)) && (b == my_literal(9))) ? 0 : 1; return ((a == my_literal(0x23)) && (b == my_literal(9))) ? 0 : 1;
} }