github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-01 16:14:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ambiguous overload with JsonArraySubscript and JsonObjectSubscript (issue #122)

Browse Source
This commit is contained in:
Benoit Blanchon
2015-09-28 22:14:50 +02:00
parent d5e25b12b8
commit c6a4bfa886
25 changed files with 749 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/ArduinoJson/JsonArraySubscript.hpp
View File

@@ -8,6 +8,11 @@
#include "JsonSubscriptBase.hpp"
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4522)
#endif
namespace ArduinoJson {
class JsonArraySubscript : public JsonSubscriptBase<JsonArraySubscript> {
public:
@@ -16,6 +21,15 @@ class JsonArraySubscript : public JsonSubscriptBase<JsonArraySubscript> {
using JsonSubscriptBase<JsonArraySubscript>::operator=;
JsonArraySubscript& operator=(const JsonArraySubscript& src) {
return assign<const JsonVariant&>(src);
}
template <typename T>
JsonArraySubscript& operator=(const T& src) {
return assign<const JsonVariant&>(src);
}
FORCE_INLINE bool success() const { return _index < _array.size(); }
FORCE_INLINE operator JsonVariant() const { return _array.get(_index); }
@@ -52,3 +66,7 @@ inline std::ostream& operator<<(std::ostream& os,
#endif
} // namespace ArduinoJson
#ifdef _MSC_VER
#pragma warning(pop)
#endif