From 85b1217ad1919013548c2a09373b69551cc09aca Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sun, 16 Jan 2011 20:42:57 +0000 Subject: [PATCH] re PR libstdc++/47321 (FAIL: 21_strings/basic_string/requirements/typedefs.cc (test for excess errors)) 2011-01-16 Paolo Carlini 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 --- libstdc++-v3/ChangeLog | 6 ++++++ .../21_strings/basic_string/requirements/typedefs.cc | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) 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 + + 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 * 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 t1; +#ifdef _GLIBCXX_USE_WCHAR_T __gnu_test::types t2; +#endif -- 2.30.2