From 2028b66d86a328f2e15bf5bd2077b5cdb9bb8f93 Mon Sep 17 00:00:00 2001
From: Stefano Soffia <soffia@cs.unipr.it>
Date: Mon, 12 May 2008 12:15:34 +0200
Subject: [PATCH] vector (vector<>::_M_requires_reallocation): Just use
this->capacity().
2008-05-12 Stefano Soffia <soffia@cs.unipr.it>
Paolo Carlini <paolo.carlini@oracle.com>
* include/debug/vector (vector<>::_M_requires_reallocation): Just
use this->capacity().
(vector<>::capacity): Move non-pedantic / pedantic logic here.
* testsuite/23_containers/vector/
debug_mode_requires_reallocation-2.cc: New.
* testsuite/23_containers/vector/debug_mode_requires_reallocation.cc:
Rename to debug_mode_requires_reallocation-1.cc
Co-Authored-By: Paolo Carlini <paolo.carlini@oracle.com>
From-SVN: r135208
---
libstdc++-v3/ChangeLog | 12 +++++
libstdc++-v3/include/debug/vector | 19 ++++---
... => debug_mode_requires_reallocation-1.cc} | 0
.../debug_mode_requires_reallocation-2.cc | 51 +++++++++++++++++++
4 files changed, 74 insertions(+), 8 deletions(-)
rename libstdc++-v3/testsuite/23_containers/vector/{debug_mode_requires_reallocation.cc => debug_mode_requires_reallocation-1.cc} (100%)
create mode 100644 libstdc++-v3/testsuite/23_containers/vector/debug_mode_requires_reallocation-2.cc
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b64bb7e4384b..b81746e86ece 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,15 @@
+2008-05-12 Stefano Soffia <soffia@cs.unipr.it>
+ Paolo Carlini <paolo.carlini@oracle.com>
+
+ * include/debug/vector (vector<>::_M_requires_reallocation): Just
+ use this->capacity().
+ (vector<>::capacity): Move non-pedantic / pedantic logic here.
+ * testsuite/23_containers/vector/
+ debug_mode_requires_reallocation-2.cc: New.
+
+ * testsuite/23_containers/vector/debug_mode_requires_reallocation.cc:
+ Rename to debug_mode_requires_reallocation-1.cc
+
2008-05-10 Roberto Bagnara <bagnara@cs.unipr.it>
Paolo Carlini <paolo.carlini@oracle.com>
diff --git a/libstdc++-v3/include/debug/vector b/libstdc++-v3/include/debug/vector
index a588ca8f104a..7945b54591e5 100644
--- a/libstdc++-v3/include/debug/vector
+++ b/libstdc++-v3/include/debug/vector
@@ -216,7 +216,16 @@ namespace __debug
this->_M_invalidate_all();
}
- using _Base::capacity;
+ size_type
+ capacity() const
+ {
+#ifdef _GLIBCXX_DEBUG_PEDANTIC
+ return _M_guaranteed_capacity;
+#else
+ return _Base::capacity();
+#endif
+ }
+
using _Base::empty;
void
@@ -442,13 +451,7 @@ namespace __debug
bool
_M_requires_reallocation(size_type __elements)
- {
-#ifndef _GLIBCXX_DEBUG_PEDANTIC
- return __elements > this->capacity();
-#else
- return __elements > _M_guaranteed_capacity;
-#endif
- }
+ { return __elements > this->capacity(); }
void
_M_update_guaranteed_capacity()
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug_mode_requires_reallocation.cc b/libstdc++-v3/testsuite/23_containers/vector/debug_mode_requires_reallocation-1.cc
similarity index 100%
rename from libstdc++-v3/testsuite/23_containers/vector/debug_mode_requires_reallocation.cc
rename to libstdc++-v3/testsuite/23_containers/vector/debug_mode_requires_reallocation-1.cc
diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug_mode_requires_reallocation-2.cc b/libstdc++-v3/testsuite/23_containers/vector/debug_mode_requires_reallocation-2.cc
new file mode 100644
index 000000000000..a09be47fd17c
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/vector/debug_mode_requires_reallocation-2.cc
@@ -0,0 +1,51 @@
+// Copyright (C) 2008 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING. If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// { dg-options "-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC" }
+
+#include <vector>
+#include <algorithm>
+#include <iterator>
+
+// http://gcc.gnu.org/ml/libstdc++/2008-05/msg00046.html
+void test01()
+{
+ typedef std::vector<unsigned> array_t;
+ typedef std::back_insert_iterator<array_t> bii_t;
+
+ array_t a;
+
+ // Push 5 elements.
+ a.push_back(0);
+ a.push_back(1);
+ a.push_back(2);
+ a.push_back(3);
+ a.push_back(4);
+ // Ensure that there is enough space for other two elements.
+ // (2 + 5 = 7)
+ if (a.capacity() < 7)
+ a.reserve(7);
+ // Add two new elements.
+ std::copy(a.begin(), a.begin() + 2, bii_t(a));
+}
+
+int main()
+{
+ test01();
+ return 0;
+}
--
GitLab