lix-project/lix
18
47
Fork 24
Code Issues 333 Code Review (Gerrit) Projects 1 Releases Wiki Activity

Fix extra ; warnings involving MakeError

Browse source
This commit is contained in:
John Ericson 2019-11-10 11:14:26 -05:00
parent 70cab0587d
commit 96e6e680c1
8 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/json-to-value.hh
View file

@ -6,7 +6,7 @@
namespace nix { namespace nix {
MakeError(JSONParseError, EvalError) MakeError(JSONParseError, EvalError);
void parseJSON(EvalState & state, const string & s, Value & v); void parseJSON(EvalState & state, const string & s, Value & v);

16
src/libexpr/nixexpr.hh
View file

@ -9,14 +9,14 @@
namespace nix { namespace nix {
MakeError(EvalError, Error) MakeError(EvalError, Error);
MakeError(ParseError, Error) MakeError(ParseError, Error);
MakeError(AssertionError, EvalError) MakeError(AssertionError, EvalError);
MakeError(ThrownError, AssertionError) MakeError(ThrownError, AssertionError);
MakeError(Abort, EvalError) MakeError(Abort, EvalError);
MakeError(TypeError, EvalError) MakeError(TypeError, EvalError);
MakeError(UndefinedVarError, Error) MakeError(UndefinedVarError, Error);
MakeError(RestrictedPathError, Error) MakeError(RestrictedPathError, Error);
/* Position objects. */ /* Position objects. */

2
src/libstore/build.cc
View file

@ -1515,7 +1515,7 @@ void replaceValidPath(const Path & storePath, const Path tmpPath)
} }
MakeError(NotDeterministic, BuildError) MakeError(NotDeterministic, BuildError);
void DerivationGoal::buildDone() void DerivationGoal::buildDone()

12
src/libstore/store-api.hh
View file

@ -20,12 +20,12 @@
namespace nix { namespace nix {
MakeError(SubstError, Error) MakeError(SubstError, Error);
MakeError(BuildError, Error) /* denotes a permanent build failure */ MakeError(BuildError, Error) /* denotes a permanent build failure */;
MakeError(InvalidPath, Error) MakeError(InvalidPath, Error);
MakeError(Unsupported, Error) MakeError(Unsupported, Error);
MakeError(SubstituteGone, Error) MakeError(SubstituteGone, Error);
MakeError(SubstituterDisabled, Error) MakeError(SubstituterDisabled, Error);
struct BasicDerivation; struct BasicDerivation;

2
src/libutil/serialise.hh
View file

@ -274,7 +274,7 @@ Sink & operator << (Sink & sink, const Strings & s);
Sink & operator << (Sink & sink, const StringSet & s); Sink & operator << (Sink & sink, const StringSet & s);
MakeError(SerialisationError, Error) MakeError(SerialisationError, Error);
template<typename T> template<typename T>

2
src/libutil/thread-pool.hh
View file

@ -11,7 +11,7 @@
namespace nix { namespace nix {
MakeError(ThreadPoolShutDown, Error) MakeError(ThreadPoolShutDown, Error);
/* A simple thread pool that executes a queue of work items /* A simple thread pool that executes a queue of work items
(lambdas). */ (lambdas). */

4
src/libutil/types.hh
View file

@ -116,9 +116,9 @@ public:
{ \ { \
public: \ public: \
using superClass::superClass; \ using superClass::superClass; \
}; }
MakeError(Error, BaseError) MakeError(Error, BaseError);
class SysError : public Error class SysError : public Error
{ {

6
src/libutil/util.hh
View file

@ -160,7 +160,7 @@ void readFull(int fd, unsigned char * buf, size_t count);
void writeFull(int fd, const unsigned char * buf, size_t count, bool allowInterrupts = true); void writeFull(int fd, const unsigned char * buf, size_t count, bool allowInterrupts = true);
void writeFull(int fd, const string & s, bool allowInterrupts = true); void writeFull(int fd, const string & s, bool allowInterrupts = true);
MakeError(EndOfFile, Error) MakeError(EndOfFile, Error);
/* Read a file descriptor until EOF occurs. */ /* Read a file descriptor until EOF occurs. */
@ -333,10 +333,10 @@ void inline checkInterrupt()
_interrupted(); _interrupted();
} }
MakeError(Interrupted, BaseError) MakeError(Interrupted, BaseError);
MakeError(FormatError, Error) MakeError(FormatError, Error);
/* String tokenizer. */ /* String tokenizer. */