git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR libstdc++/80939 Remove unmeetable constexpr specifiers 

PR libstdc++/80939
	* include/std/variant (__erased_ctor, __erased_assign, __erased_swap)
	(__erased_hash): Remove constexpr specifier and qualify calls to
	__ref_cast.
	(__erased_dtor): Remove constexpr specifier and use _Destroy.

From-SVN: r248881
This commit is contained in:
Jonathan Wakely 2017-06-05 17:49:04 +01:00 committed by Jonathan Wakely
parent 3c5a5b930d
commit 94895bd98d
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2017-06-02 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/80939
* include/std/variant (__erased_ctor, __erased_assign, __erased_swap)
(__erased_hash): Remove constexpr specifier and qualify calls to
__ref_cast.
(__erased_dtor): Remove constexpr specifier and use _Destroy.
2017-06-05 Jonathan Wakely <jwakely@redhat.com> 2017-06-05 Jonathan Wakely <jwakely@redhat.com>
* include/bits/stl_iterator_base_funcs.h * include/bits/stl_iterator_base_funcs.h

35
libstdc++-v3/include/std/variant
View File

@ -44,6 +44,9 @@
#include <bits/invoke.h> #include <bits/invoke.h>
#include <ext/aligned_buffer.h> #include <ext/aligned_buffer.h>
#include <bits/parse_numbers.h> #include <bits/parse_numbers.h>
#include <bits/stl_iterator_base_types.h>
#include <bits/stl_iterator_base_funcs.h>
#include <bits/stl_construct.h>
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
@ -238,30 +241,32 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// Various functions as "vtable" entries, where those vtables are used by // Various functions as "vtable" entries, where those vtables are used by
// polymorphic operations. // polymorphic operations.
template<typename _Lhs, typename _Rhs> template<typename _Lhs, typename _Rhs>
constexpr void void
__erased_ctor(void* __lhs, void* __rhs) __erased_ctor(void* __lhs, void* __rhs)
{ ::new (__lhs) remove_reference_t<_Lhs>(__ref_cast<_Rhs>(__rhs)); } {
using _Type = remove_reference_t<_Lhs>;
::new (__lhs) _Type(__variant::__ref_cast<_Rhs>(__rhs));
}
template<typename _Variant, size_t _Np> template<typename _Variant, size_t _Np>
constexpr void void
__erased_dtor(_Variant&& __v) __erased_dtor(_Variant&& __v)
{ std::_Destroy(std::__addressof(__get<_Np>(__v))); }
template<typename _Lhs, typename _Rhs>
void
__erased_assign(void* __lhs, void* __rhs)
{ {
auto&& __element = __get<_Np>(std::forward<_Variant>(__v)); __variant::__ref_cast<_Lhs>(__lhs) = __variant::__ref_cast<_Rhs>(__rhs);
using _Type = std::remove_reference_t<decltype(__element)>;
__element.~_Type();
} }
template<typename _Lhs, typename _Rhs> template<typename _Lhs, typename _Rhs>
constexpr void void
__erased_assign(void* __lhs, void* __rhs)
{ __ref_cast<_Lhs>(__lhs) = __ref_cast<_Rhs>(__rhs); }
template<typename _Lhs, typename _Rhs>
constexpr void
__erased_swap(void* __lhs, void* __rhs) __erased_swap(void* __lhs, void* __rhs)
{ {
using std::swap; using std::swap;
swap(__ref_cast<_Lhs>(__lhs), __ref_cast<_Rhs>(__rhs)); swap(__variant::__ref_cast<_Lhs>(__lhs),
__variant::__ref_cast<_Rhs>(__rhs));
} }
#define _VARIANT_RELATION_FUNCTION_TEMPLATE(__OP, __NAME) \ #define _VARIANT_RELATION_FUNCTION_TEMPLATE(__OP, __NAME) \
@ -283,11 +288,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#undef _VARIANT_RELATION_FUNCTION_TEMPLATE #undef _VARIANT_RELATION_FUNCTION_TEMPLATE
template<typename _Tp> template<typename _Tp>
constexpr size_t size_t
__erased_hash(void* __t) __erased_hash(void* __t)
{ {
return std::hash<remove_cv_t<remove_reference_t<_Tp>>>{}( return std::hash<remove_cv_t<remove_reference_t<_Tp>>>{}(
__ref_cast<_Tp>(__t)); __variant::__ref_cast<_Tp>(__t));
} }
// Defines members and ctors. // Defines members and ctors.