From f22aa574dc04c5a06f068b1793fc092071661a18 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Tue, 20 Nov 2007 14:06:53 +0000 Subject: [PATCH] functional_hash.h: Do not include ext/numeric_traits.h. 2007-11-20 Paolo Carlini * 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 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/include/bits/functional_hash.h | 2 -- libstdc++-v3/include/std/functional | 1 + libstdc++-v3/include/tr1/functional | 1 + libstdc++-v3/include/tr1/functional_hash.h | 2 -- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4de61c71670..52e21d8005d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2007-11-20 Paolo Carlini + + * 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 * 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 7b0d81cc6e8..630a0841208 100644 --- 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 - #if defined(_GLIBCXX_INCLUDE_AS_CXX0X) # include #else diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 6b0ca04bece..ca5c2eaf7ce 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -64,6 +64,7 @@ # include # include # include +# include # if defined(_GLIBCXX_INCLUDE_AS_CXX0X) # include # else diff --git a/libstdc++-v3/include/tr1/functional b/libstdc++-v3/include/tr1/functional index fa3dc6537c2..e5b5f3c5616 100644 --- a/libstdc++-v3/include/tr1/functional +++ b/libstdc++-v3/include/tr1/functional @@ -49,6 +49,7 @@ #include #include #include +#include #if defined(_GLIBCXX_INCLUDE_AS_TR1) # include diff --git a/libstdc++-v3/include/tr1/functional_hash.h b/libstdc++-v3/include/tr1/functional_hash.h index 946c966f3d3..a41b232d67b 100644 --- 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 - #if defined(_GLIBCXX_INCLUDE_AS_TR1) # include #else -- 2.30.2