aboutsummaryrefslogtreecommitdiff
path: root/nix/libutil/util.hh
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-01-04 23:27:34 +0100
committerLudovic Courtès <ludo@gnu.org>2015-01-04 23:27:34 +0100
commit15ddeff532b517843668eef8f615838d15b4f75c (patch)
tree2d11b350f4a83b28cf72e3ba37cfe218ac74f868 /nix/libutil/util.hh
parent828c0bec6b95a6dcfffd28d0a28caecf4f69addf (diff)
downloadguix-15ddeff532b517843668eef8f615838d15b4f75c.tar
guix-15ddeff532b517843668eef8f615838d15b4f75c.tar.gz
Merge commit a1dd396cc02922372314c35c8035a38bfeea08df of branch 'nix'.
Diffstat (limited to 'nix/libutil/util.hh')
-rw-r--r--nix/libutil/util.hh2
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);