From 37faa7ce13390ef056e560338b37378ee70b0c88 Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <git@benoitblanchon.fr>
Date: Sun, 22 May 2022 17:03:09 +0200
Subject: [PATCH] Merge definitions of `VariantConstRef::accept()` and
 `VariantRef::accept()`

---
 src/ArduinoJson/Variant/VariantRef.hpp | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/ArduinoJson/Variant/VariantRef.hpp b/src/ArduinoJson/Variant/VariantRef.hpp
index 7a6c4522..4ab82cd7 100644
--- a/src/ArduinoJson/Variant/VariantRef.hpp
+++ b/src/ArduinoJson/Variant/VariantRef.hpp
@@ -28,6 +28,11 @@ class ObjectRef;
 template <typename TData>
 class VariantRefBase : public VariantTag {
  public:
+  template <typename TVisitor>
+  typename TVisitor::result_type accept(TVisitor &visitor) const {
+    return variantAccept(_data, visitor);
+  }
+
   FORCE_INLINE bool isNull() const {
     return variantIsNull(_data);
   }
@@ -67,11 +72,6 @@ class VariantConstRef : public VariantRefBase<const VariantData>,
   VariantConstRef() : base_type(0) {}
   explicit VariantConstRef(const VariantData *data) : base_type(data) {}
 
-  template <typename TVisitor>
-  typename TVisitor::result_type accept(TVisitor &visitor) const {
-    return variantAccept(_data, visitor);
-  }
-
   template <typename T>
   FORCE_INLINE
       typename enable_if<!is_same<T, char *>::value && !is_same<T, char>::value,
@@ -265,11 +265,6 @@ class VariantRef : public VariantRefBase<VariantData>,
     return VariantConstRef(_data);
   }
 
-  template <typename TVisitor>
-  typename TVisitor::result_type accept(TVisitor &visitor) const {
-    return variantAccept(_data, visitor);
-  }
-
   // Change the type of the variant
   //
   // ArrayRef to<ArrayRef>()