Move all functions from VariantFunctions.hpp to `VariantData.hpp

src/ArduinoJson/Serialization/measure.hpp

@@ -5,7 +5,6 @@
 #pragma once
 
 #include <ArduinoJson/Serialization/Writers/DummyWriter.hpp>
-#include <ArduinoJson/Variant/VariantFunctions.hpp>
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 

src/ArduinoJson/Serialization/serialize.hpp

@@ -5,7 +5,6 @@
 #pragma once
 
 #include <ArduinoJson/Serialization/Writer.hpp>
-#include <ArduinoJson/Variant/VariantFunctions.hpp>
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 

src/ArduinoJson/Variant/ConverterImpl.hpp

@@ -7,7 +7,6 @@
 #include <ArduinoJson/Json/JsonSerializer.hpp>
 #include <ArduinoJson/Memory/StringBuilder.hpp>
 #include <ArduinoJson/Variant/JsonVariantConst.hpp>
-#include <ArduinoJson/Variant/VariantFunctions.hpp>
 
 ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 

src/ArduinoJson/Variant/JsonVariantConst.hpp

@@ -12,7 +12,6 @@
 #include <ArduinoJson/Strings/IsString.hpp>
 #include <ArduinoJson/Strings/StringAdapters.hpp>
 #include <ArduinoJson/Variant/VariantAttorney.hpp>
-#include <ArduinoJson/Variant/VariantFunctions.hpp>
 #include <ArduinoJson/Variant/VariantOperators.hpp>
 #include <ArduinoJson/Variant/VariantTag.hpp>
 

src/ArduinoJson/Variant/VariantData.hpp

@@ -487,4 +487,137 @@ class VariantData {
   }
 };
 
+template <typename TVisitor>
+typename TVisitor::result_type variantAccept(const VariantData* var,
+                                             TVisitor& visitor) {
+  if (var != 0)
+    return var->accept(visitor);
+  else
+    return visitor.visitNull();
+}
+
+inline bool variantCopyFrom(VariantData* dst, const VariantData* src,
+                            MemoryPool* pool) {
+  if (!dst)
+    return false;
+  return dst->copyFrom(src, pool);
+}
+
+inline VariantData* variantAddElement(VariantData* var, MemoryPool* pool) {
+  if (!var)
+    return nullptr;
+  return var->addElement(pool);
+}
+
+inline VariantData* variantGetElement(const VariantData* var, size_t index) {
+  return var != 0 ? var->getElement(index) : 0;
+}
+
+template <typename TAdaptedString>
+VariantData* variantGetMember(const VariantData* var, TAdaptedString key) {
+  if (!var)
+    return 0;
+  return var->getMember(key);
+}
+
+inline VariantData* variantGetOrAddElement(VariantData* var, size_t index,
+                                           MemoryPool* pool) {
+  if (!var)
+    return nullptr;
+  return var->getOrAddElement(index, pool);
+}
+
+template <typename TAdaptedString>
+VariantData* variantGetOrAddMember(VariantData* var, TAdaptedString key,
+                                   MemoryPool* pool) {
+  if (!var)
+    return nullptr;
+  return var->getOrAddMember(key, pool);
+}
+
+inline bool variantIsNull(const VariantData* var) {
+  if (!var)
+    return true;
+  return var->isNull();
+}
+
+inline size_t variantNesting(const VariantData* var) {
+  if (!var)
+    return 0;
+  return var->nesting();
+}
+
+inline void variantRemoveElement(VariantData* var, size_t index,
+                                 MemoryPool* pool) {
+  if (!var)
+    return;
+  var->removeElement(index, pool);
+}
+
+template <typename TAdaptedString>
+void variantRemoveMember(VariantData* var, TAdaptedString key,
+                         MemoryPool* pool) {
+  if (!var)
+    return;
+  var->removeMember(key, pool);
+}
+
+inline void variantSetBoolean(VariantData* var, bool value, MemoryPool* pool) {
+  if (!var)
+    return;
+  var->setBoolean(value, pool);
+}
+
+inline void variantSetFloat(VariantData* var, JsonFloat value,
+                            MemoryPool* pool) {
+  if (!var)
+    return;
+  var->setFloat(value, pool);
+}
+
+template <typename T>
+void variantSetInteger(VariantData* var, T value, MemoryPool* pool) {
+  if (!var)
+    return;
+  var->setInteger(value, pool);
+}
+
+inline void variantSetNull(VariantData* var, MemoryPool* pool) {
+  if (!var)
+    return;
+  var->setNull(pool);
+}
+
+template <typename T>
+void variantSetRawString(VariantData* var, SerializedValue<T> value,
+                         MemoryPool* pool) {
+  if (!var)
+    return;
+  var->setRawString(value, pool);
+}
+
+template <typename TAdaptedString>
+void variantSetString(VariantData* var, TAdaptedString value,
+                      MemoryPool* pool) {
+  if (!var)
+    return;
+  var->setString(value, pool);
+}
+
+inline size_t variantSize(const VariantData* var) {
+  return var != 0 ? var->size() : 0;
+}
+
+inline CollectionData* variantToArray(VariantData* var, MemoryPool* pool) {
+  if (!var)
+    return 0;
+  return &var->toArray(pool);
+}
+
+inline CollectionData* variantToObject(VariantData* var, MemoryPool* pool) {
+  if (!var)
+    return 0;
+  return &var->toObject(pool);
+}
+
 ARDUINOJSON_END_PRIVATE_NAMESPACE

src/ArduinoJson/Variant/VariantFunctions.hpp

@@ -1,146 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
-// MIT License
-
-#pragma once
-
-#include <ArduinoJson/Polyfills/assert.hpp>
-#include <ArduinoJson/Polyfills/attributes.hpp>
-#include <ArduinoJson/Variant/VariantData.hpp>
-#include <ArduinoJson/Variant/Visitor.hpp>
-
-ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
-
-template <typename TVisitor>
-inline typename TVisitor::result_type variantAccept(const VariantData* var,
-                                                    TVisitor& visitor) {
-  if (var != 0)
-    return var->accept(visitor);
-  else
-    return visitor.visitNull();
-}
-
-inline bool variantCopyFrom(VariantData* dst, const VariantData* src,
-                            MemoryPool* pool) {
-  if (!dst)
-    return false;
-  return dst->copyFrom(src, pool);
-}
-
-inline void variantSetNull(VariantData* var, MemoryPool* pool) {
-  if (!var)
-    return;
-  var->setNull(pool);
-}
-
-inline void variantSetBoolean(VariantData* var, bool value, MemoryPool* pool) {
-  if (!var)
-    return;
-  var->setBoolean(value, pool);
-}
-
-inline void variantSetFloat(VariantData* var, JsonFloat value,
-                            MemoryPool* pool) {
-  if (!var)
-    return;
-  var->setFloat(value, pool);
-}
-
-template <typename T>
-inline void variantSetInteger(VariantData* var, T value, MemoryPool* pool) {
-  if (!var)
-    return;
-  var->setInteger(value, pool);
-}
-
-template <typename TAdaptedString>
-inline void variantSetString(VariantData* var, TAdaptedString value,
-                             MemoryPool* pool) {
-  if (!var)
-    return;
-  var->setString(value, pool);
-}
-
-template <typename T>
-inline void variantSetRawString(VariantData* var, SerializedValue<T> value,
-                                MemoryPool* pool) {
-  if (!var)
-    return;
-  var->setRawString(value, pool);
-}
-
-inline size_t variantSize(const VariantData* var) {
-  return var != 0 ? var->size() : 0;
-}
-
-inline CollectionData* variantToArray(VariantData* var, MemoryPool* pool) {
-  if (!var)
-    return 0;
-  return &var->toArray(pool);
-}
-
-inline CollectionData* variantToObject(VariantData* var, MemoryPool* pool) {
-  if (!var)
-    return 0;
-  return &var->toObject(pool);
-}
-
-inline VariantData* variantGetElement(const VariantData* var, size_t index) {
-  return var != 0 ? var->getElement(index) : 0;
-}
-
-inline VariantData* variantAddElement(VariantData* var, MemoryPool* pool) {
-  if (!var)
-    return nullptr;
-  return var->addElement(pool);
-}
-
-inline NO_INLINE VariantData* variantGetOrAddElement(VariantData* var,
-                                                     size_t index,
-                                                     MemoryPool* pool) {
-  if (!var)
-    return nullptr;
-  return var->getOrAddElement(index, pool);
-}
-
-inline void variantRemoveElement(VariantData* var, size_t index,
-                                 MemoryPool* pool) {
-  if (!var)
-    return;
-  var->removeElement(index, pool);
-}
-
-template <typename TAdaptedString>
-VariantData* variantGetMember(const VariantData* var, TAdaptedString key) {
-  if (!var)
-    return 0;
-  return var->getMember(key);
-}
-
-template <typename TAdaptedString>
-VariantData* variantGetOrAddMember(VariantData* var, TAdaptedString key,
-                                   MemoryPool* pool) {
-  if (!var)
-    return nullptr;
-  return var->getOrAddMember(key, pool);
-}
-
-template <typename TAdaptedString>
-void variantRemoveMember(VariantData* var, TAdaptedString key,
-                         MemoryPool* pool) {
-  if (!var)
-    return;
-  var->removeMember(key, pool);
-}
-
-inline bool variantIsNull(const VariantData* var) {
-  return var == 0 || var->isNull();
-}
-
-inline size_t variantNesting(const VariantData* var) {
-  if (!var)
-    return 0;
-  return var->nesting();
-}
-
-ARDUINOJSON_END_PRIVATE_NAMESPACE