~ruther/guix-local

7b66b41ce5cee48b14eb6cce3bb4b26f5b058652 — wrobell 1 year, 5 months ago 3f695db
daemon: Fix build failure with gcc@15.

* nix/libstore/build.cc (CompareGoalPtrs::operator): Add const keyword.
* nix/libstore/store-api.hh: Add missing include for uint64_t.

Change-Id: I56368da9eb10dc376f7e6eeae6a61746bb36c9cf
Signed-off-by: Andreas Enge <andreas@enge.fr>
2 files changed, 3 insertions(+), 2 deletions(-)

M nix/libstore/build.cc
M nix/libstore/store-api.hh
M nix/libstore/build.cc => nix/libstore/build.cc +2 -2
@@ 103,7 103,7 @@ typedef std::shared_ptr<Goal> GoalPtr;
typedef std::weak_ptr<Goal> WeakGoalPtr;

struct CompareGoalPtrs {
    bool operator() (const GoalPtr & a, const GoalPtr & b);
    bool operator() (const GoalPtr & a, const GoalPtr & b) const;
};

/* Set of goals. */


@@ 201,7 201,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;

M nix/libstore/store-api.hh => nix/libstore/store-api.hh +1 -0
@@ 4,6 4,7 @@
#include "serialise.hh"

#include <string>
#include <cstdint>
#include <map>
#include <memory>