From d308aeaf53b7324af98dfa949a747526c241ef30 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Aug 2013 12:35:03 +0200 Subject: Store Nix integers as longs So on 64-bit systems, integers are now 64-bit. Fixes #158. --- src/libutil/util.cc | 8 -------- src/libutil/util.hh | 7 ++++++- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'src/libutil') diff --git a/src/libutil/util.cc b/src/libutil/util.cc index bc07a84f4d8d..5a88a158c389 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -1083,14 +1083,6 @@ bool statusOk(int status) } -string int2String(int n) -{ - std::ostringstream str; - str << n; - return str.str(); -} - - bool hasSuffix(const string & s, const string & suffix) { return s.size() >= suffix.size() && string(s, s.size() - suffix.size()) == suffix; diff --git a/src/libutil/util.hh b/src/libutil/util.hh index 6c83987c5d46..86c65b763d00 100644 --- a/src/libutil/util.hh +++ b/src/libutil/util.hh @@ -319,7 +319,12 @@ template bool string2Int(const string & s, N & n) return str && str.get() == EOF; } -string int2String(int n); +template string int2String(N n) +{ + std::ostringstream str; + str << n; + return str.str(); +} /* Return true iff `s' ends in `suffix'. */ -- cgit 1.4.1