diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-01-04 23:27:34 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-01-04 23:27:34 +0100 |
| commit | 15ddeff532b517843668eef8f615838d15b4f75c (patch) | |
| tree | 2d11b350f4a83b28cf72e3ba37cfe218ac74f868 /nix/libutil/util.hh | |
| parent | 828c0bec6b95a6dcfffd28d0a28caecf4f69addf (diff) | |
| download | patches-15ddeff532b517843668eef8f615838d15b4f75c.tar patches-15ddeff532b517843668eef8f615838d15b4f75c.tar.gz | |
Merge commit a1dd396cc02922372314c35c8035a38bfeea08df of branch 'nix'.
Diffstat (limited to 'nix/libutil/util.hh')
| -rw-r--r-- | nix/libutil/util.hh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nix/libutil/util.hh b/nix/libutil/util.hh index 8bedfea9a0..ce2d77c19a 100644 --- a/nix/libutil/util.hh +++ b/nix/libutil/util.hh @@ -326,6 +326,8 @@ bool hasSuffix(const string & s, const string & suffix); /* Read string `s' from stream `str'. */ void expect(std::istream & str, const string & s); +MakeError(FormatError, Error) + /* Read a C-style string from stream `str'. */ string parseString(std::istream & str); |