re PR libstdc++/47321 (FAIL: 21_strings/basic_string/requirements/typedefs.cc (test...

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 631bcb9014d89c8893bf42a9d3b4a2ad4122342d..b5aeb9929d1c36ebb6708b9108148cab7d15c91b 100644 (file)
--- 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 aa0ac08742b9fbbc55c1ed5b8dba3ca8ee8186c9..240ae1fd4fe6ba6da93ae9ebb014eccce0055685 100644 (file)
--- 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