From 5dea0622d1d673bf60f47781c33f343ce9979a7f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 4 May 2005 16:31:49 +0000 Subject: [PATCH] * Idem (constness fix). * `compare' in GCC 2.95 is broken. --- src/libstore/store.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libstore/store.cc b/src/libstore/store.cc index d61c3e454..12045fc35 100644 --- a/src/libstore/store.cc +++ b/src/libstore/store.cc @@ -63,7 +63,7 @@ static TableId dbSubstitutes = 0; static TableId dbDerivers = 0; -bool Substitute::operator == (const Substitute & sub) +bool Substitute::operator == (const Substitute & sub) const { return program == sub.program && args == sub.args; @@ -170,7 +170,7 @@ void copyPath(const Path & src, const Path & dst) bool isInStore(const Path & path) { return path[0] == '/' - && path.compare(0, nixStore.size(), nixStore) == 0 + && string(path, 0, nixStore.size()) == nixStore && path.size() >= nixStore.size() + 2 && path[nixStore.size()] == '/'; }