aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Peter Nilsson <hp@axis.com>2005-02-19 15:33:59 +0000
committerHans-Peter Nilsson <hp@gcc.gnu.org>2005-02-19 15:33:59 +0000
commit967f056dfd201d9e6ce4b67302d5e9660ff2d583 (patch)
tree63ba8ab9c3750d05f3279a097cfff00380ac3b24
parent09312c293050b2800e51d68ccc004a3dd5d83fd9 (diff)
downloadgcc-967f056dfd201d9e6ce4b67302d5e9660ff2d583.zip
gcc-967f056dfd201d9e6ce4b67302d5e9660ff2d583.tar.gz
gcc-967f056dfd201d9e6ce4b67302d5e9660ff2d583.tar.bz2
re PR libstdc++/20071 (newlib target testsuite regressions: libstdc++: tr1/6_containers/tuple)
PR libstdc++/20071 * include/tr1/functional (hash<std::wstring>): Wrap in #ifdef _GLIBCXX_USE_WCHAR_T. From-SVN: r95279
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/include/tr1/functional2
2 files changed, 8 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9b27b0b..84299a1 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-19 Hans-Peter Nilsson <hp@axis.com>
+
+ PR libstdc++/20071
+ * include/tr1/functional (hash<std::wstring>): Wrap in #ifdef
+ _GLIBCXX_USE_WCHAR_T.
+
2005-02-18 Richard Henderson <rth@redhat.com>
PR libstdc++/10606
diff --git a/libstdc++-v3/include/tr1/functional b/libstdc++-v3/include/tr1/functional
index d53c99a..d3d681c 100644
--- a/libstdc++-v3/include/tr1/functional
+++ b/libstdc++-v3/include/tr1/functional
@@ -135,6 +135,7 @@ namespace tr1
}
};
+#ifdef _GLIBCXX_USE_WCHAR_T
template <>
struct hash<std::wstring>
{
@@ -146,6 +147,7 @@ namespace tr1
return result;
}
};
+#endif
}
}