aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/include
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2022-01-13 21:59:13 +0000
committerJonathan Wakely <jwakely@redhat.com>2022-01-14 10:14:25 +0000
commitfc6f1128ae603164aea6303ce2b3ed0b57e6a378 (patch)
tree24e5f5da306c6f704772567d604faf1954daa2c1 /libstdc++-v3/include
parentd67ba1dce9796bff177e52e2bbb68bfa2c69a884 (diff)
downloadgcc-fc6f1128ae603164aea6303ce2b3ed0b57e6a378.zip
gcc-fc6f1128ae603164aea6303ce2b3ed0b57e6a378.tar.gz
gcc-fc6f1128ae603164aea6303ce2b3ed0b57e6a378.tar.bz2
libstdc++: Ignore cv-quals when std::allocator<void> constructs
When I added the std::allocator_traits<std::allocator<void>> specialization it broke code like this: std::allocate_shared<const int>(std::allocator<void>()); The problem is that allocator_traits<allocator<void>>::construct(a, p) now uses std::_Construct(p), which only does a static_cast<void*>(p) and so fails if the pointer has cv-quals. This changes std::_Construct (and the related std::_Construct_novalue) to use a C-style cast to (void*) which matches the effects of the "voidify" helper in the C++20 standard. libstdc++-v3/ChangeLog: * include/bits/stl_construct.h (_Construct, _Construct_novalue): Also cast away cv-qualifiers when converting pointer to void. * testsuite/20_util/allocator/void.cc: Test construct function with cv-qualified types.
Diffstat (limited to 'libstdc++-v3/include')
-rw-r--r--libstdc++-v3/include/bits/stl_construct.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/bits/stl_construct.h b/libstdc++-v3/include/bits/stl_construct.h
index 7c5fd4c..9531222 100644
--- a/libstdc++-v3/include/bits/stl_construct.h
+++ b/libstdc++-v3/include/bits/stl_construct.h
@@ -116,7 +116,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return;
}
#endif
- ::new(static_cast<void*>(__p)) _Tp(std::forward<_Args>(__args)...);
+ ::new((void*)__p) _Tp(std::forward<_Args>(__args)...);
}
#else
template<typename _T1, typename _T2>
@@ -132,7 +132,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _T1>
inline void
_Construct_novalue(_T1* __p)
- { ::new(static_cast<void*>(__p)) _T1; }
+ { ::new((void*)__p) _T1; }
template<typename _ForwardIterator>
_GLIBCXX20_CONSTEXPR void