From: Paolo Carlini <pcarlini@suse.de>
Date: Tue, 8 Jan 2008 18:16:06 +0000 (+0000)
Subject: user_facet_hierarchies.cc: Do not include <cassert>.
X-Git-Tag: releases/gcc-4.3.0~691
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcc0edbb912cb5626abc710df7b3b7727b0cfc6a;p=thirdparty%2Fgcc.git

user_facet_hierarchies.cc: Do not include <cassert>.

2008-01-08  Paolo Carlini  <pcarlini@suse.de>

	* testsuite/22_locale/global_templates/user_facet_hierarchies.cc: Do
	not include <cassert>.
	* testsuite/22_locale/global_templates/standard_facet_hierarchies.cc:
	Likewise.
	* testsuite/util/testsuite_common_types.h: Include <algorithm>.

From-SVN: r131402
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a5b54c46608e..b507039944d6 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-08  Paolo Carlini  <pcarlini@suse.de>
+
+	* testsuite/22_locale/global_templates/user_facet_hierarchies.cc: Do
+	not include <cassert>.
+	* testsuite/22_locale/global_templates/standard_facet_hierarchies.cc:
+	Likewise.
+	* testsuite/util/testsuite_common_types.h: Include <algorithm>.
+
 2008-01-08  Jakub Jelinek  <jakub@redhat.com>
 
 	* configure.ac (--enable-linux-futex): Add new configure option.
diff --git a/libstdc++-v3/testsuite/22_locale/global_templates/standard_facet_hierarchies.cc b/libstdc++-v3/testsuite/22_locale/global_templates/standard_facet_hierarchies.cc
index bc089ca41e52..fa915a534369 100644
--- a/libstdc++-v3/testsuite/22_locale/global_templates/standard_facet_hierarchies.cc
+++ b/libstdc++-v3/testsuite/22_locale/global_templates/standard_facet_hierarchies.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007 Free Software Foundation
+// Copyright (C) 2007, 2008 Free Software Foundation
 //
 // 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
@@ -18,7 +18,6 @@
 
 #include <string>
 #include <locale>
-#include <cassert>
 #include <testsuite_hooks.h>
 
 // Based on Langer Kreft "Standard C++ IOStreams and Locales" p 316-318
diff --git a/libstdc++-v3/testsuite/22_locale/global_templates/user_facet_hierarchies.cc b/libstdc++-v3/testsuite/22_locale/global_templates/user_facet_hierarchies.cc
index 139223f2aa7a..6ef4b77f6af6 100644
--- a/libstdc++-v3/testsuite/22_locale/global_templates/user_facet_hierarchies.cc
+++ b/libstdc++-v3/testsuite/22_locale/global_templates/user_facet_hierarchies.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2007 Free Software Foundation
+// Copyright (C) 2007, 2008 Free Software Foundation
 //
 // 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
@@ -18,7 +18,6 @@
 
 #include <string>
 #include <locale>
-#include <cassert>
 #include <testsuite_hooks.h>
 
 // Based on Langer Kreft "Standard C++ IOStreams and Locales" p 316-318
diff --git a/libstdc++-v3/testsuite/util/testsuite_common_types.h b/libstdc++-v3/testsuite/util/testsuite_common_types.h
index b560ae3a0ac9..78fe1fe7fcaa 100644
--- a/libstdc++-v3/testsuite/util/testsuite_common_types.h
+++ b/libstdc++-v3/testsuite/util/testsuite_common_types.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // typelist for the C++ library testsuite. 
 //
-// Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 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
@@ -40,6 +40,8 @@
 #include <ext/bitmap_allocator.h>
 #include <ext/pool_allocator.h>
 
+#include <algorithm>
+
 #include <vector>
 #include <list>
 #include <deque>