Rename Integer to JsonInteger

This commit is contained in:
Benoit Blanchon
2022-12-19 11:46:44 +01:00
parent 8228aec74b
commit 652d70fe2c
12 changed files with 22 additions and 22 deletions

View File

@@ -62,7 +62,7 @@ template <typename T>
struct Converter<T, typename enable_if<is_enum<T>::value>::type>
: private VariantAttorney {
static void toJson(T src, VariantRef dst) {
dst.set(static_cast<Integer>(src));
dst.set(static_cast<JsonInteger>(src));
}
static T fromJson(VariantConstRef src) {

View File

@@ -56,7 +56,7 @@ struct Comparer<T, typename enable_if<is_integral<T>::value ||
return arithmeticCompare(lhs, rhs);
}
CompareResult visitSignedInteger(Integer lhs) {
CompareResult visitSignedInteger(JsonInteger lhs) {
return arithmeticCompare(lhs, rhs);
}
@@ -157,8 +157,8 @@ struct VariantComparer : ComparerBase {
return accept(comparer);
}
CompareResult visitSignedInteger(Integer lhs) {
Comparer<Integer> comparer(lhs);
CompareResult visitSignedInteger(JsonInteger lhs) {
Comparer<JsonInteger> comparer(lhs);
return accept(comparer);
}

View File

@@ -7,8 +7,8 @@
#include <stddef.h> // size_t
#include <ArduinoJson/Collection/CollectionData.hpp>
#include <ArduinoJson/Numbers/Integer.hpp>
#include <ArduinoJson/Numbers/JsonFloat.hpp>
#include <ArduinoJson/Numbers/JsonInteger.hpp>
namespace ARDUINOJSON_NAMESPACE {
@@ -47,7 +47,7 @@ union VariantContent {
JsonFloat asFloat;
bool asBoolean;
UInt asUnsignedInteger;
Integer asSignedInteger;
JsonInteger asSignedInteger;
CollectionData asCollection;
struct {
const char* data;

View File

@@ -5,8 +5,8 @@
#pragma once
#include <ArduinoJson/Collection/CollectionData.hpp>
#include <ArduinoJson/Numbers/Integer.hpp>
#include <ArduinoJson/Numbers/JsonFloat.hpp>
#include <ArduinoJson/Numbers/JsonInteger.hpp>
namespace ARDUINOJSON_NAMESPACE {
@@ -26,7 +26,7 @@ struct Visitor {
return TResult();
}
TResult visitSignedInteger(Integer) {
TResult visitSignedInteger(JsonInteger) {
return TResult();
}