From patchwork Tue Jul 3 21:05:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 938891 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-480964-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="p7mDY5h6"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41KxVT3gm9z9s5K for ; Wed, 4 Jul 2018 07:05:52 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=lgPOdOn8xk5Vh2f/u0icvw5zdyaw9DqjP1/db26n6XF3jP1D87m8g UoaqIs5JTXWmdqymRdl6Z2bpAO7b5BB+ThP8V/aXpWs4SBQBvu6g+bFMJvdDq+kN sSoFkdJYw3placS8UQuf7b6gvsNZoM3SFSQcI6/Bno+C8TbtboIPuk= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=iwBPdaoH3BPOpBPwH8HZVU+PV/0=; b=p7mDY5h6kBxSzEo+LGEF u4A6Otvv+cSb1tm3X/MSX9t4Mm1vTbCzuDWAwbfBBpyIEpIFkGax40MBL7bbRhkU LkJn4EvBfOvjuDMRyXIXGBX81Dj3GlTj+YtrxMe3YZ4sUwALhZoiSDDWa6oM3LRK g6GFBOb+u0Mm0sD/OPxonkE= Received: (qmail 63879 invoked by alias); 3 Jul 2018 21:05:37 -0000 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 Received: (qmail 63854 invoked by uid 89); 3 Jul 2018 21:05:36 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx3-rdu2.redhat.com (HELO mx1.redhat.com) (66.187.233.73) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 03 Jul 2018 21:05:35 +0000 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 57888AB407; Tue, 3 Jul 2018 21:05:34 +0000 (UTC) Received: from localhost (unknown [10.33.36.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id 151111C5B8; Tue, 3 Jul 2018 21:05:33 +0000 (UTC) Date: Tue, 3 Jul 2018 22:05:33 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH] Remove redundant #if conditional Message-ID: <20180703210533.GA14059@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.9.2 (2017-12-15) The whole file is guarded by the same check already. * include/bits/alloc_traits.h: Remove redundant preprocessor condition. Tested powerpc64le-linux, committed to trunk. commit 76fd352d2bccd2a7399f6693cb5c7a8e9c65274b Author: Jonathan Wakely Date: Tue Jul 3 00:26:07 2018 +0100 Remove redundant #if conditional The whole file is guarded by the same check already. * include/bits/alloc_traits.h: Remove redundant preprocessor condition. diff --git a/libstdc++-v3/include/bits/alloc_traits.h b/libstdc++-v3/include/bits/alloc_traits.h index eee9d8502e4..742fdd0447d 100644 --- a/libstdc++-v3/include/bits/alloc_traits.h +++ b/libstdc++-v3/include/bits/alloc_traits.h @@ -598,7 +598,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : is_copy_constructible<_Tp> { }; -#if __cplusplus >= 201103L // Trait to detect Allocator-like types. template struct __is_allocator : false_type { }; @@ -612,10 +611,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template using _RequireAllocator = typename enable_if<__is_allocator<_Alloc>::value, _Alloc>::type; -#endif _GLIBCXX_END_NAMESPACE_VERSION } // namespace std - -#endif -#endif +#endif // C++11 +#endif // _ALLOC_TRAITS_H