From 1e28217393a8011e080796058a6103fa4230de68 Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <github@benoitblanchon.fr>
Date: Sat, 19 Jul 2014 15:36:01 +0200
Subject: [PATCH] Merged parse() and parseToken()

---
 JsonParser/JsonParserBase.cpp |  2 +-
 JsonParser/JsonParserBase.h   | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/JsonParser/JsonParserBase.cpp b/JsonParser/JsonParserBase.cpp
index 456f71b1..8263d8cc 100644
--- a/JsonParser/JsonParserBase.cpp
+++ b/JsonParser/JsonParserBase.cpp
@@ -8,7 +8,7 @@
 
 using namespace ArduinoJson::Parser;
 
-JsonToken JsonParserBase::parseToken(char* json)
+JsonValue JsonParserBase::parse(char* json)
 {
     jsmn_parser parser;
     jsmn_init(&parser);
diff --git a/JsonParser/JsonParserBase.h b/JsonParser/JsonParserBase.h
index 5b4d8979..8f01f0a1 100644
--- a/JsonParser/JsonParserBase.h
+++ b/JsonParser/JsonParserBase.h
@@ -21,10 +21,7 @@ namespace ArduinoJson
             {
             }
 
-            JsonValue parse(char* json)
-            {
-                return parseToken(json);
-            }
+            JsonValue parse(char* json);
 
             /*
             * Parse the JSON string and return a array.
@@ -34,7 +31,7 @@ namespace ArduinoJson
             */
             DEPRECATED JsonArray parseArray(char* json)
             {
-                return parseToken(json);
+                return parse(json);
             }
 
             /*
@@ -45,14 +42,12 @@ namespace ArduinoJson
             */
             DEPRECATED JsonObject parseHashTable(char* json)
             {
-                return parseToken(json);
+                return parse(json);
             }
 
         private:
             jsmntok_t* tokens;
             int maxTokens;
-
-            JsonToken parseToken(char* json);
         };
     }
 }
\ No newline at end of file