changeset 703:bee0e7407af7 dev

corrected compilation bug on linux
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Tue, 21 Jul 2015 15:52:43 -0400
parents f0a897d7f3a5
children f83d125d0c55
files c/utils.cpp include/utils.hpp
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/c/utils.cpp	Mon Jul 20 15:36:48 2015 -0400
+++ b/c/utils.cpp	Tue Jul 21 15:52:43 2015 -0400
@@ -4,7 +4,6 @@
 
 #include <iostream>
 #include <fstream>
-#include <sstream>
 
 using namespace std;
 
--- a/include/utils.hpp	Mon Jul 20 15:36:48 2015 -0400
+++ b/include/utils.hpp	Tue Jul 21 15:52:43 2015 -0400
@@ -1,6 +1,7 @@
 #ifndef UTILS_HPP
 #define UTILS_HPP
 
+#include <sstream>
 #include <iosfwd>
 #include <string>
 #include <vector>
@@ -73,7 +74,8 @@
 template<typename T>
 bool fromString(T & result, const std::string & s) {
   std::istringstream iss(s);
-  return iss >> result != 0;
+  iss >> result;
+  return iss.good() || iss.eof();
 }
 
 #endif