hashtable.h: Fold in include/tr1_impl/hashtable.h contents.

2010-02-10  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/tr1/hashtable.h: Fold in include/tr1_impl/hashtable.h
	contents.
	* include/tr1_impl/hashtable.h: Remove.
	* include/tr1_impl/hashtable_policy.h: Move and rename...
	* include/tr1/hashtable_policy.h: ... here.
	* include/tr1_impl/unordered_map: Move and rename...
	* include/tr1/unordered_map.h: ... here.
	* include/tr1_impl/unordered_set: Move and rename...
	* include/tr1/unordered_set.h: ... here.
	* include/tr1_impl/unordered_map: Move and rename...
	* include/tr1/unordered_map.h: ... here.
	* include/tr1/unordered_map: Adjust.
	* include/tr1/unordered_set: Likewise.
	* include/Makefile.am: Adjust.
	* include/Makefile.in: Regenerate.

	* include/std/c++0x_warning.h: Move...
	* include/bits/c++0x_warning.h: ... here.
	* include/debug/unordered_map: Adjust.
	* include/debug/unordered_set: Likewise.
	* include/std/tuple: Likewise.
	* include/std/system_error: Likewise.
	* include/std/forward_list: Likewise.
	* include/std/thread: Likewise.
	* include/std/type_traits: Likewise.
	* include/std/future: Likewise.
	* include/std/regex: Likewise.
	* include/std/atomic: Likewise.
	* include/std/ratio: Likewise.
	* include/std/random: Likewise.
	* include/std/unordered_map: Likewise.
	* include/std/chrono: Likewise.: Likewise.
	* include/std/condition_variable: Likewise.
	* include/std/mutex: Likewise.
	* include/std/unordered_set: Likewise.
	* include/std/array: Likewise.
	* include/profile/unordered_map: Likewise.
	* include/profile/unordered_set: Likewise.
	* include/c_global/cinttypes: Likewise.
	* include/c_global/ctgmath: Likewise.
	* include/c_global/cfenv: Likewise.
	* include/c_global/cstdint: Likewise.
	* include/c_global/cstdbool: Likewise.
	* include/c_global/ccomplex: Likewise.

	* include/bits/shared_ptr.h: Do not include <bits/c++0x_warning.h>
	at all, the file is not meant to be included by the users.
	* include/bits/functional_hash.h: Likewise.
	* include/bits/unique_ptr.h: Likewise.
	* include/bits/forward_list.h: Likewise.

	* testsuite/29_atomics/atomic/cons/assign_neg.cc: Adjust dg-*
	line numbers.
	* testsuite/29_atomics/atomic/cons/copy_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/requirements/dr438/
	assign_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/requirements/dr438/
	insert_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/requirements/dr438/
	constructor_1_neg.cc: Likewise.
	* testsuite/23_containers/forward_list/requirements/dr438/
	constructor_2_neg.cc: Likewise.
	* testsuite/20_util/unique_ptr/modifiers/reset_neg.cc: Likewise.
	* testsuite/20_util/unique_ptr/assign/assign_neg.cc: Likewise.

From-SVN: r156667

libstdc++-v3/ChangeLog

 2010-02-10  Paolo Carlini  <paolo.carlini@oracle.com>
 
+	* include/tr1/hashtable.h: Fold in include/tr1_impl/hashtable.h
+	contents.
+	* include/tr1_impl/hashtable.h: Remove.
+	* include/tr1_impl/hashtable_policy.h: Move and rename...
+	* include/tr1/hashtable_policy.h: ... here.
+	* include/tr1_impl/unordered_map: Move and rename...
+	* include/tr1/unordered_map.h: ... here.
+	* include/tr1_impl/unordered_set: Move and rename...
+	* include/tr1/unordered_set.h: ... here.
+	* include/tr1_impl/unordered_map: Move and rename...
+	* include/tr1/unordered_map.h: ... here.
+	* include/tr1/unordered_map: Adjust.
+	* include/tr1/unordered_set: Likewise.
+	* include/Makefile.am: Adjust.
+	* include/Makefile.in: Regenerate.
+
+	* include/std/c++0x_warning.h: Move...
+	* include/bits/c++0x_warning.h: ... here.
+	* include/debug/unordered_map: Adjust.
+	* include/debug/unordered_set: Likewise.
+	* include/std/tuple: Likewise.
+	* include/std/system_error: Likewise.
+	* include/std/forward_list: Likewise.
+	* include/std/thread: Likewise.
+	* include/std/type_traits: Likewise.
+	* include/std/future: Likewise.
+	* include/std/regex: Likewise.
+	* include/std/atomic: Likewise.
+	* include/std/ratio: Likewise.
+	* include/std/random: Likewise.
+	* include/std/unordered_map: Likewise.
+	* include/std/chrono: Likewise.: Likewise.
+	* include/std/condition_variable: Likewise.
+	* include/std/mutex: Likewise.
+	* include/std/unordered_set: Likewise.
+	* include/std/array: Likewise.
+	* include/profile/unordered_map: Likewise.
+	* include/profile/unordered_set: Likewise.
+	* include/c_global/cinttypes: Likewise.
+	* include/c_global/ctgmath: Likewise.
+	* include/c_global/cfenv: Likewise.
+	* include/c_global/cstdint: Likewise.
+	* include/c_global/cstdbool: Likewise.
+	* include/c_global/ccomplex: Likewise.
+
+	* include/bits/shared_ptr.h: Do not include <bits/c++0x_warning.h>
+	at all, the file is not meant to be included by the users.
+	* include/bits/functional_hash.h: Likewise.
+	* include/bits/unique_ptr.h: Likewise.
+	* include/bits/forward_list.h: Likewise.
+
+	* testsuite/29_atomics/atomic/cons/assign_neg.cc: Adjust dg-*
+	line numbers.
+	* testsuite/29_atomics/atomic/cons/copy_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/requirements/dr438/
+	assign_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/requirements/dr438/
+	insert_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/requirements/dr438/
+	constructor_1_neg.cc: Likewise.
+	* testsuite/23_containers/forward_list/requirements/dr438/
+	constructor_2_neg.cc: Likewise.
+	* testsuite/20_util/unique_ptr/modifiers/reset_neg.cc: Likewise.
+	* testsuite/20_util/unique_ptr/assign/assign_neg.cc: Likewise.
+
+2010-02-10  Paolo Carlini  <paolo.carlini@oracle.com>
+
 	* include/bits/hashtable.h: Fold in include/tr1_impl/hashtable.h
 	for C++0x use.
 	* include/bits/hashtable_policy.h: New, copy and adjust for

libstdc++-v3/include/Makefile.am

@@ -31,7 +31,6 @@ std_headers = \
 	${std_srcdir}/array \
 	${std_srcdir}/atomic \
 	${std_srcdir}/bitset \
-	${std_srcdir}/c++0x_warning.h \
 	${std_srcdir}/chrono \
 	${std_srcdir}/complex \
 	${std_srcdir}/condition_variable \
@@ -89,6 +88,7 @@ bits_headers = \
 	${bits_srcdir}/basic_string.h \
 	${bits_srcdir}/basic_string.tcc \
 	${bits_srcdir}/boost_concept_check.h \
+	${bits_srcdir}/c++0x_warning.h \
 	${bits_srcdir}/char_traits.h \
 	${bits_srcdir}/codecvt.h \
 	${bits_srcdir}/concept_check.h \
@@ -569,6 +569,7 @@ tr1_headers = \
 	${tr1_srcdir}/gamma.tcc \
 	${tr1_srcdir}/hypergeometric.tcc \
 	${tr1_srcdir}/hashtable.h \
+	${tr1_srcdir}/hashtable_policy.h \
 	${tr1_srcdir}/inttypes.h \
 	${tr1_srcdir}/limits.h \
 	${tr1_srcdir}/math.h \
@@ -592,8 +593,10 @@ tr1_headers = \
 	${tr1_srcdir}/tgmath.h \
 	${tr1_srcdir}/tuple \
 	${tr1_srcdir}/type_traits \
-	${tr1_srcdir}/unordered_set \
 	${tr1_srcdir}/unordered_map \
+	${tr1_srcdir}/unordered_map.h \
+	${tr1_srcdir}/unordered_set \
+	${tr1_srcdir}/unordered_set.h \
 	${tr1_srcdir}/utility \
 	${tr1_srcdir}/wchar.h \
 	${tr1_srcdir}/wctype.h
@@ -614,12 +617,8 @@ tr1_impl_headers = \
 	${tr1_impl_srcdir}/cstdlib \
 	${tr1_impl_srcdir}/cwchar \
 	${tr1_impl_srcdir}/cwctype \
-	${tr1_impl_srcdir}/hashtable \
-	${tr1_impl_srcdir}/hashtable_policy.h \
 	${tr1_impl_srcdir}/regex \
 	${tr1_impl_srcdir}/type_traits \
-	${tr1_impl_srcdir}/unordered_map \
-	${tr1_impl_srcdir}/unordered_set \
 	${tr1_impl_srcdir}/utility
 
 decimal_srcdir = ${glibcxx_srcdir}/include/decimal

libstdc++-v3/include/Makefile.in

@@ -273,7 +273,6 @@ std_headers = \
 	${std_srcdir}/array \
 	${std_srcdir}/atomic \
 	${std_srcdir}/bitset \
-	${std_srcdir}/c++0x_warning.h \
 	${std_srcdir}/chrono \
 	${std_srcdir}/complex \
 	${std_srcdir}/condition_variable \
@@ -331,6 +330,7 @@ bits_headers = \
 	${bits_srcdir}/basic_string.h \
 	${bits_srcdir}/basic_string.tcc \
 	${bits_srcdir}/boost_concept_check.h \
+	${bits_srcdir}/c++0x_warning.h \
 	${bits_srcdir}/char_traits.h \
 	${bits_srcdir}/codecvt.h \
 	${bits_srcdir}/concept_check.h \
@@ -809,6 +809,7 @@ tr1_headers = \
 	${tr1_srcdir}/gamma.tcc \
 	${tr1_srcdir}/hypergeometric.tcc \
 	${tr1_srcdir}/hashtable.h \
+	${tr1_srcdir}/hashtable_policy.h \
 	${tr1_srcdir}/inttypes.h \
 	${tr1_srcdir}/limits.h \
 	${tr1_srcdir}/math.h \
@@ -832,8 +833,10 @@ tr1_headers = \
 	${tr1_srcdir}/tgmath.h \
 	${tr1_srcdir}/tuple \
 	${tr1_srcdir}/type_traits \
-	${tr1_srcdir}/unordered_set \
 	${tr1_srcdir}/unordered_map \
+	${tr1_srcdir}/unordered_map.h \
+	${tr1_srcdir}/unordered_set \
+	${tr1_srcdir}/unordered_set.h \
 	${tr1_srcdir}/utility \
 	${tr1_srcdir}/wchar.h \
 	${tr1_srcdir}/wctype.h
@@ -853,12 +856,8 @@ tr1_impl_headers = \
 	${tr1_impl_srcdir}/cstdlib \
 	${tr1_impl_srcdir}/cwchar \
 	${tr1_impl_srcdir}/cwctype \
-	${tr1_impl_srcdir}/hashtable \
-	${tr1_impl_srcdir}/hashtable_policy.h \
 	${tr1_impl_srcdir}/regex \
 	${tr1_impl_srcdir}/type_traits \
-	${tr1_impl_srcdir}/unordered_map \
-	${tr1_impl_srcdir}/unordered_set \
 	${tr1_impl_srcdir}/utility
 
 decimal_srcdir = ${glibcxx_srcdir}/include/decimal

libstdc++-v3/include/bits/forward_list.h

@@ -31,10 +31,6 @@
 
 #pragma GCC system_header
 
-#ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
-#else
-
 #include <memory>
 #include <initializer_list>
 #include <ext/cast.h>
@@ -1282,6 +1278,4 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 
 _GLIBCXX_END_NAMESPACE // namespace std
 
-#endif // __GXX_EXPERIMENTAL_CXX0X__
-
 #endif // _FORWARD_LIST_H

libstdc++-v3/include/bits/functional_hash.h

@@ -32,10 +32,6 @@
 
 #pragma GCC system_header
 
-#ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
-#endif
-
 #include <string>
 #include <system_error>
 

libstdc++-v3/include/bits/shared_ptr.h

 // shared_ptr and weak_ptr implementation -*- C++ -*-
 
-// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010 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
@@ -49,10 +49,6 @@
 #ifndef _SHARED_PTR_H
 #define _SHARED_PTR_H 1
 
-#ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
-#endif
-
 #include <bits/shared_ptr_base.h>
 
 _GLIBCXX_BEGIN_NAMESPACE(std)

libstdc++-v3/include/bits/unique_ptr.h

 // unique_ptr implementation -*- C++ -*-
 
-// Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010 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
@@ -30,10 +30,6 @@
 #ifndef _UNIQUE_PTR_H
 #define _UNIQUE_PTR_H 1
 
-#ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
-#endif
-
 #include <bits/c++config.h>
 #include <debug/debug.h>
 #include <type_traits>

libstdc++-v3/include/c_global/ccomplex

 // <ccomplex> -*- C++ -*-
 
-// Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010 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
@@ -32,7 +32,7 @@
 #define _GLIBCXX_CCOMPLEX 1
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #endif
 
 #if defined(_GLIBCXX_INCLUDE_AS_TR1)

libstdc++-v3/include/c_global/cfenv

 // <cfenv> -*- C++ -*-
 
-// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010 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
@@ -32,7 +32,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #endif
 
 #if defined(_GLIBCXX_INCLUDE_AS_TR1)

libstdc++-v3/include/c_global/cinttypes

 // <cinttypes> -*- C++ -*-
 
-// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010 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
@@ -32,7 +32,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #endif
 
 #if defined(_GLIBCXX_INCLUDE_AS_TR1)

libstdc++-v3/include/c_global/cstdbool

 // <cstdbool> -*- C++ -*-
 
-// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010 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
@@ -32,7 +32,7 @@
 #define _GLIBCXX_CSTDBOOL 1
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-#  include <c++0x_warning.h>
+#  include <bits/c++0x_warning.h>
 #else
 #  include <bits/c++config.h>
 #  if _GLIBCXX_HAVE_STDBOOL_H

libstdc++-v3/include/c_global/cstdint

 // <cstdint> -*- C++ -*-
 
-// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010 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
@@ -32,7 +32,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #endif
 
 #if defined(_GLIBCXX_INCLUDE_AS_TR1)

libstdc++-v3/include/c_global/ctgmath

 // <ctgmath> -*- C++ -*-
 
-// Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010 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
@@ -32,7 +32,7 @@
 #define _GLIBCXX_CTGMATH 1
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-#  include <c++0x_warning.h>
+#  include <bits/c++0x_warning.h>
 #else
 #  include <cmath>
 #endif

libstdc++-v3/include/debug/unordered_map

@@ -33,7 +33,7 @@
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
 # include <unordered_map>
 #else
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #endif
 
 #include <debug/safe_sequence.h>

libstdc++-v3/include/debug/unordered_set

@@ -33,7 +33,7 @@
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
 # include <unordered_set>
 #else
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #endif
 
 #include <debug/safe_sequence.h>

libstdc++-v3/include/profile/unordered_map

@@ -39,7 +39,7 @@
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
 # include <unordered_map>
 #else
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #endif
 
 #include <initializer_list>

libstdc++-v3/include/profile/unordered_set

@@ -39,7 +39,7 @@
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
 # include <unordered_set>
 #else
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #endif
 
 #include <initializer_list>

libstdc++-v3/include/std/array

 // <array> -*- C++ -*-
 
-// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010 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
@@ -32,7 +32,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #else
 
 #if defined(_GLIBCXX_INCLUDE_AS_TR1)

libstdc++-v3/include/std/atomic

 // -*- C++ -*- header.
 
-// Copyright (C) 2008, 2009
-// Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010 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
@@ -36,7 +35,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #endif
 
 #include <bits/atomic_base.h>

libstdc++-v3/include/std/chrono

 // <chrono> -*- C++ -*-
 
-// Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010 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
@@ -32,7 +32,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #else
 
 #ifdef _GLIBCXX_INCLUDE_AS_TR1

libstdc++-v3/include/std/condition_variable

@@ -32,7 +32,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #else
 
 #include <chrono>

libstdc++-v3/include/std/forward_list

 // <forward_list> -*- C++ -*-
 
-// Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010 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
@@ -32,7 +32,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #else
 
 #include <bits/forward_list.h>

libstdc++-v3/include/std/future

@@ -32,7 +32,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #else
 
 #include <functional>

libstdc++-v3/include/std/mutex

@@ -33,7 +33,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #else
 
 #include <tuple>

libstdc++-v3/include/std/random

@@ -32,7 +32,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #else
 
 #include <cmath>

libstdc++-v3/include/std/ratio

 // ratio -*- C++ -*-
 
-// Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010 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 
@@ -32,7 +32,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #else
 
 #include <type_traits>

libstdc++-v3/include/std/regex

 // <regex> -*- C++ -*-
 
-// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010 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
@@ -32,7 +32,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #else
 
 #if defined(_GLIBCXX_INCLUDE_AS_TR1)

libstdc++-v3/include/std/system_error

 // <system_error> -*- C++ -*-
 
-// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010 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
@@ -32,7 +32,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #else
 
 #include <bits/c++config.h>

libstdc++-v3/include/std/thread

 // <thread> -*- C++ -*-
 
-// Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010 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
@@ -32,7 +32,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #else
 
 #include <chrono>

libstdc++-v3/include/std/tuple

 // <tuple> -*- C++ -*-
 
-// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010 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
@@ -32,7 +32,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #else
 
 #include <utility>

libstdc++-v3/include/std/type_traits

 // C++0x type_traits -*- C++ -*-
 
-// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010 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
@@ -32,7 +32,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #else
 
 #if defined(_GLIBCXX_INCLUDE_AS_TR1)

libstdc++-v3/include/std/unordered_map

@@ -32,7 +32,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #else
 
 #include <utility>

libstdc++-v3/include/std/unordered_set

@@ -32,7 +32,7 @@
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #else
 
 #include <utility>

libstdc++-v3/include/tr1_impl/hashtable_policy.h → libstdc++-v3/include/tr1/hashtable_policy.h

 // Internal policy header for TR1 unordered_set and unordered_map -*- C++ -*-
 
-// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2010 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
@@ -22,7 +22,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file tr1_impl/hashtable_policy.h
+/** @file tr1/hashtable_policy.h
  *  This is an internal header file, included by other library headers.
  *  You should not attempt to use it directly.
  */

libstdc++-v3/include/tr1/unordered_map

@@ -39,6 +39,6 @@
 #include <tr1/type_traits>
 #include <tr1/functional_hash.h>
 #include <tr1/hashtable.h>
-#include <tr1_impl/unordered_map>
+#include <tr1/unordered_map.h>
 
 #endif // _GLIBCXX_TR1_UNORDERED_MAP

libstdc++-v3/include/tr1_impl/unordered_map → libstdc++-v3/include/tr1/unordered_map.h

-// TR1 unordered_map -*- C++ -*-
+// TR1 unordered_map implementation -*- C++ -*-
 
-// Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2010 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
@@ -22,7 +22,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file tr1_impl/unordered_map
+/** @file tr1/unordered_map.h
  *  This is an internal header file, included by other library headers.
  *  You should not attempt to use it directly.
  */

libstdc++-v3/include/tr1/unordered_set

@@ -39,6 +39,6 @@
 #include <tr1/type_traits>
 #include <tr1/functional_hash.h>
 #include <tr1/hashtable.h>
-#include <tr1_impl/unordered_set>
+#include <tr1/unordered_set.h>
 
 #endif // _GLIBCXX_TR1_UNORDERED_SET

libstdc++-v3/include/tr1_impl/unordered_set → libstdc++-v3/include/tr1/unordered_set.h

-// TR1 unordered_set -*- C++ -*-
+// TR1 unordered_set implementation -*- C++ -*-
 
-// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2010 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
@@ -22,7 +22,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file tr1_impl/unordered_set
+/** @file tr1/unordered_set.h
  *  This is an internal header file, included by other library headers.
  *  You should not attempt to use it directly.
  */

libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign_neg.cc

 // { dg-do compile }
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2008, 2009 Free Software Foundation
+// Copyright (C) 2008, 2009, 2010 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
@@ -49,13 +49,13 @@ test03()
   std::unique_ptr<int[2]> p2 = p1;
 }
 
-// { dg-error "deleted function" "" { target *-*-* } 358 }
+// { dg-error "deleted function" "" { target *-*-* } 354 }
 // { dg-error "used here" "" { target *-*-* } 42 }
 // { dg-error "no matching" "" { target *-*-* } 48 }
-// { dg-warning "candidates are" "" { target *-*-* } 119 }
-// { dg-warning "note" "" { target *-*-* } 112 }
-// { dg-warning "note" "" { target *-*-* } 107 }
-// { dg-warning "note" "" { target *-*-* } 102 }
-// { dg-warning "note" "" { target *-*-* } 96 }
-// { dg-error "deleted function" "" { target *-*-* } 213 }
+// { dg-warning "candidates are" "" { target *-*-* } 115 }
+// { dg-warning "note" "" { target *-*-* } 108 }
+// { dg-warning "note" "" { target *-*-* } 103 }
+// { dg-warning "note" "" { target *-*-* } 98 }
+// { dg-warning "note" "" { target *-*-* } 92 }
+// { dg-error "deleted function" "" { target *-*-* } 209 }
 // { dg-error "used here" "" { target *-*-* } 49 }

libstdc++-v3/testsuite/20_util/unique_ptr/modifiers/reset_neg.cc

 // { dg-do compile }
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2008, 2009 Free Software Foundation
+// Copyright (C) 2008, 2009, 2010 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
@@ -36,4 +36,4 @@ void test01()
 }
 
 // { dg-error "used here" "" { target *-*-* } 35 } 
-// { dg-error "deleted function" "" { target *-*-* } 348 }
+// { dg-error "deleted function" "" { target *-*-* } 344 }

libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/assign_neg.cc

 // { dg-do compile }
 // { dg-options "-std=gnu++0x" }
-// { dg-error "no matching" "" { target *-*-* } 1201 }
+// { dg-error "no matching" "" { target *-*-* } 1197 }
 // { dg-excess-errors "" }
 
 // Copyright (C) 2009, 2010 Free Software Foundation

libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/constructor_1_neg.cc

 // { dg-do compile }
 // { dg-options "-std=gnu++0x" }
-// { dg-error "no matching" "" { target *-*-* } 1201 }
+// { dg-error "no matching" "" { target *-*-* } 1197 }
 // { dg-excess-errors "" }
 
 // Copyright (C) 2009, 2010 Free Software Foundation

libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/constructor_2_neg.cc

 // { dg-do compile }
 // { dg-options "-std=gnu++0x" }
-// { dg-error "no matching" "" { target *-*-* } 1201 }
+// { dg-error "no matching" "" { target *-*-* } 1197 }
 // { dg-excess-errors "" }
 
 // Copyright (C) 2009, 2010 Free Software Foundation

libstdc++-v3/testsuite/23_containers/forward_list/requirements/dr438/insert_neg.cc

 // { dg-do compile }
 // { dg-options "-std=gnu++0x" }
-// { dg-error "no matching" "" { target *-*-* } 1201 }
+// { dg-error "no matching" "" { target *-*-* } 1197 }
 // { dg-excess-errors "" }
 
 // Copyright (C) 2009, 2010 Free Software Foundation

libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc

 // { dg-options "-std=gnu++0x" }
 // { dg-do compile }
 
-// Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010 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
@@ -29,19 +29,19 @@ int main()
 }
 
 // { dg-error "used here" "" { target *-*-* } 521 }
-// { dg-error "deleted function" "" { target *-*-* } 231 }
-// { dg-error "deleted function" "" { target *-*-* } 249 }
-// { dg-error "deleted function" "" { target *-*-* } 267 }
-// { dg-error "deleted function" "" { target *-*-* } 285 }
-// { dg-error "deleted function" "" { target *-*-* } 303 }
-// { dg-error "deleted function" "" { target *-*-* } 321 }
-// { dg-error "deleted function" "" { target *-*-* } 339 }
-// { dg-error "deleted function" "" { target *-*-* } 357 }
-// { dg-error "deleted function" "" { target *-*-* } 375 }
-// { dg-error "deleted function" "" { target *-*-* } 393 }
-// { dg-error "deleted function" "" { target *-*-* } 411 }
-// { dg-error "deleted function" "" { target *-*-* } 429 }
-// { dg-error "deleted function" "" { target *-*-* } 447 }
-// { dg-error "deleted function" "" { target *-*-* } 465 }
-// { dg-error "deleted function" "" { target *-*-* } 483 }
+// { dg-error "deleted function" "" { target *-*-* } 230 }
+// { dg-error "deleted function" "" { target *-*-* } 248 }
+// { dg-error "deleted function" "" { target *-*-* } 266 }
+// { dg-error "deleted function" "" { target *-*-* } 284 }
+// { dg-error "deleted function" "" { target *-*-* } 302 }
+// { dg-error "deleted function" "" { target *-*-* } 320 }
+// { dg-error "deleted function" "" { target *-*-* } 338 }
+// { dg-error "deleted function" "" { target *-*-* } 356 }
+// { dg-error "deleted function" "" { target *-*-* } 374 }
+// { dg-error "deleted function" "" { target *-*-* } 392 }
+// { dg-error "deleted function" "" { target *-*-* } 410 }
+// { dg-error "deleted function" "" { target *-*-* } 428 }
+// { dg-error "deleted function" "" { target *-*-* } 446 }
+// { dg-error "deleted function" "" { target *-*-* } 464 }
+// { dg-error "deleted function" "" { target *-*-* } 482 }
 // { dg-excess-errors "In member function" }

libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc

 // { dg-options "-std=gnu++0x" }
 // { dg-do compile }
 
-// Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2008, 2009, 2010 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
@@ -29,19 +29,19 @@ int main()
 }
 
 // { dg-error "used here" "" { target *-*-* } 560 }
-// { dg-error "deleted function" "" { target *-*-* } 248 }
-// { dg-error "deleted function" "" { target *-*-* } 266 }
-// { dg-error "deleted function" "" { target *-*-* } 284 }
-// { dg-error "deleted function" "" { target *-*-* } 302 }
-// { dg-error "deleted function" "" { target *-*-* } 320 }
-// { dg-error "deleted function" "" { target *-*-* } 338 }
-// { dg-error "deleted function" "" { target *-*-* } 356 }
-// { dg-error "deleted function" "" { target *-*-* } 374 }
-// { dg-error "deleted function" "" { target *-*-* } 230 }
-// { dg-error "deleted function" "" { target *-*-* } 410 }
-// { dg-error "deleted function" "" { target *-*-* } 428 }
-// { dg-error "deleted function" "" { target *-*-* } 446 }
-// { dg-error "deleted function" "" { target *-*-* } 464 }
-// { dg-error "deleted function" "" { target *-*-* } 482 }
-// { dg-error "deleted function" "" { target *-*-* } 392 }
+// { dg-error "deleted function" "" { target *-*-* } 229 }
+// { dg-error "deleted function" "" { target *-*-* } 247 }
+// { dg-error "deleted function" "" { target *-*-* } 265 }
+// { dg-error "deleted function" "" { target *-*-* } 283 }
+// { dg-error "deleted function" "" { target *-*-* } 301 }
+// { dg-error "deleted function" "" { target *-*-* } 319 }
+// { dg-error "deleted function" "" { target *-*-* } 337 }
+// { dg-error "deleted function" "" { target *-*-* } 355 }
+// { dg-error "deleted function" "" { target *-*-* } 373 }
+// { dg-error "deleted function" "" { target *-*-* } 391 }
+// { dg-error "deleted function" "" { target *-*-* } 409 }
+// { dg-error "deleted function" "" { target *-*-* } 427 }
+// { dg-error "deleted function" "" { target *-*-* } 445 }
+// { dg-error "deleted function" "" { target *-*-* } 463 }
+// { dg-error "deleted function" "" { target *-*-* } 481 }
 // { dg-excess-errors "In member function" }