aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbkoz <>2009-08-14 00:45:36 +0000
committerbkoz <>2009-08-14 00:45:36 +0000
commit1839d26bec396238d86acf6590d87ec2b83de2bd (patch)
tree0194e54069edee38e4d8ebdd78f609d3f9172233
parentbd17ee4f875090418f19166a53f71c135007c183 (diff)
2009-08-13 Benjamin Kosnik <bkoz@redhat.com>
* src/compatibility-ldbl.cc: Include tr1/functional.
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/src/compatibility-ldbl.cc11
2 files changed, 10 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bb2cd4a05d3..a4576d4f8ad 100644
--- 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.
diff --git a/libstdc++-v3/src/compatibility-ldbl.cc b/libstdc++-v3/src/compatibility-ldbl.cc
index 79917d9f1cc..b3db73592e4 100644
--- 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>
+#include <tr1/functional>
#ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
@@ -31,8 +32,6 @@
#error "compatibility-ldbl.cc must be compiled with -mlong-double-64"
#endif
-#define _GLIBCXX_LONG_DOUBLE_COMPAT_IMPL
-
namespace std
{
#define C char
@@ -67,7 +66,9 @@ namespace std
#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
@@ -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")));