feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Huge refactoring in progress...

Browse Source
This commit is contained in:
Benoit Blanchon
2014-10-30 15:31:27 +01:00
parent 4c204840e9
commit 45a8ed6531
7 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/ArduinoJson/Internals/JsonObjectNode.hpp
View File

@ -18,6 +18,9 @@ class JsonObjectNode {
JsonPair pair;
JsonObjectNode* next;
// warning C4512: assignment operator could not be generated
#pragma warning( suppress : 4512 )
};
}
}

2
include/ArduinoJson/JsonArray.hpp
View File

@ -68,7 +68,7 @@ class JsonArray : public JsonPrintable {
static JsonArray _invalid;
};
bool operator==(const JsonArray &left, const JsonArray &right) {
inline bool operator==(const JsonArray &left, const JsonArray &right) {
// two JsonArray are equal if they are the same instance
// (we don't compare the content)
return &left == &right;

2
include/ArduinoJson/JsonObject.hpp
View File

@ -72,7 +72,7 @@ class JsonObject : public JsonPrintable {
static JsonObject _invalid;
};
bool operator==(const JsonObject &left, const JsonObject &right) {
inline bool operator==(const JsonObject &left, const JsonObject &right) {
// two JsonObject are equal if they are the same instance
// (we don't compare the content)
return &left == &right;

5
include/ArduinoJson/JsonPair.hpp
View File

@ -16,5 +16,8 @@ struct JsonPair {
const char* const key;
JsonValue value;
// warning C4512: assignment operator could not be generated
#pragma warning( suppress : 4512 )
};
}
}

1
include/ArduinoJson/JsonValue.hpp
View File

@ -45,6 +45,7 @@ class JsonValue {
operator const char *() const;
operator double() const;
operator long() const;
operator int() const { return operator long(); }
operator JsonArray &() const;
operator JsonObject &() const;