2009-08-13 Benjamin Kosnik <bkoz@redhat.com>

	* src/compatibility-ldbl.cc: Include tr1/functional.

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bb2cd4a..a4576d4 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-13  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * src/compatibility-ldbl.cc: Include tr1/functional.
+

 2009-08-12  Benjamin Kosnik  <bkoz@redhat.com>
 
        * src/compatibility-ldbl.cc: Add explicit namespace scope.
 2009-08-12  Benjamin Kosnik  <bkoz@redhat.com>
 
        * src/compatibility-ldbl.cc: Add explicit namespace scope.

diff --git a/libstdc++-v3/src/compatibility-ldbl.cc b/libstdc++-v3/src/compatibility-ldbl.cc
index 79917d9..b3db735 100644 (file)
--- a/libstdc++-v3/src/compatibility-ldbl.cc
+++ b/libstdc++-v3/src/compatibility-ldbl.cc
@@ -24,6 +24,7 @@
 // <http://www.gnu.org/licenses/>.
 
 #include <locale>
 // <http://www.gnu.org/licenses/>.
 
 #include <locale>

+#include <tr1/functional>

 
 #ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
 
 
 #ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
 


@@ -31,8 +32,6 @@
 #error "compatibility-ldbl.cc must be compiled with -mlong-double-64"
 #endif
 
 #error "compatibility-ldbl.cc must be compiled with -mlong-double-64"
 #endif
 

-#define _GLIBCXX_LONG_DOUBLE_COMPAT_IMPL
-

 namespace std
 {
 #define C char
 namespace std
 {
 #define C char


@@ -67,7 +66,9 @@ namespace std
 #endif
 }
 
 #endif
 }
 

-// For std::tr1::hash<long double>::operator ()
+// For std::tr1::hash<long double>::operator()
+#define _GLIBCXX_LONG_DOUBLE_COMPAT_IMPL
+

 namespace std
 {
   namespace tr1 
 namespace std
 {
   namespace tr1 


@@ -76,8 +77,8 @@ namespace std
   }
 }
 
   }
 }
 

-// std::tr1::hash<long double>::operator ()
-// and std::hash<long double>::operator ()
+// std::tr1::hash<long double>::operator()
+// and std::hash<long double>::operator()

 // are the same, no need to duplicate them.
 extern "C" void _ZNKSt4hashIeEclEe (void)
   __attribute__((alias ("_ZNKSt3tr14hashIeEclEe")));
 // are the same, no need to duplicate them.
 extern "C" void _ZNKSt4hashIeEclEe (void)
   __attribute__((alias ("_ZNKSt3tr14hashIeEclEe")));