diff options
| author | John Ericson <git@JohnEricson.me> | 2019-11-10 11:14:26 -0500 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2019-11-10 11:24:47 -0500 |
| commit | 96e6e680c1a298613756571e4984c340ce887c2a (patch) | |
| tree | 53e33aa356c6a8766c460f2fe9b74b30891e5577 /src/libutil | |
| parent | 70cab0587dcbc2d0600c07c96b477a2ea2fcd6f3 (diff) | |
Fix extra ; warnings involving MakeError
Diffstat (limited to 'src/libutil')
| -rw-r--r-- | src/libutil/serialise.hh | 2 | ||||
| -rw-r--r-- | src/libutil/thread-pool.hh | 2 | ||||
| -rw-r--r-- | src/libutil/types.hh | 4 | ||||
| -rw-r--r-- | src/libutil/util.hh | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/libutil/serialise.hh b/src/libutil/serialise.hh index 0120aeecb..128e287f3 100644 --- a/src/libutil/serialise.hh +++ b/src/libutil/serialise.hh @@ -274,7 +274,7 @@ Sink & operator << (Sink & sink, const Strings & s); Sink & operator << (Sink & sink, const StringSet & s); -MakeError(SerialisationError, Error) +MakeError(SerialisationError, Error); template<typename T> diff --git a/src/libutil/thread-pool.hh b/src/libutil/thread-pool.hh index bb16b639a..b22e0d162 100644 --- a/src/libutil/thread-pool.hh +++ b/src/libutil/thread-pool.hh @@ -11,7 +11,7 @@ namespace nix { -MakeError(ThreadPoolShutDown, Error) +MakeError(ThreadPoolShutDown, Error); /* A simple thread pool that executes a queue of work items (lambdas). */ diff --git a/src/libutil/types.hh b/src/libutil/types.hh index 92bf469b5..4bc91828b 100644 --- a/src/libutil/types.hh +++ b/src/libutil/types.hh @@ -116,9 +116,9 @@ public: { \ public: \ using superClass::superClass; \ - }; + } -MakeError(Error, BaseError) +MakeError(Error, BaseError); class SysError : public Error { diff --git a/src/libutil/util.hh b/src/libutil/util.hh index 3493e80b5..5f1d1d181 100644 --- a/src/libutil/util.hh +++ b/src/libutil/util.hh @@ -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 string & s, bool allowInterrupts = true); -MakeError(EndOfFile, Error) +MakeError(EndOfFile, Error); /* Read a file descriptor until EOF occurs. */ @@ -333,10 +333,10 @@ void inline checkInterrupt() _interrupted(); } -MakeError(Interrupted, BaseError) +MakeError(Interrupted, BaseError); -MakeError(FormatError, Error) +MakeError(FormatError, Error); /* String tokenizer. */ |