forked from boostorg/config
Merge branch 'develop'
This commit is contained in:
@ -107,7 +107,6 @@
|
|||||||
//
|
//
|
||||||
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
|
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
|
||||||
# define BOOST_NO_CXX11_HDR_ARRAY
|
# define BOOST_NO_CXX11_HDR_ARRAY
|
||||||
# define BOOST_NO_CXX11_HDR_REGEX
|
|
||||||
# define BOOST_NO_CXX11_HDR_TUPLE
|
# define BOOST_NO_CXX11_HDR_TUPLE
|
||||||
# define BOOST_NO_CXX11_HDR_UNORDERED_MAP
|
# define BOOST_NO_CXX11_HDR_UNORDERED_MAP
|
||||||
# define BOOST_NO_CXX11_HDR_UNORDERED_SET
|
# define BOOST_NO_CXX11_HDR_UNORDERED_SET
|
||||||
@ -152,7 +151,7 @@
|
|||||||
// C++0x features in GCC 4.7.0 and later
|
// C++0x features in GCC 4.7.0 and later
|
||||||
//
|
//
|
||||||
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
|
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
|
||||||
// Note that although <chrono> existed prior to 4.7, "stead_clock" is spelled "monotonic_clock"
|
// Note that although <chrono> existed prior to 4.7, "steady_clock" is spelled "monotonic_clock"
|
||||||
// so 4.7.0 is the first truely conforming one.
|
// so 4.7.0 is the first truely conforming one.
|
||||||
# define BOOST_NO_CXX11_HDR_CHRONO
|
# define BOOST_NO_CXX11_HDR_CHRONO
|
||||||
# define BOOST_NO_CXX11_ALLOCATOR
|
# define BOOST_NO_CXX11_ALLOCATOR
|
||||||
@ -163,6 +162,11 @@
|
|||||||
// Note that although <atomic> existed prior to gcc 4.8 it was largely unimplemented for many types:
|
// Note that although <atomic> existed prior to gcc 4.8 it was largely unimplemented for many types:
|
||||||
# define BOOST_NO_CXX11_HDR_ATOMIC
|
# define BOOST_NO_CXX11_HDR_ATOMIC
|
||||||
#endif
|
#endif
|
||||||
|
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
|
||||||
|
// Although <regex> is present and compilable against, the actual implementation is not functional
|
||||||
|
// even for the simplest patterns such as "\d" or "[0-9]". This is the case at least in gcc up to 4.8, inclusively.
|
||||||
|
# define BOOST_NO_CXX11_HDR_REGEX
|
||||||
|
#endif
|
||||||
// C++0x headers not yet (fully!) implemented
|
// C++0x headers not yet (fully!) implemented
|
||||||
//
|
//
|
||||||
# define BOOST_NO_CXX11_HDR_THREAD
|
# define BOOST_NO_CXX11_HDR_THREAD
|
||||||
|
@ -18,7 +18,12 @@ int test()
|
|||||||
{
|
{
|
||||||
using std::regex;
|
using std::regex;
|
||||||
using std::wregex;
|
using std::wregex;
|
||||||
return 0;
|
|
||||||
|
regex e("\\d+");
|
||||||
|
wregex we(L"\\s+");
|
||||||
|
std::string s("123456");
|
||||||
|
std::wstring ws(L"123456");
|
||||||
|
return regex_match(s, e) && regex_match(ws, we) ? 0 : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user