From patchwork Sun Jan 16 20:44:27 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Paolo Carlini <paolo.carlini@oracle.com>
X-Patchwork-Id: 79099
Return-Path: 
 <gcc-patches-return-283056-incoming=patchwork.ozlabs.org@gcc.gnu.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from sourceware.org (server1.sourceware.org [209.132.180.131])
	by ozlabs.org (Postfix) with SMTP id 0EE7CB6EE9
	for <incoming@patchwork.ozlabs.org>;
	Mon, 17 Jan 2011 07:44:37 +1100 (EST)
Received: (qmail 13371 invoked by alias); 16 Jan 2011 20:44:35 -0000
Received: (qmail 13356 invoked by uid 22791); 16 Jan 2011 20:44:35 -0000
X-SWARE-Spam-Status: No, hits=-1.9 required=5.0	tests=AWL, BAYES_00,
	RCVD_IN_DNSWL_NONE
X-Spam-Check-By: sourceware.org
Received: from vsmtp3.tin.it (HELO vsmtp3.tin.it) (212.216.176.223) by
	sourceware.org (qpsmtpd/0.43rc1) with ESMTP;
	Sun, 16 Jan 2011 20:44:30 +0000
Received: from [192.168.0.4] (79.53.13.186) by vsmtp3.tin.it (8.5.132) id
	4CFDF4AF02A85FFC; Sun, 16 Jan 2011 21:44:27 +0100
Message-ID: <4D3358AB.9030307@oracle.com>
Date: Sun, 16 Jan 2011 21:44:27 +0100
From: Paolo Carlini <paolo.carlini@oracle.com>
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US;
	rv:1.9.1.16) Gecko/20101125 SUSE/3.0.11 Thunderbird/3.0.11
MIME-Version: 1.0
To: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org>
CC: libstdc++ <libstdc++@gcc.gnu.org>
Subject: [v3] libstdc++/47321
X-IsSubscribed: yes
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org

Hi,

sanity checked on x86_64-linux, committed.

Paolo.

///////////////////////
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.

Index: testsuite/21_strings/basic_string/requirements/typedefs.cc
===================================================================
--- testsuite/21_strings/basic_string/requirements/typedefs.cc	(revision 168831)
+++ testsuite/21_strings/basic_string/requirements/typedefs.cc	(working copy)
@@ -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