diff options
author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2012-07-16 20:43:11 +0000 |
---|---|---|
committer | Jonathan Wakely <redi@gcc.gnu.org> | 2012-07-16 21:43:11 +0100 |
commit | 8db81fb2feeb722b0b49db4750e58fc1ecd05bff (patch) | |
tree | a45ab54f7f6447cf29ea8247f56bbe95204a64c2 /libstdc++-v3/include/bits/alloc_traits.h | |
parent | 1b667f1bb41b795971e965d61a1733b31c36acc9 (diff) | |
download | gcc-8db81fb2feeb722b0b49db4750e58fc1ecd05bff.tar.gz |
re PR libstdc++/53978 (Missing static const definitions in <bits/alloc_traits.h>)
PR libstdc++/53978
* include/bits/alloc_traits.h (allocator_traits): Define static
constants.
* include/bits/ptr_traits.h (pointer_traits): Likewise.
* include/ext/alloc_traits.h (__allocator_always_compares_equal):
Likewise.
From-SVN: r189547
Diffstat (limited to 'libstdc++-v3/include/bits/alloc_traits.h')
-rw-r--r-- | libstdc++-v3/include/bits/alloc_traits.h | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/libstdc++-v3/include/bits/alloc_traits.h b/libstdc++-v3/include/bits/alloc_traits.h index e1f4d41a6d0..80cc956a6fb 100644 --- a/libstdc++-v3/include/bits/alloc_traits.h +++ b/libstdc++-v3/include/bits/alloc_traits.h @@ -1,6 +1,6 @@ // Allocator traits -*- C++ -*- -// Copyright (C) 2011 Free Software Foundation, Inc. +// Copyright (C) 2011-2012 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -56,6 +56,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static const bool __value = _S_chk<_Alloc, _Tp>(nullptr); }; + template<typename _Alloc, typename _Tp> + const bool __alloctr_rebind_helper<_Alloc, _Tp>::__value; + template<typename _Alloc, typename _Tp, bool = __alloctr_rebind_helper<_Alloc, _Tp>::__value> struct __alloctr_rebind; @@ -423,6 +426,27 @@ _GLIBCXX_ALLOC_TR_NESTED_TYPE(propagate_on_container_swap, }; template<typename _Alloc> + template<typename _Alloc2> + const bool allocator_traits<_Alloc>::__allocate_helper<_Alloc2>::value; + + template<typename _Alloc> + template<typename _Tp, typename... _Args> + const bool + allocator_traits<_Alloc>::__construct_helper<_Tp, _Args...>::value; + + template<typename _Alloc> + template<typename _Tp> + const bool allocator_traits<_Alloc>::__destroy_helper<_Tp>::value; + + template<typename _Alloc> + template<typename _Alloc2> + const bool allocator_traits<_Alloc>::__maxsize_helper<_Alloc2>::value; + + template<typename _Alloc> + template<typename _Alloc2> + const bool allocator_traits<_Alloc>::__select_helper<_Alloc2>::value; + + template<typename _Alloc> inline void __do_alloc_on_copy(_Alloc& __one, const _Alloc& __two, true_type) { __one = __two; } |