From patchwork Sat Mar 16 20:01:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 228251 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 51C712C00B7 for ; Sun, 17 Mar 2013 07:02:10 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1364068932; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Date:Message-ID:Subject:From:To: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=ybBZo8i p0EslDkoX006dYikrPqY=; b=rGU91VKjkSEK+LLBEg6Bj+4jOF6aFv1pV3mgTVK xbbP2swG6KtxFcX3KiRL1xcI6TTLAN6Xi+bX9f/kY78/f6EnHqvhETZ0h+fH44C3 jzwPrg7AbUzzQZ0C7OsSP3bFGkraAcIlE8epORxczxNwv1rXT0/sdjuDqBuuiLVB IHPM= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:MIME-Version:X-Received:Received:Date:Message-ID:Subject:From:To:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=Rc1G1hDdDIYVrYlZJ2/CEamYTVbv0aZebbSpE76fNUGHcBIrRCymCQXm+sJ2R9 zq3sU20SjhvlHKoCWPBFSK2cOcB/qjgq+H8iMxpOr55rAaqo3B/Df5WiR5txtYJW RKnqJPXe8HLnRDxnSNwBTWzjFMEO5fpTszJiOKfvgkoTI=; Received: (qmail 28364 invoked by alias); 16 Mar 2013 20:01:40 -0000 Received: (qmail 28348 invoked by uid 22791); 16 Mar 2013 20:01:38 -0000 X-SWARE-Spam-Status: No, hits=-4.6 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, KHOP_RCVD_TRUST, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-lb0-f173.google.com (HELO mail-lb0-f173.google.com) (209.85.217.173) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 16 Mar 2013 20:01:33 +0000 Received: by mail-lb0-f173.google.com with SMTP id gf7so3681932lbb.18 for ; Sat, 16 Mar 2013 13:01:31 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.152.28.3 with SMTP id x3mr8638850lag.27.1363464091214; Sat, 16 Mar 2013 13:01:31 -0700 (PDT) Received: by 10.112.31.169 with HTTP; Sat, 16 Mar 2013 13:01:31 -0700 (PDT) Date: Sat, 16 Mar 2013 20:01:31 +0000 Message-ID: Subject: Fix libstdc++/56468 From: Jonathan Wakely To: "libstdc++" , gcc-patches 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 This fixes a problem using libstdc++ with clang, which doesn't implicitly declare std::type_info as G++ does. PR libstdc++/56468 * libsupc++/exception_ptr.h (type_info): Declare. Tested x86_64-linux, committed to trunk. This should be safe for 4.7.3 and 4.8.1 too. commit 9bb199ddc55b1115a42ee98de057e101045218a8 Author: Jonathan Wakely Date: Sat Mar 16 18:58:20 2013 +0000 PR libstdc++/56468 * libsupc++/exception_ptr.h (type_info): Declare. diff --git a/libstdc++-v3/libsupc++/exception_ptr.h b/libstdc++-v3/libsupc++/exception_ptr.h index 7a535f2..bbf8f85 100644 --- a/libstdc++-v3/libsupc++/exception_ptr.h +++ b/libstdc++-v3/libsupc++/exception_ptr.h @@ -44,6 +44,8 @@ extern "C++" { namespace std { + class type_info; + /** * @addtogroup exceptions * @{ @@ -141,7 +143,7 @@ namespace std operator==(const exception_ptr&, const exception_ptr&) _GLIBCXX_USE_NOEXCEPT __attribute__ ((__pure__)); - const class type_info* + const class std::type_info* __cxa_exception_type() const _GLIBCXX_USE_NOEXCEPT __attribute__ ((__pure__)); };