فهرست منبع

Cleaned #includes

Benoit Blanchon 11 سال پیش
والد
کامیت
e25eaed75a

+ 1 - 1
include/ArduinoJson/JsonPrintable.hpp

@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include "Internals/StringBuilder.hpp"
 #include "Internals/IndentedPrint.hpp"
 #include "Internals/PrettyJsonWriter.hpp"
+#include "Internals/StringBuilder.hpp"
 
 namespace ArduinoJson {
 

+ 2 - 1
src/Arduino/Print.cpp

@@ -7,7 +7,8 @@
 #ifndef ARDUINO
 
 #include "../../include/ArduinoJson/Arduino/Print.hpp"
-#include <cstdio>
+
+#include <stdio.h>  // for sprintf
 
 size_t Print::print(const char s[]) {
   size_t n = 0;

+ 2 - 2
src/ArduinoJson.h

@@ -10,8 +10,8 @@
 // for the IDE to find it. Feel free to ignore this file if your working in
 // another environment
 
-#include "../include/ArduinoJson/StaticJsonBuffer.hpp"
 #include "../include/ArduinoJson/JsonArray.hpp"
 #include "../include/ArduinoJson/JsonObject.hpp"
+#include "../include/ArduinoJson/StaticJsonBuffer.hpp"
 
-using namespace ArduinoJson;
+using namespace ArduinoJson;

+ 1 - 2
src/Internals/JsonParser.cpp

@@ -9,11 +9,10 @@
 #include <stdlib.h>  // for strtol, strtod
 #include <ctype.h>
 
+#include "../../include/ArduinoJson/Internals/QuotedString.hpp"
 #include "../../include/ArduinoJson/JsonArray.hpp"
 #include "../../include/ArduinoJson/JsonBuffer.hpp"
-#include "../../include/ArduinoJson/JsonVariant.hpp"
 #include "../../include/ArduinoJson/JsonObject.hpp"
-#include "../../include/ArduinoJson/Internals/QuotedString.hpp"
 
 using namespace ArduinoJson;
 using namespace ArduinoJson::Internals;

+ 1 - 0
src/Internals/JsonWriter.cpp

@@ -5,6 +5,7 @@
 // https://github.com/bblanchon/ArduinoJson
 
 #include "../../include/ArduinoJson/Internals/JsonWriter.hpp"
+
 #include "../../include/ArduinoJson/Internals/QuotedString.hpp"
 
 using namespace ArduinoJson::Internals;

+ 2 - 3
src/JsonBuffer.cpp

@@ -6,11 +6,10 @@
 
 #include "../include/ArduinoJson/JsonBuffer.hpp"
 
+#include "../include/ArduinoJson/Internals/JsonParser.hpp"
+#include "../include/ArduinoJson/Internals/PlacementNew.hpp"
 #include "../include/ArduinoJson/JsonArray.hpp"
 #include "../include/ArduinoJson/JsonObject.hpp"
-#include "../include/ArduinoJson/JsonVariant.hpp"
-#include "../include/ArduinoJson/Internals/PlacementNew.hpp"
-#include "../include/ArduinoJson/Internals/JsonParser.hpp"
 
 using namespace ArduinoJson;
 using namespace ArduinoJson::Internals;

+ 3 - 4
src/JsonObject.cpp

@@ -8,12 +8,11 @@
 
 #include <string.h>  // for strcmp
 
-#include "../include/ArduinoJson/JsonBuffer.hpp"
-#include "../include/ArduinoJson/JsonArray.hpp"
-#include "../include/ArduinoJson/JsonVariant.hpp"
+#include "../include/ArduinoJson/Internals/PlacementNew.hpp"
 #include "../include/ArduinoJson/Internals/PrettyJsonWriter.hpp"
 #include "../include/ArduinoJson/Internals/StringBuilder.hpp"
-#include "../include/ArduinoJson/Internals/PlacementNew.hpp"
+#include "../include/ArduinoJson/JsonArray.hpp"
+#include "../include/ArduinoJson/JsonBuffer.hpp"
 
 using namespace ArduinoJson;
 using namespace ArduinoJson::Internals;

+ 2 - 1
src/JsonVariant.cpp

@@ -5,9 +5,10 @@
 // https://github.com/bblanchon/ArduinoJson
 
 #include "../include/ArduinoJson/JsonVariant.hpp"
+
+#include "../include/ArduinoJson/Internals/PrettyJsonWriter.hpp"
 #include "../include/ArduinoJson/JsonArray.hpp"
 #include "../include/ArduinoJson/JsonObject.hpp"
-#include "../include/ArduinoJson/Internals/PrettyJsonWriter.hpp"
 
 using namespace ArduinoJson;
 using namespace ArduinoJson::Internals;

+ 0 - 1
test/Issue10.cpp

@@ -7,7 +7,6 @@
 #include <gtest/gtest.h>
 #include <ArduinoJson/JsonArray.hpp>
 #include <ArduinoJson/JsonObject.hpp>
-#include <ArduinoJson/JsonVariant.hpp>
 #include <ArduinoJson/StaticJsonBuffer.hpp>
 
 using namespace ArduinoJson;

+ 0 - 1
test/JsonArray_Container_Tests.cpp

@@ -6,7 +6,6 @@
 
 #include <gtest/gtest.h>
 #include <ArduinoJson/StaticJsonBuffer.hpp>
-#include <ArduinoJson/JsonVariant.hpp>
 #include <ArduinoJson/JsonArray.hpp>
 #include <ArduinoJson/JsonObject.hpp>
 

+ 0 - 1
test/JsonArray_PrettyPrintTo_Tests.cpp

@@ -7,7 +7,6 @@
 #include <gtest/gtest.h>
 #include <ArduinoJson/JsonArray.hpp>
 #include <ArduinoJson/JsonObject.hpp>
-#include <ArduinoJson/JsonVariant.hpp>
 #include <ArduinoJson/StaticJsonBuffer.hpp>
 
 using namespace ArduinoJson;

+ 0 - 1
test/JsonObject_Container_Tests.cpp

@@ -7,7 +7,6 @@
 #include <gtest/gtest.h>
 #include <ArduinoJson/JsonArray.hpp>
 #include <ArduinoJson/JsonObject.hpp>
-#include <ArduinoJson/JsonVariant.hpp>
 #include <ArduinoJson/StaticJsonBuffer.hpp>
 
 using namespace ArduinoJson;

+ 0 - 1
test/JsonObject_PrettyPrintTo_Tests.cpp

@@ -7,7 +7,6 @@
 #include <gtest/gtest.h>
 #include <ArduinoJson/JsonArray.hpp>
 #include <ArduinoJson/JsonObject.hpp>
-#include <ArduinoJson/JsonVariant.hpp>
 #include <ArduinoJson/StaticJsonBuffer.hpp>
 
 using namespace ArduinoJson;

+ 0 - 1
test/JsonObject_PrintTo_Tests.cpp

@@ -7,7 +7,6 @@
 #include <gtest/gtest.h>
 #include <ArduinoJson/JsonArray.hpp>
 #include <ArduinoJson/JsonObject.hpp>
-#include <ArduinoJson/JsonVariant.hpp>
 #include <ArduinoJson/StaticJsonBuffer.hpp>
 
 using namespace ArduinoJson;

+ 0 - 1
test/JsonParser_Array_Tests.cpp

@@ -6,7 +6,6 @@
 
 #include <gtest/gtest.h>
 #include <ArduinoJson/JsonArray.hpp>
-#include <ArduinoJson/JsonVariant.hpp>
 #include <ArduinoJson/StaticJsonBuffer.hpp>
 
 using namespace ArduinoJson;

+ 0 - 1
test/JsonParser_Object_Tests.cpp

@@ -7,7 +7,6 @@
 #include <gtest/gtest.h>
 #include <ArduinoJson/StaticJsonBuffer.hpp>
 #include <ArduinoJson/JsonObject.hpp>
-#include <ArduinoJson/JsonVariant.hpp>
 
 using namespace ArduinoJson;
 

+ 0 - 1
test/JsonVariant_Copy_Tests.cpp

@@ -8,7 +8,6 @@
 #include <ArduinoJson/StaticJsonBuffer.hpp>
 #include <ArduinoJson/JsonArray.hpp>
 #include <ArduinoJson/JsonObject.hpp>
-#include <ArduinoJson/JsonVariant.hpp>
 
 using namespace ArduinoJson;
 

+ 0 - 1
test/JsonVariant_Storage_Tests.cpp

@@ -8,7 +8,6 @@
 #include <ArduinoJson/StaticJsonBuffer.hpp>
 #include <ArduinoJson/JsonArray.hpp>
 #include <ArduinoJson/JsonObject.hpp>
-#include <ArduinoJson/JsonVariant.hpp>
 
 using namespace ArduinoJson;