Fix std::vector test to pass in C++98 mode

	* testsuite/23_containers/vector/check_construct_destroy.cc: Account
	for different construct/destroy counts in C++98 mode.

From-SVN: r238836

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3afe2bf25555afe0d8c7a5e5490243d8fb47936c..bc52008f53a88102294f141e5ce9bdbbb6a45708 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2016-07-28  Jonathan Wakely  <jwakely@redhat.com>
 
+       * testsuite/23_containers/vector/check_construct_destroy.cc: Account
+       for different construct/destroy counts in C++98 mode.
+
        * testsuite/17_intro/headers/c++2011/stdc++.cc: Change target-specific
        dg-options to dg-additional-options so that default options are used.
        * testsuite/17_intro/headers/c++2011/stdc++_multiple_inclusion.cc:

diff --git a/libstdc++-v3/testsuite/23_containers/vector/check_construct_destroy.cc b/libstdc++-v3/testsuite/23_containers/vector/check_construct_destroy.cc
index b92a1521aa258861679ca5c36258769582395625..ddf0f9aa05bd6a48709f99efc972da1f89bf56ba 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/vector/check_construct_destroy.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/check_construct_destroy.cc
@@ -44,14 +44,17 @@ int main()
   }
   ok = check_construct_destroy("Construct from range", 10, 10) && ok;
 
+  // For C++11 and later the allocator is used to construct/destroy an
+  // additional temporary object during insertion.
+  const int extra = __cplusplus >= 201102L ? 1 : 0;
   {
     Container c(arr10, arr10 + 10);
     c.reserve(100);
     tracker_allocator_counter::reset();
     c.insert(c.begin(), arr10[0]);
-    ok = check_construct_destroy("Insert element", 2, 1) && ok;
+    ok = check_construct_destroy("Insert element", 1+extra, 0+extra) && ok;
   }
-  ok = check_construct_destroy("Insert element", 2, 12) && ok;
+  ok = check_construct_destroy("Insert element", 1+extra, 11+extra) && ok;
 
   {
     Container c(arr10, arr10 + 10);