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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@130314 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4de61c7..52e21d8 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,12 @@
 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
        (hash<long double>::operator()(long double)): Only declare.
        * src/hash.cc: Define here.

diff --git a/libstdc++-v3/include/bits/functional_hash.h b/libstdc++-v3/include/bits/functional_hash.h
index 7b0d81c..630a084 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 6b0ca04..ca5c2ea 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 fa3dc65..e5b5f3c 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 946c966..a41b232 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