Merge b9f39bf into 7d90e33

GeodynamicWorldBuilder · Sep 12, 2018 · 384ebb0 · 384ebb0
2 parents 7d90e33 + b9f39bf
commit 384ebb0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/include/world_builder/utilities.h b/include/world_builder/utilities.h
@@ -184,14 +184,14 @@ namespace WorldBuilder
     /**
      * Converts a string to a int
      */
-    double
+    int
     string_to_int(const std::string &string);
 
 
     /**
      * Converts a string to a unsigned int
      */
-    double
+    unsigned int
     string_to_unsigned_int(const std::string &string);
 
     /**

diff --git a/source/utilities.cc b/source/utilities.cc
@@ -384,7 +384,7 @@ namespace WorldBuilder
       return d;
     }
 
-    double
+    int
     string_to_int(const std::string &string)
     {
       // trim whitespace on either side of the text if necessary
@@ -394,7 +394,7 @@ namespace WorldBuilder
       while ((s.size() > 0) && (s[s.size() - 1] == ' '))
         s.erase(s.end() - 1);
 
-      double d = 0;
+      int d = 0;
       try
         {
           d =  boost::lexical_cast<int>(s);
@@ -408,7 +408,7 @@ namespace WorldBuilder
     }
 
 
-    double
+    unsigned int
     string_to_unsigned_int(const std::string &string)
     {
       // trim whitespace on either side of the text if necessary
@@ -418,7 +418,7 @@ namespace WorldBuilder
       while ((s.size() > 0) && (s[s.size() - 1] == ' '))
         s.erase(s.end() - 1);
 
-      double d = 0;
+      unsigned int d = 0;
       try
         {
           d =  boost::lexical_cast<unsigned int>(s);