[committed] libstdc++: Remove public std::vector<bool>::data() member

Jonathan Wakely jwakely@redhat.com
Thu Nov 11 20:02:23 GMT 2021


Tested x86_64-linux, pushed to trunk.


This function only exists to avoid an error in the debug mode vector, so
doesn't need to be public.

libstdc++-v3/ChangeLog:

	* include/bits/stl_bvector.h (vector<bool>::data()): Give
	protected access, and delete for C++11 and later.
---
 libstdc++-v3/include/bits/stl_bvector.h | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h
index 3778d5a770a..31d878427c2 100644
--- a/libstdc++-v3/include/bits/stl_bvector.h
+++ b/libstdc++-v3/include/bits/stl_bvector.h
@@ -996,14 +996,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
       back() const
       { return *(end() - 1); }
 
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 464. Suggestion for new member functions in standard containers.
-      // N.B. DR 464 says nothing about vector<bool> but we need something
-      // here due to the way we are implementing DR 464 in the debug-mode
-      // vector class.
-      void
-      data() _GLIBCXX_NOEXCEPT { }
-
       void
       push_back(bool __x)
       {
@@ -1363,7 +1355,19 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 
       iterator
       _M_erase(iterator __first, iterator __last);
-  };
+
+    protected:
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
+      // DR 464. Suggestion for new member functions in standard containers.
+      // N.B. DR 464 says nothing about vector<bool> but we need something
+      // here due to the using-declaration in __gnu_debug::vector.
+      // vector class.
+#if __cplusplus >= 201103L
+      void data() = delete;
+#else
+      void data() { }
+#endif
+    };
 
 _GLIBCXX_END_NAMESPACE_CONTAINER
 
-- 
2.31.1



More information about the Gcc-patches mailing list