diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-17 04:55:47 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-17 04:58:43 +0000 |
| commit | 517f5980e2c63af47e7042873cc33b521918ad35 (patch) | |
| tree | 19438d2e71fdf45e5af07cdd081477e5e89d6df1 /src/libutil/util.hh | |
| parent | e5cc1ebc5db1ef837da82f5ce7824bb29cbcc44b (diff) | |
| parent | 29542865cee37ab22efe1bd142900b69f6c59f0d (diff) | |
Merge remote-tracking branch 'upstream/master' into no-stringly-typed-derivation-output
Diffstat (limited to 'src/libutil/util.hh')
| -rw-r--r-- | src/libutil/util.hh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libutil/util.hh b/src/libutil/util.hh index 4b117f9bc..3641daaec 100644 --- a/src/libutil/util.hh +++ b/src/libutil/util.hh @@ -1,6 +1,7 @@ #pragma once #include "types.hh" +#include "error.hh" #include "logging.hh" #include "ansicolor.hh" @@ -416,7 +417,7 @@ template<class N> bool string2Float(const string & s, N & n) /* Return true iff `s' starts with `prefix'. */ -bool hasPrefix(const string & s, const string & prefix); +bool hasPrefix(std::string_view s, std::string_view prefix); /* Return true iff `s' ends in `suffix'. */ @@ -455,8 +456,8 @@ std::string filterANSIEscapes(const std::string & s, /* Base64 encoding/decoding. */ -string base64Encode(const string & s); -string base64Decode(const string & s); +string base64Encode(std::string_view s); +string base64Decode(std::string_view s); /* Get a value for the specified key from an associate container. */ |