puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Shut up some clang warnings

Browse source
This commit is contained in:
Eelco Dolstra 2017-05-30 14:35:50 +02:00
parent 2ac99a32da
commit d552d38758
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libstore/build.cc
View file

@ -906,7 +906,7 @@ private:
void repairClosure(); void repairClosure();
void amDone(ExitCode result) void amDone(ExitCode result) override
{ {
logger->event(evBuildFinished, act, result == ecSuccess); logger->event(evBuildFinished, act, result == ecSuccess);
Goal::amDone(result); Goal::amDone(result);
@ -3288,16 +3288,16 @@ public:
SubstitutionGoal(const Path & storePath, Worker & worker, bool repair = false); SubstitutionGoal(const Path & storePath, Worker & worker, bool repair = false);
~SubstitutionGoal(); ~SubstitutionGoal();
void timedOut() { abort(); }; void timedOut() override { abort(); };
string key() string key() override
{ {
/* "a$" ensures substitution goals happen before derivation /* "a$" ensures substitution goals happen before derivation
goals. */ goals. */
return "a$" + storePathToName(storePath) + "$" + storePath; return "a$" + storePathToName(storePath) + "$" + storePath;
} }
void work(); void work() override;
/* The states. */ /* The states. */
void init(); void init();
@ -3308,12 +3308,12 @@ public:
void finished(); void finished();
/* Callback used by the worker to write to the log. */ /* Callback used by the worker to write to the log. */
void handleChildOutput(int fd, const string & data); void handleChildOutput(int fd, const string & data) override;
void handleEOF(int fd); void handleEOF(int fd) override;
Path getStorePath() { return storePath; } Path getStorePath() { return storePath; }
void amDone(ExitCode result) void amDone(ExitCode result) override
{ {
logger->event(evSubstitutionFinished, act, result == ecSuccess); logger->event(evSubstitutionFinished, act, result == ecSuccess);
Goal::amDone(result); Goal::amDone(result);