functional_hash.h: Do not include ext/numeric_traits.h.

2007-11-20  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/functional_hash.h: Do not include ext/numeric_traits.h.
	* include/tr1/functional_hash.h: Likewise.
	* include/std/functional: Include ext/type_traits.h.
	* include/tr1/functional: Likewise.

From-SVN: r130314

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4de61c7167059b2611ad908c47a0c97b46409e1a..52e21d8005d48dde5d9e10f23a25e9ef33308342 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-20  Paolo Carlini  <pcarlini@suse.de>
+
+       * include/bits/functional_hash.h: Do not include ext/numeric_traits.h.
+       * include/tr1/functional_hash.h: Likewise.
+       * include/std/functional: Include ext/type_traits.h.
+       * include/tr1/functional: Likewise.
+
 2007-11-20  Paolo Carlini  <pcarlini@suse.de>
 
        * include/tr1_impl/functional_hash.h

diff --git a/libstdc++-v3/include/bits/functional_hash.h b/libstdc++-v3/include/bits/functional_hash.h
index 7b0d81cc6e876ce4169688a56cd924bb3dd60033..630a0841208a7441c637f17a66ee071000037a58 100644 (file)
--- a/libstdc++-v3/include/bits/functional_hash.h
+++ b/libstdc++-v3/include/bits/functional_hash.h
@@ -45,8 +45,6 @@
 #  error C++0x header cannot be included from TR1 header
 #endif
 
-#include <ext/numeric_traits.h>
-
 #if defined(_GLIBCXX_INCLUDE_AS_CXX0X)
 #  include <tr1_impl/functional_hash.h>
 #else

diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional
index 6b0ca04bece025dc9e5c30e0fafedf1bf1838bf7..ca5c2eaf7ce7c1206cd93a59ec13ac21dde43071 100644 (file)
--- a/libstdc++-v3/include/std/functional
+++ b/libstdc++-v3/include/std/functional
@@ -64,6 +64,7 @@
 #  include <type_traits>
 #  include <bits/stringfwd.h>
 #  include <bits/functional_hash.h>
+#  include <ext/type_traits.h>
 #  if defined(_GLIBCXX_INCLUDE_AS_CXX0X)
 #    include <tr1_impl/functional>
 #  else

diff --git a/libstdc++-v3/include/tr1/functional b/libstdc++-v3/include/tr1/functional
index fa3dc6537c2cf209ac7770b5accb4c1f35b4aca1..e5b5f3c5616233ce35edad8bf6f8a07c35c53d99 100644 (file)
--- a/libstdc++-v3/include/tr1/functional
+++ b/libstdc++-v3/include/tr1/functional
@@ -49,6 +49,7 @@
 #include <tr1/type_traits>
 #include <bits/stringfwd.h>
 #include <tr1/functional_hash.h>
+#include <ext/type_traits.h>
 
 #if defined(_GLIBCXX_INCLUDE_AS_TR1)
 #  include <tr1_impl/functional>

diff --git a/libstdc++-v3/include/tr1/functional_hash.h b/libstdc++-v3/include/tr1/functional_hash.h
index 946c966f3d3df84505a0e8797cd99dfb66b48f7b..a41b232d67b9b2d8dbac921396ea825192e53c81 100644 (file)
--- a/libstdc++-v3/include/tr1/functional_hash.h
+++ b/libstdc++-v3/include/tr1/functional_hash.h
@@ -41,8 +41,6 @@
 #  error TR1 header cannot be included from C++0x header
 #endif
 
-#include <ext/numeric_traits.h>
-
 #if defined(_GLIBCXX_INCLUDE_AS_TR1)
 #  include <tr1_impl/functional_hash.h>
 #else