diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2019-10-29 20:16:57 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2019-10-29 20:16:57 +0000 |
| commit | 540218dd246231a52e377d42e81f467bd7d73b46 (patch) | |
| tree | ae4db19af38f71b34db40b668069ceac82d8f5ed /libstdc++-v3/include/ext | |
| parent | 6d0dff49ca1539e14647c04cc1bb035ef4c2780b (diff) | |
| download | gcc-540218dd246231a52e377d42e81f467bd7d73b46.zip gcc-540218dd246231a52e377d42e81f467bd7d73b46.tar.gz gcc-540218dd246231a52e377d42e81f467bd7d73b46.tar.bz2 | |
Fix compilation errors with Clang
* include/bits/alloc_traits.h (__cpp_lib_constexpr_dynamic_alloc):
Define.
(allocator_traits::_S_construct, allocator_traits::_S_destroy)
(__alloc_on_copy, __alloc_on_move, __alloc_on_swap): Use
_GLIBCXX14_CONSTEXPR instead of constexpr.
* include/bits/stl_construct.h (_Destroy): Likewise.
From-SVN: r277588
Diffstat (limited to 'libstdc++-v3/include/ext')
| -rw-r--r-- | libstdc++-v3/include/ext/alloc_traits.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libstdc++-v3/include/ext/alloc_traits.h b/libstdc++-v3/include/ext/alloc_traits.h index 052d811..c7b8e5d 100644 --- a/libstdc++-v3/include/ext/alloc_traits.h +++ b/libstdc++-v3/include/ext/alloc_traits.h @@ -76,7 +76,8 @@ template<typename _Alloc, typename = typename _Alloc::value_type> public: // overload construct for non-standard pointer types template<typename _Ptr, typename... _Args> - static constexpr std::__enable_if_t<__is_custom_pointer<_Ptr>::value> + static _GLIBCXX14_CONSTEXPR + std::__enable_if_t<__is_custom_pointer<_Ptr>::value> construct(_Alloc& __a, _Ptr __p, _Args&&... __args) noexcept(noexcept(_Base_type::construct(__a, std::__to_address(__p), std::forward<_Args>(__args)...))) @@ -87,7 +88,8 @@ template<typename _Alloc, typename = typename _Alloc::value_type> // overload destroy for non-standard pointer types template<typename _Ptr> - static constexpr std::__enable_if_t<__is_custom_pointer<_Ptr>::value> + static _GLIBCXX14_CONSTEXPR + std::__enable_if_t<__is_custom_pointer<_Ptr>::value> destroy(_Alloc& __a, _Ptr __p) noexcept(noexcept(_Base_type::destroy(__a, std::__to_address(__p)))) { _Base_type::destroy(__a, std::__to_address(__p)); } @@ -95,7 +97,7 @@ template<typename _Alloc, typename = typename _Alloc::value_type> static constexpr _Alloc _S_select_on_copy(const _Alloc& __a) { return _Base_type::select_on_container_copy_construction(__a); } - static constexpr void _S_on_swap(_Alloc& __a, _Alloc& __b) + static _GLIBCXX14_CONSTEXPR void _S_on_swap(_Alloc& __a, _Alloc& __b) { std::__alloc_on_swap(__a, __b); } static constexpr bool _S_propagate_on_copy_assign() |