From 38414cbc619e83982b05b8de2cb9adc0a869e77b Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Sat, 13 Jun 2020 15:00:10 +0200 Subject: [PATCH] Move VariantOperator and VariantShortcuts --- src/ArduinoJson/Array/ElementProxy.hpp | 4 ++-- src/ArduinoJson/Object/MemberProxy.hpp | 4 ++-- src/ArduinoJson/{Operators => Variant}/VariantOperators.hpp | 0 src/ArduinoJson/Variant/VariantRef.hpp | 4 ++-- src/ArduinoJson/{Operators => Variant}/VariantShortcuts.hpp | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename src/ArduinoJson/{Operators => Variant}/VariantOperators.hpp (100%) rename src/ArduinoJson/{Operators => Variant}/VariantShortcuts.hpp (100%) diff --git a/src/ArduinoJson/Array/ElementProxy.hpp b/src/ArduinoJson/Array/ElementProxy.hpp index 83fd6587e..6d5cfdf45 100644 --- a/src/ArduinoJson/Array/ElementProxy.hpp +++ b/src/ArduinoJson/Array/ElementProxy.hpp @@ -5,8 +5,8 @@ #pragma once #include -#include -#include +#include +#include #include #ifdef _MSC_VER diff --git a/src/ArduinoJson/Object/MemberProxy.hpp b/src/ArduinoJson/Object/MemberProxy.hpp index 9b9359175..49602b939 100644 --- a/src/ArduinoJson/Object/MemberProxy.hpp +++ b/src/ArduinoJson/Object/MemberProxy.hpp @@ -5,10 +5,10 @@ #pragma once #include -#include -#include #include +#include #include +#include #include #ifdef _MSC_VER diff --git a/src/ArduinoJson/Operators/VariantOperators.hpp b/src/ArduinoJson/Variant/VariantOperators.hpp similarity index 100% rename from src/ArduinoJson/Operators/VariantOperators.hpp rename to src/ArduinoJson/Variant/VariantOperators.hpp diff --git a/src/ArduinoJson/Variant/VariantRef.hpp b/src/ArduinoJson/Variant/VariantRef.hpp index 0f01ef494..9bbfb8a61 100644 --- a/src/ArduinoJson/Variant/VariantRef.hpp +++ b/src/ArduinoJson/Variant/VariantRef.hpp @@ -9,12 +9,12 @@ #include #include -#include -#include #include #include #include +#include #include +#include namespace ARDUINOJSON_NAMESPACE { diff --git a/src/ArduinoJson/Operators/VariantShortcuts.hpp b/src/ArduinoJson/Variant/VariantShortcuts.hpp similarity index 100% rename from src/ArduinoJson/Operators/VariantShortcuts.hpp rename to src/ArduinoJson/Variant/VariantShortcuts.hpp