From patchwork Tue Aug 17 13:16:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 61892 Return-Path: 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 2E35FB6EF2 for ; Tue, 17 Aug 2010 23:24:15 +1000 (EST) Received: (qmail 16301 invoked by alias); 17 Aug 2010 13:16:53 -0000 Received: (qmail 16107 invoked by uid 22791); 17 Aug 2010 13:16:51 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from vsmtp14.tin.it (HELO vsmtp14.tin.it) (212.216.176.118) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 17 Aug 2010 13:16:45 +0000 Received: from [192.168.0.4] (79.33.220.54) by vsmtp14.tin.it (8.5.113) id 4BCE30370A2CFF38; Tue, 17 Aug 2010 15:16:42 +0200 Message-ID: <4C6A8BB9.1040603@oracle.com> Date: Tue, 17 Aug 2010 15:16:41 +0200 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.11) Gecko/20100714 SUSE/3.0.6 Thunderbird/3.0.6 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: libstdc++ Subject: Re: [v3] libstdc++/45300 References: <4C698B70.2070901@oracle.com> In-Reply-To: <4C698B70.2070901@oracle.com> X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org ... forgot these bits. Committed to mainline. Paolo. ///////////////////////// 2010-08-17 Paolo Carlini PR libstdc++/45300 * include/c_std/cwchar: Replace 'restrict' -> '__restrict'. * include/c_global/cwchar: Likewise. Index: include/c_std/cwchar =================================================================== --- include/c_std/cwchar (revision 163302) +++ include/c_std/cwchar (working copy) @@ -238,16 +238,16 @@ #if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC extern "C" long double - (wcstold)(const wchar_t * restrict, wchar_t ** restrict) throw (); + (wcstold)(const wchar_t * __restrict, wchar_t ** __restrict) throw (); #endif #if !_GLIBCXX_USE_C99_DYNAMIC using ::wcstold; #endif #if _GLIBCXX_USE_C99_LONG_LONG_CHECK || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC extern "C" long long int - (wcstoll)(const wchar_t * restrict, wchar_t ** restrict, int) throw (); + (wcstoll)(const wchar_t * __restrict, wchar_t ** __restrict, int) throw (); extern "C" unsigned long long int - (wcstoull)(const wchar_t * restrict, wchar_t ** restrict, int) throw (); + (wcstoull)(const wchar_t * __restrict, wchar_t ** __restrict, int) throw (); #endif #if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC using ::wcstoll; Index: include/c_global/cwchar =================================================================== --- include/c_global/cwchar (revision 163302) +++ include/c_global/cwchar (working copy) @@ -242,16 +242,16 @@ #if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC extern "C" long double - (wcstold)(const wchar_t * restrict, wchar_t ** restrict) throw (); + (wcstold)(const wchar_t * __restrict, wchar_t ** __restrict) throw (); #endif #if !_GLIBCXX_USE_C99_DYNAMIC using ::wcstold; #endif #if _GLIBCXX_USE_C99_LONG_LONG_CHECK || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC extern "C" long long int - (wcstoll)(const wchar_t * restrict, wchar_t ** restrict, int) throw (); + (wcstoll)(const wchar_t * __restrict, wchar_t ** __restrict, int) throw (); extern "C" unsigned long long int - (wcstoull)(const wchar_t * restrict, wchar_t ** restrict, int) throw (); + (wcstoull)(const wchar_t * __restrict, wchar_t ** __restrict, int) throw (); #endif #if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC using ::wcstoll;