Rename Float to JsonFloat

This commit is contained in:
Benoit Blanchon
2022-12-19 11:43:20 +01:00
parent 2f2e0e9415
commit 8228aec74b
10 changed files with 17 additions and 17 deletions

View File

@@ -101,7 +101,7 @@ struct Converter<T, typename enable_if<is_floating_point<T>::value>::type>
static void toJson(T src, VariantRef dst) {
VariantData* data = getData(dst);
if (data)
data->setFloat(static_cast<Float>(src));
data->setFloat(static_cast<JsonFloat>(src));
}
static T fromJson(VariantConstRef src) {

View File

@@ -52,7 +52,7 @@ struct Comparer<T, typename enable_if<is_integral<T>::value ||
explicit Comparer(T value) : rhs(value) {}
CompareResult visitFloat(Float lhs) {
CompareResult visitFloat(JsonFloat lhs) {
return arithmeticCompare(lhs, rhs);
}
@@ -142,8 +142,8 @@ struct VariantComparer : ComparerBase {
return accept(comparer);
}
CompareResult visitFloat(Float lhs) {
Comparer<Float> comparer(lhs);
CompareResult visitFloat(JsonFloat lhs) {
Comparer<JsonFloat> comparer(lhs);
return accept(comparer);
}

View File

@@ -7,8 +7,8 @@
#include <stddef.h> // size_t
#include <ArduinoJson/Collection/CollectionData.hpp>
#include <ArduinoJson/Numbers/Float.hpp>
#include <ArduinoJson/Numbers/Integer.hpp>
#include <ArduinoJson/Numbers/JsonFloat.hpp>
namespace ARDUINOJSON_NAMESPACE {
@@ -44,7 +44,7 @@ struct RawData {
};
union VariantContent {
Float asFloat;
JsonFloat asFloat;
bool asBoolean;
UInt asUnsignedInteger;
Integer asSignedInteger;

View File

@@ -172,7 +172,7 @@ class VariantData {
_content.asBoolean = value;
}
void setFloat(Float value) {
void setFloat(JsonFloat value) {
setType(VALUE_IS_FLOAT);
_content.asFloat = value;
}

View File

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