Commit 0aeb81f8 by Jonathan Wakely

Don't define uses-allocator variable templates in C++11

	* include/bits/uses_allocator.h (__is_uses_allocator_constructible_v)
	(__is_nothrow_uses_allocator_constructible_v): Only define for C++14
	and later.

From-SVN: r241301
parent b64e8239
2016-10-18 Jonathan Wakely <jwakely@redhat.com>
* include/bits/uses_allocator.h (__is_uses_allocator_constructible_v)
(__is_nothrow_uses_allocator_constructible_v): Only define for C++14
and later.
2016-10-17 Paolo Carlini <paolo.carlini@oracle.com> 2016-10-17 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/27_io/basic_filebuf/close/12790-1.cc: Remove 'test' * testsuite/27_io/basic_filebuf/close/12790-1.cc: Remove 'test'
variables. variables.
* testsuite/27_io/basic_filebuf/close/char/1.cc: Likewise. * testsuite/27_io/basic_filebuf/close/char/1.cc: Likewise.
* testsuite/27_io/basic_filebuf/close/char/12790-1.cc: Likewise. * testsuite/27_io/basic_filebuf/close/char/12790-1.cc: Likewise.
* testsuite/27_io/basic_filebuf/close/char/12790-2.cc: Likewise. * testsuite/27_io/basic_filebuf/close/char/12790-2.cc: Likewise.
......
...@@ -126,9 +126,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -126,9 +126,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
: __is_uses_allocator_predicate<is_constructible, _Tp, _Alloc, _Args...> : __is_uses_allocator_predicate<is_constructible, _Tp, _Alloc, _Args...>
{ }; { };
#if __cplusplus >= 201402L
template<typename _Tp, typename _Alloc, typename... _Args> template<typename _Tp, typename _Alloc, typename... _Args>
constexpr bool __is_uses_allocator_constructible_v = constexpr bool __is_uses_allocator_constructible_v =
__is_uses_allocator_constructible<_Tp, _Alloc, _Args...>::value; __is_uses_allocator_constructible<_Tp, _Alloc, _Args...>::value;
#endif // C++14
template<typename _Tp, typename _Alloc, typename... _Args> template<typename _Tp, typename _Alloc, typename... _Args>
struct __is_nothrow_uses_allocator_constructible struct __is_nothrow_uses_allocator_constructible
...@@ -137,9 +139,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -137,9 +139,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ }; { };
#if __cplusplus >= 201402L
template<typename _Tp, typename _Alloc, typename... _Args> template<typename _Tp, typename _Alloc, typename... _Args>
constexpr bool __is_nothrow_uses_allocator_constructible_v = constexpr bool __is_nothrow_uses_allocator_constructible_v =
__is_nothrow_uses_allocator_constructible<_Tp, _Alloc, _Args...>::value; __is_nothrow_uses_allocator_constructible<_Tp, _Alloc, _Args...>::value;
#endif // C++14
template<typename _Tp, typename... _Args> template<typename _Tp, typename... _Args>
void __uses_allocator_construct_impl(__uses_alloc0 __a, _Tp* __ptr, void __uses_allocator_construct_impl(__uses_alloc0 __a, _Tp* __ptr,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment