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

Fix user-defined literal tests for MSVC

Browse Source 
The test currently tests not only the compiler's support for user-defined literals, but also its constexpr support, which is only partly implemented in MSVC 14. This change removes the constexpr's that MSVC doesn't like so that the tests pass on MSVC 14 CTP2.
This commit is contained in:
Marcel Raad
2014-08-12 10:25:04 +02:00
parent 34e1c7416b
commit 884b53b563
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;
} }