summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>2005-02-24 21:32:53 +0000
committerbkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>2005-02-24 21:32:53 +0000
commit078bf4ea08db9ff0cfa6f277572f1af69bc0dc13 (patch)
treeec59c0cae1198bff6b41ca77d6c1cf8c6f1772e8
parent38854b21a7806199c404593ed84903597baf4c62 (diff)
downloadgcc-078bf4ea08db9ff0cfa6f277572f1af69bc0dc13.tar.gz
2005-02-24 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/tr1/6_containers/unordered/instantiate/hash.cc: Guard wchar_t use with _GLIBCXX_USE_WCHAR_T. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95514 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/testsuite/tr1/6_containers/unordered/instantiate/hash.cc5
2 files changed, 9 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 76757a8a799..9d342b40d4f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2005-02-24 Benjamin Kosnik <bkoz@redhat.com>
+ * testsuite/tr1/6_containers/unordered/instantiate/hash.cc: Guard
+ wchar_t use with _GLIBCXX_USE_WCHAR_T.
+
+2005-02-24 Benjamin Kosnik <bkoz@redhat.com>
+
* include/std/std_complex.h: _GLIBCXX_USE_C99_COMPLEX_MATH to
_GLIBCXX_USE_C99_COMPLEX.
* acinclude.m4: Same.
diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered/instantiate/hash.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered/instantiate/hash.cc
index 05838c5bd15..224ee65cf4c 100644
--- a/libstdc++-v3/testsuite/tr1/6_containers/unordered/instantiate/hash.cc
+++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered/instantiate/hash.cc
@@ -35,7 +35,6 @@ int main()
hash<char> hc;
hash<signed char> hsc;
hash<unsigned char> huc;
- hash<wchar_t> hw;
hash<short> hs;
hash<int> hi;
hash<long> hl;
@@ -47,5 +46,9 @@ int main()
hash<long double> hld;
hash<void*> hp;
hash<std::string> hstr;
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+ hash<wchar_t> hw;
hash<std::wstring> hwstr;
+#endif
}