Replaced composition by inheritance

This commit is contained in:
Benoit Blanchon
2014-07-19 12:44:27 +02:00
parent 851d21e08c
commit b278d7711b
12 changed files with 92 additions and 135 deletions

View File

@ -24,19 +24,19 @@ namespace ArduinoJson
class JsonArray;
class JsonObject;
class JsonValue
class JsonValue : public JsonToken
{
public:
JsonValue(char* json, Internal::JsonToken token)
: json(json), token(token)
{
JsonValue(JsonToken token)
: JsonToken(token)
{
}
bool success()
{
return token.isValid();
return isValid();
}
operator bool();
@ -47,16 +47,6 @@ namespace ArduinoJson
operator JsonObject();
JsonValue operator[](int index);
JsonValue operator[](const char*key);
static JsonValue null()
{
return JsonValue(0, Internal::JsonToken(0));
}
private:
char* json;
Internal::JsonToken token;
};
}
}