bblanchon/ArduinoJson
1
0
Fork 1
mirror of https://github.com/bblanchon/ArduinoJson.git synced 2025-07-18 13:02:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renamed ARDUINO_JSON_NO_DEPRECATED_WARNING into ARDUINO_JSON_NO_DEPRECATION_WARNING

Browse Source
This commit is contained in:
Benoit Blanchon
2014-07-22 20:33:17 +02:00
parent 649f292ea7
commit abef85218e
8 changed files with 105 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JsonParser/JsonObject.h
View File

@ -97,6 +97,6 @@ namespace ArduinoJson
}; };
// Obsolete: Use JsonObject instead // Obsolete: Use JsonObject instead
typedef JsonObject JsonHashTable; DEPRECATED typedef JsonObject JsonHashTable;
} }
} }

2
JsonParser/JsonValue.h
View File

@ -7,7 +7,7 @@
#include "JsonToken.h" #include "JsonToken.h"
#ifndef ARDUINO_JSON_NO_DEPRECATED_WARNING #ifndef ARDUINO_JSON_NO_DEPRECATION_WARNING
#ifdef __GNUC__ #ifdef __GNUC__
#define DEPRECATED __attribute__((deprecated)) #define DEPRECATED __attribute__((deprecated))
#elif defined(_MSC_VER) #elif defined(_MSC_VER)

2
JsonParserTests/GbathreeBug.cpp
View File

@ -3,8 +3,6 @@
* Benoit Blanchon 2014 - MIT License * Benoit Blanchon 2014 - MIT License
*/ */
#define ARDUINO_JSON_NO_DEPRECATED_WARNING
#include "CppUnitTest.h" #include "CppUnitTest.h"
#include "JsonParser.h" #include "JsonParser.h"
#include <string> #include <string>

6
JsonParserTests/JsonArrayIteratorTests.cpp
View File

@ -1,10 +1,14 @@
/*
* Arduino JSON library
* Benoit Blanchon 2014 - MIT License
*/
#include "CppUnitTest.h" #include "CppUnitTest.h"
#include "JsonParser.h" #include "JsonParser.h"
using namespace Microsoft::VisualStudio::CppUnitTestFramework; using namespace Microsoft::VisualStudio::CppUnitTestFramework;
using namespace ArduinoJson::Parser; using namespace ArduinoJson::Parser;
namespace JsonParserTests namespace JsonParserTests
{ {
TEST_CLASS(JsonArrayIteratorTests) TEST_CLASS(JsonArrayIteratorTests)

2
JsonParserTests/JsonArrayTests.cpp
View File

@ -3,8 +3,6 @@
* Benoit Blanchon 2014 - MIT License * Benoit Blanchon 2014 - MIT License
*/ */
#define ARDUINO_JSON_NO_DEPRECATED_WARNING
#include "CppUnitTest.h" #include "CppUnitTest.h"
#include "JsonParser.h" #include "JsonParser.h"

7
JsonParserTests/JsonObjectIteratorTests.cpp
View File

@ -1,10 +1,14 @@
/*
* Arduino JSON library
* Benoit Blanchon 2014 - MIT License
*/
#include "CppUnitTest.h" #include "CppUnitTest.h"
#include "JsonParser.h" #include "JsonParser.h"
using namespace Microsoft::VisualStudio::CppUnitTestFramework; using namespace Microsoft::VisualStudio::CppUnitTestFramework;
using namespace ArduinoJson::Parser; using namespace ArduinoJson::Parser;
namespace JsonParserTests namespace JsonParserTests
{ {
TEST_CLASS(JsonObjectIteratorTests) TEST_CLASS(JsonObjectIteratorTests)
@ -63,6 +67,5 @@ namespace JsonParserTests
index++; index++;
} }
} }
}; };
} }

2
JsonParserTests/JsonObjectTests.cpp
View File

@ -3,8 +3,6 @@
* Benoit Blanchon 2014 - MIT License * Benoit Blanchon 2014 - MIT License
*/ */
#define ARDUINO_JSON_NO_DEPRECATED_WARNING
#include "CppUnitTest.h" #include "CppUnitTest.h"
#include "JsonParser.h" #include "JsonParser.h"
#include <string> #include <string>

2
JsonParserTests/JsonParserTests.vcxproj
View File

@ -56,7 +56,7 @@
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>ARDUINO_JSON_NO_DEPRECATION_WARNING;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths> <UseFullPaths>true</UseFullPaths>
</ClCompile> </ClCompile>
<Link> <Link>