Update copyright years in libstdc++-v3/

[thirdparty/gcc.git] / libstdc++-v3 / testsuite / ext / array_allocator / check_new.cc

diff --git a/libstdc++-v3/testsuite/ext/array_allocator/check_new.cc b/libstdc++-v3/testsuite/ext/array_allocator/check_new.cc
index 2d15972f6a7900669620dabae8758eef88024ca5..f3658d9baa921b932c4d613eed91670046fe1de7 100644 (file)
--- a/libstdc++-v3/testsuite/ext/array_allocator/check_new.cc
+++ b/libstdc++-v3/testsuite/ext/array_allocator/check_new.cc
@@ -1,11 +1,11 @@
 // 2001-11-25  Phil Edwards  <pme@gcc.gnu.org>
 //
-// Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001-2014 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,
@@ -14,46 +14,22 @@
 // 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
 
 // 20.4.1.1 allocator members
 
 #include <cstdlib>
 #include <ext/array_allocator.h>
-#include <testsuite_allocator.h>
+#include <replacement_memory_operators.h>
 
-using __gnu_cxx::array_allocator;
-
-void* 
-operator new(std::size_t n) throw(std::bad_alloc)
-{
-  new_called = true;
-  requested = n;
-  return std::malloc(n);
-}
-
-void
-operator delete(void *v) throw()
-{
-  delete_called = true;
-  return std::free(v);
-}
-
-// These just help tracking down error messages.
-bool test01() 
+int main()
 { 
   typedef unsigned int value_type;
   typedef std::tr1::array<value_type, 15> array_type;
-  typedef array_allocator<value_type, array_type> allocator_type;
+  typedef __gnu_cxx::array_allocator<value_type, array_type> allocator_type;
   array_type store;
   allocator_type a(&store);
-  return (__gnu_test::check_new<allocator_type, false>(a) == false); 
+  __gnu_test::check_new<allocator_type, false>(a); 
+  return 0;
 }
-
-int main()
-{
-  return test01();
-}
-