Changeset 2673 for trunk/yat/utility/utility.h

Timestamp:

Dec 3, 2011, 1:30:12 AM (11 years ago)

Author:

Peter

Message:

merge release 0.8 into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• yat/utility/utility.h (modified) (3 diffs)

trunk/yat/utility/utility.h

@@ -35 +35 @@
 #include "Exception.h"
 
+#include <algorithm>
+#include <cctype>
 #include <cmath>
+#include <functional>
 #include <limits>
+#include <locale>
 #include <istream>
 #include <string>
@@ -331 +335 @@
 
   template<typename T>
-  void load(std::istream& is, std::vector<T>& vec, char sep='\0')
+  void load(std::istream& is, std::vector<T>& vec, char sep)
   {
     detail::VectorPusher<T> pusher;
@@ -352 +356 @@
   bool convert(const std::string& s, T& result)
   {
+    if (!std::numeric_limits<T>::is_signed) {
+      // first non-whitespace character
+      std::string::const_iterator iter = s.begin();
+      while (iter!=s.end() && std::isspace(*iter))
+        ++iter;
+      // unsigned int cannot start with a '-' and with some compilers
+      // operation ss >> result won't fail so catch it like this instead.
+      if (iter==s.end() || *iter=='-')
+        return false;
+    }
     std::istringstream ss(s);
     ss >> result;