From patchwork Wed May 14 07:39:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dariqq X-Patchwork-Id: 42589 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 869C627BC4B; Wed, 14 May 2025 08:42:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F3FFD27BC49 for ; Wed, 14 May 2025 08:42:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uF6kh-000395-NI; Wed, 14 May 2025 03:42:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uF6ke-0002xj-6I for guix-patches@gnu.org; Wed, 14 May 2025 03:42:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uF6kd-0008EM-OX for guix-patches@gnu.org; Wed, 14 May 2025 03:42:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=Uqrx1M6jy52SJAYG8KacYCaM1TO2jSspGCpHcCP9Oio=; b=jOKFJykuRCLwhfhzRtflfLmj56ntB6MviPiz9Bvote433+z9U9GnDnRj1xI5sR1bgxjwOIAVeQw+JQpToH2huZS+1udEfSC6ICncvZKaxeol6gbFk4ducwujCZ6GnpP+/KYLF88C9h0VUcNCtAb7tBbHAUgRfqYsQX0XUPVh02uaHGO2N0EogQL02m2BOIaNtfsmw5QKDa/WewsD1xiD7FZscmBnRndlRsfAawfeMfNx2kP+TN/krFWk7r78bGNE4O5ylj+BxTBWxeVBNlnL8DdMscDCUffXAdSEItu2hU4/cVpDryvrPWY0vy5cCFZrVvtzLwMfBGHgzpqRUAfkyw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uF6kd-0000gz-98 for guix-patches@gnu.org; Wed, 14 May 2025 03:42:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78419] [PATCH] daemon: Add const qualifier to comparison call operator. Resent-From: Dariqq Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 May 2025 07:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78419 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78419@debbugs.gnu.org Cc: Dariqq X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17472085202631 (code B ref -1); Wed, 14 May 2025 07:42:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 May 2025 07:42:00 +0000 Received: from localhost ([127.0.0.1]:38574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uF6ka-0000gL-1P for submit@debbugs.gnu.org; Wed, 14 May 2025 03:42:00 -0400 Received: from lists.gnu.org ([2001:470:142::17]:41678) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uF6kW-0000fK-Dr for submit@debbugs.gnu.org; Wed, 14 May 2025 03:41:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uF6k4-0001sY-BW for guix-patches@gnu.org; Wed, 14 May 2025 03:41:31 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uF6k0-0008B4-Ot for guix-patches@gnu.org; Wed, 14 May 2025 03:41:27 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 0B1C9240027 for ; Wed, 14 May 2025 09:41:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1747208480; bh=Aq+TxvfHCqroPWsZeVogv1IVR2RnM5cESmIPhZ6kvkQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=cXsrs+YU75uM753dtc9izsATT1uhbsQESX4l/yfLWAF8Roec+oPyz9E0EsKkUCjOy DnA65HvZXZGEQRGrRkm4wuzmVLfcYjE2qUhG6/8u4ViCxn9cjvmA7bNC1oTm1NV6n7 U7bARmJ9ZZlsaVFSjOsRy7GgsaG6GqCzULSy8USzDoocYX9wvyo1vVgw/rq+t9kach TCkdkq0wr8WtC25mtayFX99q5NBmTOAR1Kuz4UHspxt8R5LlLLmDYrcu2MWDm4dAjy 1LmZ8HmMtqzVqOq2q9lu0dVId24aDZbxoguBN2o4RaOAmRpOuHNglLuWIVUpUMiGMz Kfn06SUvrVM9A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Zy4z33STfz9rxg; Wed, 14 May 2025 09:41:19 +0200 (CEST) From: Dariqq Date: Wed, 14 May 2025 07:39:26 +0000 Message-ID: <5d3bca40c80a4d4db2579a56dc0dde1aafce8976.1747208366.git.dariqq@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.65; envelope-from=dariqq@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * nix/libstore/build.cc (CompareGoalPtrs::operator()): Add const qualifier. Change-Id: Ieccea071db53715ef808fe59c69429fe228b5f77 --- Hello, I had to add this patch to build guix on Fedora 42 and got a template error without it. It corresponds to this commit in nix from 2017: https://github.com/NixOS/nix/commit/00e0c416ffccf6edb63fe7f4b01422915ff12f86 nix/libstore/build.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: 5f5d84beccc180f1b51474c0e47eb6e0d0c9175f diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index a1f39d9a8bf..f80f69f2bb6 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -94,7 +94,7 @@ typedef std::shared_ptr GoalPtr; typedef std::weak_ptr WeakGoalPtr; struct CompareGoalPtrs { - bool operator() (const GoalPtr & a, const GoalPtr & b); + bool operator() (const GoalPtr & a, const GoalPtr & b) const; }; /* Set of goals. */ @@ -192,7 +192,7 @@ protected: }; -bool CompareGoalPtrs::operator() (const GoalPtr & a, const GoalPtr & b) { +bool CompareGoalPtrs::operator() (const GoalPtr & a, const GoalPtr & b) const{ string s1 = a->key(); string s2 = b->key(); return s1 < s2;