* Templatise getIntArg / string2Int.

2 files changed, 7 insertions, 18 deletions

diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index 248095b342..1b86e88d7f 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -1055,22 +1055,6 @@ string int2String(int n)
 }
 
 
-bool string2Int(const string & s, int & n)
-{
-    std::istringstream str(s);
-    str >> n;
-    return str && str.get() == EOF;
-}
-
-
-bool string2Int(const string & s, long long & n)
-{
-    std::istringstream str(s);
-    str >> n;
-    return str && str.get() == EOF;
-}
-
-
 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 5744e56922..2d75a7a506 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -295,9 +295,14 @@ bool statusOk(int status);
 
 
 /* Parse a string into an integer. */
+template<class N> bool string2Int(const string & s, N & n)
+{
+    std::istringstream str(s);
+    str >> n;
+    return str && str.get() == EOF;
+}
+
 string int2String(int n);
-bool string2Int(const string & s, int & n);
-bool string2Int(const string & s, long long & n);
 
 
 /* Return true iff `s' ends in `suffix'. */