summaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2011-01-16 20:42:57 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2011-01-16 20:42:57 +0000
commit85b1217ad1919013548c2a09373b69551cc09aca (patch)
treee683762c9eedfcd9e295e85714da6f4c995f2d03 /libstdc++-v3
parentf1d4ab26bcbb5ae3f28b4eb927d1d53f8e25a84f (diff)
downloadgcc-85b1217ad1919013548c2a09373b69551cc09aca.tar.gz
re PR libstdc++/47321 (FAIL: 21_strings/basic_string/requirements/typedefs.cc (test for excess errors))
2011-01-16 Paolo Carlini <paolo.carlini@oracle.com> PR libstdc++/47321 * testsuite/21_strings/basic_string/requirements/typedefs.cc: Only test std::wstring when _GLIBCXX_USE_WCHAR_T is defined. From-SVN: r168871
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/testsuite/21_strings/basic_string/requirements/typedefs.cc4
2 files changed, 9 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 631bcb9014d..b5aeb9929d1 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-16 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR libstdc++/47321
+ * testsuite/21_strings/basic_string/requirements/typedefs.cc:
+ Only test std::wstring when _GLIBCXX_USE_WCHAR_T is defined.
+
2011-01-16 François Dumont <francois.cppdevs@free.fr>
* testsuite/23_containers/forward_list/debug/erase_after1_neg.cc: Move
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/typedefs.cc b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/typedefs.cc
index aa0ac08742b..240ae1fd4fe 100644
--- a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/typedefs.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/typedefs.cc
@@ -1,7 +1,7 @@
// { dg-options "-std=gnu++0x" }
// { dg-do compile }
-// Copyright (C) 2009 Free Software Foundation, Inc.
+// Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -23,4 +23,6 @@
// Check container for required typedefs.
__gnu_test::types<std::string> t1;
+#ifdef _GLIBCXX_USE_WCHAR_T
__gnu_test::types<std::wstring> t2;
+#endif