From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by sourceware.org (Postfix) with ESMTPS id 1D9A73858428 for ; Tue, 6 Jun 2023 08:52:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1D9A73858428 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=flex--maennich.bounces.google.com Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-56991d8e2b0so51505377b3.2 for ; Tue, 06 Jun 2023 01:52:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1686041538; x=1688633538; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=lGV6XSWvmBno2hjFEuEtThr9+k3fSTLN2JFgemiNYQ4=; b=dJS2beNY0zRsLrgU8dyQEOdk5/Gl9qHiI6wGA65uWd6W6XM4R5jjsSk6umu27twagR YUhYqLdoi0AOYSyJ7VrsIloeDlMdd2I+Pjfhf9QWpqVKcRdUO0ojYLDAEtwk9h5HFCzA nYWa/m4WCk/+J4nVO9zX9JQqggcMetzpfDa1SrDtZvsl2yNGwX7AtzM5Je65GA30HcvS bhG053GRXK/yHz+WKzRoeKZSP4VwPIDcXC9mOs7MhVXFqzGpT5ReYivBm/8UZKIPVHDx ojFrhN2Umc/BRqzb7+tJnNMlckzxFSm2U/UgP9TirxWcxVPzRyxhcggQpHl4Wjc62cKa N8sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686041538; x=1688633538; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=lGV6XSWvmBno2hjFEuEtThr9+k3fSTLN2JFgemiNYQ4=; b=ZptDwS9ht62Z5dZfSZB6pj7k4FhLE8u4iJYnHmCKC0UOwtGHI1AzfbCfi4fDbv532u x3oohsV8/yxuAkS8RH1BVrS4d5fACfEzRwcHPKS6op/SWudXwqygAiG85niVo1oxJnIq QMPMhNnlqtgaJstQ+3uWPgTkFQGm/D2wgnfPhSSKho4pa5BFB+96lTKBgZmG2K1eTZIO 0JeIWv+WtfAOdooE+wrkeXOw8ASqSaY7az+QmBhEkatpzDE/bw+5nUtlyTiE+p6dufF0 86E69uLaI91WxOz0BMLy6pvGmum31Dr63FIausmTs3gQQcXtiCGyazgYqWrs29Gbuuz1 RQAw== X-Gm-Message-State: AC+VfDwfXSpfw1+FBWPjASVFKOzHOs3v0SLnDXr6TcqsnczSwy03mZeB Xbtkw2ZYBVV81k03+EPYVSGN4+a/OBKcNHym3vm4Out7mAfoeslkErD5DyGlv0iqAeGUIEV5ixX r4oOxV+JjT3zVSAEctxNXmF/vmVYXIRGaKQZNhUR4DMa5+9o4mzimhg8aG/yaNlEt30/i1bg= X-Google-Smtp-Source: ACHHUZ6+ewW0JLi1b3ibMlH4NTx72oXKXTfc01UwBFjav/oDR81zuG2JJLnFhv2+y3q+0FE2LwMFJH86nZx/Qw== X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:209:65d7:da0e:bd15:3540]) (user=maennich job=sendgmr) by 2002:a81:8d0d:0:b0:569:c5f8:918d with SMTP id d13-20020a818d0d000000b00569c5f8918dmr657861ywg.3.1686041538722; Tue, 06 Jun 2023 01:52:18 -0700 (PDT) Date: Tue, 6 Jun 2023 09:51:34 +0100 In-Reply-To: <20230606085132.1894137-3-maennich@google.com> Message-Id: <20230606085132.1894137-4-maennich@google.com> Mime-Version: 1.0 References: <20230606085132.1894137-3-maennich@google.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog Subject: [PATCH 2/2] symtab reader: fix symtab iterator to support C++20 From: "=?UTF-8?q?Matthias=20M=C3=A4nnich?=" To: libabigail@sourceware.org Cc: dodji@seketeli.org, gprocida@google.com, kernel-team@android.com, maennich@google.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-21.7 required=5.0 tests=BAYES_00,DKIMWL_WL_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_NUMSUBJECT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Matthias Maennich Inheriting from std::vector::iterator causes the type to advertise itself as a contiguous iterator. This causes a compilation error in newer versions of libc++ that try to use contiguous-iterator-specific optimizations in those situations. Fixed thus by explicitly specifying the interator_concept tag. * abg-symtab-reader.h (symtab_iterator): Specify iterator_concept as forward_iterator to support C++20 compilation. Signed-off-by: Matthias Maennich --- src/abg-symtab-reader.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/abg-symtab-reader.h b/src/abg-symtab-reader.h index 7477cca5a6f0..888a56822224 100644 --- a/src/abg-symtab-reader.h +++ b/src/abg-symtab-reader.h @@ -115,6 +115,7 @@ public: using pointer = base_iterator::pointer; using difference_type = base_iterator::difference_type; using iterator_category = std::forward_iterator_tag; + using iterator_concept = std::forward_iterator_tag; /// Construct the iterator based on a pair of underlying iterators and a /// symtab_filter object. Immediately fast forward to the next element that -- 2.41.0.rc0.172.g3f132b7071-goog