Hi

    As we just bump version namespace it might be interesting to do the following change now. What do you think ?

François

diff --git a/libstdc++-v3/include/bits/forward_list.h b/libstdc++-v3/include/bits/forward_list.h
index 56b3ac5..05abd43 100644
--- a/libstdc++-v3/include/bits/forward_list.h
+++ b/libstdc++-v3/include/bits/forward_list.h
@@ -116,7 +116,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       {
 	_Fwd_list_node() = default;
 
+#if _GLIBCXX_INLINE_VERSION
+	__gnu_cxx::__aligned_membuf<_Tp> _M_storage;
+#else
 	__gnu_cxx::__aligned_buffer<_Tp> _M_storage;
+#endif
 
 	_Tp*
 	_M_valptr() noexcept
diff --git a/libstdc++-v3/include/bits/hashtable_policy.h b/libstdc++-v3/include/bits/hashtable_policy.h
index 3ff6b14..222a1b2 100644
--- a/libstdc++-v3/include/bits/hashtable_policy.h
+++ b/libstdc++-v3/include/bits/hashtable_policy.h
@@ -231,7 +231,11 @@ namespace __detail
     {
       typedef _Value value_type;
 
+#if _GLIBCXX_INLINE_VERSION
+      __gnu_cxx::__aligned_membuf<_Value> _M_storage;
+#else
       __gnu_cxx::__aligned_buffer<_Value> _M_storage;
+#endif
 
       _Value*
       _M_valptr() noexcept
@@ -1516,7 +1520,11 @@ namespace __detail
   template<typename _Tp, bool _IsEmpty = std::is_empty<_Tp>::value>
     struct _Hash_code_storage
     {
+#if _GLIBCXX_INLINE_VERSION
+      __gnu_cxx::__aligned_membuf<_Tp> _M_storage;
+#else
       __gnu_cxx::__aligned_buffer<_Tp> _M_storage;
+#endif
 
       _Tp*
       _M_h() { return _M_storage._M_ptr(); }
diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h
index b58273a..8e00f1b 100644
--- a/libstdc++-v3/include/bits/shared_ptr_base.h
+++ b/libstdc++-v3/include/bits/shared_ptr_base.h
@@ -534,7 +534,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
 	_Alloc& _M_alloc() noexcept { return _A_base::_S_get(*this); }
 
+#if _GLIBCXX_INLINE_VERSION
+	__gnu_cxx::__aligned_membuf<_Tp> _M_storage;
+#else
 	__gnu_cxx::__aligned_buffer<_Tp> _M_storage;
+#endif
       };
 
     public:

Reply via email to