summaryrefslogtreecommitdiff
path: root/nix/libutil/util.hh
diff options
context:
space:
mode:
Diffstat (limited to 'nix/libutil/util.hh')
-rw-r--r--nix/libutil/util.hh11
1 files changed, 2 insertions, 9 deletions
diff --git a/nix/libutil/util.hh b/nix/libutil/util.hh
index 24e16ba36a..e84d64d10a 100644
--- a/nix/libutil/util.hh
+++ b/nix/libutil/util.hh
@@ -153,8 +153,8 @@ void printMsg_(Verbosity level, const FormatOrString & fs);
#define printMsg(level, f) \
do { \
- if (level <= verbosity) { \
- printMsg_(level, (f)); \
+ if (level <= nix::verbosity) { \
+ nix::printMsg_(level, (f)); \
} \
} while (0)
@@ -337,13 +337,6 @@ template<class N> bool string2Int(const string & s, N & n)
return str && str.get() == EOF;
}
-template<class N> string int2String(N n)
-{
- std::ostringstream str;
- str << n;
- return str.str();
-}
-
/* Return true iff `s' ends in `suffix'. */
bool hasSuffix(const string & s, const string & suffix);