From fc009cfc5dfce0e362960af3bc479339bec6c80c Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Tue, 29 Mar 2022 12:27:45 +0200 Subject: [PATCH] isInteger() (6796,5602) --- src/ArduinoJson/Variant/ConverterImpl.hpp | 4 ++-- src/ArduinoJson/Variant/VariantData.hpp | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ArduinoJson/Variant/ConverterImpl.hpp b/src/ArduinoJson/Variant/ConverterImpl.hpp index cc3fd1fc..b2f63d1f 100644 --- a/src/ArduinoJson/Variant/ConverterImpl.hpp +++ b/src/ArduinoJson/Variant/ConverterImpl.hpp @@ -55,7 +55,7 @@ struct Converter< static bool checkJson(VariantConstRef src) { const VariantData* data = getData(src); - return data && data->isInteger(); + return data && data->resolve()->isInteger(); } }; @@ -71,7 +71,7 @@ struct Converter::value>::type> { static bool checkJson(VariantConstRef src) { const VariantData* data = getData(src); - return data && data->isInteger(); + return data && data->resolve()->isInteger(); } }; diff --git a/src/ArduinoJson/Variant/VariantData.hpp b/src/ArduinoJson/Variant/VariantData.hpp index df580245..7ca68a51 100644 --- a/src/ArduinoJson/Variant/VariantData.hpp +++ b/src/ArduinoJson/Variant/VariantData.hpp @@ -125,8 +125,6 @@ class VariantData { template bool isInteger() const { - if (isPointer()) // P+0 G+0 - return _content.asPointer->isInteger(); switch (type()) { case VALUE_IS_UNSIGNED_INTEGER: return canConvertNumber(_content.asUnsignedInteger);