Changeset 1422

Timestamp:

Dec 15, 2011, 12:59:52 AM (11 years ago)

Author:

Peter Johansson

Message:

latest yat

Location:

trunk/yat

Files:

• config_public.h.in (modified) (2 diffs)
• utility.h (modified) (4 diffs)

trunk/yat/config_public.h.in

@@ -1 +1 @@
 #ifndef _theplu_yat_utility_config_public_
-#define _theplu_yat_utility_config_public_ 
+#define _theplu_yat_utility_config_public_
 
-// $Id: config_public.h.in 2431 2011-03-06 20:04:31Z peter $
+// $Id: config_public.h.in 2673 2011-12-03 00:30:12Z peter $
 
 /*
@@ -31 +31 @@
 #undef YAT_HAVE_GCC_DEPRECATED
 
+/// Define if compiler supports boost concept with constructor
+#undef YAT_HAVE_BOOST_CONCEPT_WITH_CONSTRUCTOR
+
 /// Version of yat in string format
 #undef YAT_VERSION

trunk/yat/utility.h

@@ -2 +2 @@
 #define _theplu_yat_utility_utility_ 
 
-// $Id: utility.h 2581 2011-10-05 18:43:27Z peter $
+// $Id: utility.h 2673 2011-12-03 00:30:12Z peter $
 
 /*
@@ -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;