From patchwork Mon Jan 17 02:34:26 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: 79113
Return-Path: 
 <gcc-patches-return-283080-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 EEB62B6EE9
	for <incoming@patchwork.ozlabs.org>;
	Mon, 17 Jan 2011 13:34:43 +1100 (EST)
Received: (qmail 20218 invoked by alias); 17 Jan 2011 02:34:39 -0000
Received: (qmail 19974 invoked by uid 22791); 17 Jan 2011 02:34:38 -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;
	Mon, 17 Jan 2011 02:34:30 +0000
Received: from [192.168.0.4] (79.53.13.186) by vsmtp3.tin.it (8.5.132) id
	4CFDF4AF02AB2C1E; Mon, 17 Jan 2011 03:34:26 +0100
Message-ID: <4D33AAB2.9010609@oracle.com>
Date: Mon, 17 Jan 2011 03:34:26 +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++/47323
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,

committed to mainline.

Paolo.

/////////////////////
2011-01-16  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/47323
	* testsuite/28_regex/08_basic_regex/requirements/constexpr_data.cc:
	Only test wregex when _GLIBCXX_USE_WCHAR_T is defined.

Index: testsuite/28_regex/08_basic_regex/requirements/constexpr_data.cc
===================================================================
--- testsuite/28_regex/08_basic_regex/requirements/constexpr_data.cc	(revision 168886)
+++ testsuite/28_regex/08_basic_regex/requirements/constexpr_data.cc	(working copy)
@@ -1,7 +1,7 @@
 // { dg-do compile }
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2010 Free Software Foundation, Inc.
+// Copyright (C) 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
@@ -66,6 +66,8 @@
 {
   __gnu_test::constexpr_member_data test;
   test.operator()<std::regex>();
+#ifdef _GLIBCXX_USE_WCHAR_T
   test.operator()<std::wregex>();
+#endif
   return 0;
 }