Update copyright years.

[thirdparty/gcc.git] / libstdc++-v3 / testsuite / 23_containers / vector / capacity / 2.cc

diff --git a/libstdc++-v3/testsuite/23_containers/vector/capacity/2.cc b/libstdc++-v3/testsuite/23_containers/vector/capacity/2.cc
index f61ba572ccf4d5ca7967e9bccfb2832db7951003..c481f7f6e3d15a22de535e52d196129601c28671 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/vector/capacity/2.cc
+++ b/libstdc++-v3/testsuite/23_containers/vector/capacity/2.cc
@@ -1,12 +1,12 @@
 // 1999-05-07
 // bkoz 
 
-// Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
+// Copyright (C) 1999-2020 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)
+// Free Software Foundation; either version 3, or (at your option)
 // any later version.
 
 // This library is distributed in the hope that it will be useful,
@@ -15,9 +15,8 @@
 // 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.
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
 
 // 23.2.4.2 vector capacity
 
@@ -27,8 +26,8 @@
 #include <testsuite_hooks.h>
 
 using __gnu_test::copy_tracker;
-using __gnu_test::allocation_tracker;
-using __gnu_test::tracker_alloc;
+using __gnu_test::tracker_allocator_counter;
+using __gnu_test::tracker_allocator;
 using __gnu_test::copy_constructor;
 using __gnu_test::assignment_operator;
 using __gnu_test::destructor;
@@ -37,11 +36,10 @@ using __gnu_test::destructor;
 void
 test_reserve()
 {
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
-  typedef std::vector<T, tracker_alloc<T> > X;
+  typedef std::vector<T, tracker_allocator<T> > X;
 
-  allocation_tracker::resetCounts();
+  tracker_allocator_counter::reset();
   {
     X a(3);
     const X::size_type old_size     = a.size();
@@ -59,7 +57,7 @@ test_reserve()
     VERIFY(destructor::count() <= old_size);
   }
   // check for memory leaks
-  VERIFY(allocation_tracker::allocationTotal() == allocation_tracker::deallocationTotal());
+  VERIFY(tracker_allocator_counter::get_allocation_count() == tracker_allocator_counter::get_deallocation_count());
 }
 
 // Verifies that reserve() with reallocation offers the strong
@@ -67,11 +65,10 @@ test_reserve()
 void
 test_reserve_exception_guarantee()
 {
-  bool test __attribute__((unused)) = true;
   typedef copy_tracker T;
-  typedef std::vector<T, tracker_alloc<T> > X;
+  typedef std::vector<T, tracker_allocator<T> > X;
 
-  allocation_tracker::resetCounts();
+  tracker_allocator_counter::reset();
   {
     X a(7);
     const X::size_type old_size __attribute__((unused)) = a.size();
@@ -92,7 +89,7 @@ test_reserve_exception_guarantee()
     VERIFY(old_capacity == a.capacity());
     VERIFY(copy_constructor::count() == destructor::count()+1);
   }
-  VERIFY(allocation_tracker::allocationTotal() == allocation_tracker::deallocationTotal());
+  VERIFY(tracker_allocator_counter::get_allocation_count() == tracker_allocator_counter::get_deallocation_count());
 }
 
 int main()