From 2afb7398fb27cb2e0e64d2699c74212fe16c80a9 Mon Sep 17 00:00:00 2001
From: Baggins800 <23511354@student.g.nwu.ac.za>
Date: Tue, 13 Sep 2016 11:00:16 +0200
Subject: [PATCH] ToFloat can convert from ints aswell

---
 json.hpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/json.hpp b/json.hpp
index 97d3254..6c1036e 100644
--- a/json.hpp
+++ b/json.hpp
@@ -292,7 +292,14 @@ class JSON
         double ToFloat() const { bool b; return ToFloat( b ); }
         double ToFloat( bool &ok ) const {
             ok = (Type == Class::Floating);
-            return ok ? Internal.Float : 0.0;
+            if (ok)
+              return Internal.Float;
+            
+            ok = (Type == Class::Integral);
+            if (ok)
+              return Internal.Int;
+            
+            return 0.0;
         }
 
         long ToInt() const { bool b; return ToInt( b ); }
@@ -372,7 +379,7 @@ class JSON
                 default:
                     return "";
             }
-            return "";
+            //return "";
         }
 
         friend std::ostream& operator<<( std::ostream&, const JSON & );