github-mirrors/thirdparty-ArduinoJson
1
0
Fork 0
mirror of https://github.com/eledio-devices/thirdparty-ArduinoJson.git synced 2025-11-01 00:38:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renamed DEPRECATED to ARDUINOJSON_DEPRECATED

Browse Source
This commit is contained in:
Benoit Blanchon
2021-05-04 14:35:14 +02:00
parent a88cf8fab7
commit ab23625091
5 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extras/tests/Misc/deprecated.cpp
View File

@@ -2,17 +2,11 @@
// Copyright Benoit Blanchon 2014-2021 // Copyright Benoit Blanchon 2014-2021
// MIT License // MIT License
#define ARDUINOJSON_DEPRECATED(msg) // nothing
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include <catch.hpp> #include <catch.hpp>
#if defined(__GNUC__)
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
#ifdef _MSC_VER
#pragma warning(disable : 4996) // deprecation warning
#endif
TEST_CASE("Deprecated features") { TEST_CASE("Deprecated features") {
StaticJsonDocument<256> doc; StaticJsonDocument<256> doc;
const char* s = "hello"; const char* s = "hello";

3
src/ArduinoJson/Array/ElementProxy.hpp
View File

@@ -72,7 +72,8 @@ class ElementProxy : public VariantOperators<ElementProxy<TArray> >,
template <typename T> template <typename T>
FORCE_INLINE typename enable_if<is_same<T, char*>::value, const char*>::type FORCE_INLINE typename enable_if<is_same<T, char*>::value, const char*>::type
DEPRECATED("Replace as<char*>() with as<const char*>()") as() const { ARDUINOJSON_DEPRECATED("Replace as<char*>() with as<const char*>()")
as() const {
return as<const char*>(); return as<const char*>();
} }

3
src/ArduinoJson/Object/MemberProxy.hpp
View File

@@ -75,7 +75,8 @@ class MemberProxy : public VariantOperators<MemberProxy<TObject, TStringRef> >,
template <typename T> template <typename T>
FORCE_INLINE typename enable_if<is_same<T, char *>::value, const char *>::type FORCE_INLINE typename enable_if<is_same<T, char *>::value, const char *>::type
DEPRECATED("Replace as<char*>() with as<const char*>()") as() const { ARDUINOJSON_DEPRECATED("Replace as<char*>() with as<const char*>()")
as() const {
return as<const char *>(); return as<const char *>();
} }

17
src/ArduinoJson/Polyfills/attributes.hpp
View File

@@ -8,23 +8,32 @@
#define FORCE_INLINE // __forceinline causes C4714 when returning std::string #define FORCE_INLINE // __forceinline causes C4714 when returning std::string
#define NO_INLINE __declspec(noinline) #define NO_INLINE __declspec(noinline)
#define DEPRECATED(msg) __declspec(deprecated(msg))
#ifndef ARDUINOJSON_DEPRECATED
#define ARDUINOJSON_DEPRECATED(msg) __declspec(deprecated(msg))
#endif
#elif defined(__GNUC__) // GCC or Clang #elif defined(__GNUC__) // GCC or Clang
#define FORCE_INLINE __attribute__((always_inline)) #define FORCE_INLINE __attribute__((always_inline))
#define NO_INLINE __attribute__((noinline)) #define NO_INLINE __attribute__((noinline))
#ifndef ARDUINOJSON_DEPRECATED
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
#define DEPRECATED(msg) __attribute__((deprecated(msg))) #define ARDUINOJSON_DEPRECATED(msg) __attribute__((deprecated(msg)))
#else #else
#define DEPRECATED(msg) __attribute__((deprecated)) #define ARDUINOJSON_DEPRECATED(msg) __attribute__((deprecated))
#endif
#endif #endif
#else // Other compilers #else // Other compilers
#define FORCE_INLINE #define FORCE_INLINE
#define NO_INLINE #define NO_INLINE
#define DEPRECATED(msg)
#ifndef ARDUINOJSON_DEPRECATED
#define ARDUINOJSON_DEPRECATED(msg)
#endif
#endif #endif

6
src/ArduinoJson/Variant/VariantRef.hpp
View File

@@ -101,7 +101,8 @@ class VariantRef : public VariantRefBase<VariantData>,
template <typename T> template <typename T>
FORCE_INLINE typename enable_if<is_same<T, char *>::value, const char *>::type FORCE_INLINE typename enable_if<is_same<T, char *>::value, const char *>::type
DEPRECATED("Replace as<char*>() with as<const char*>()") as() const { ARDUINOJSON_DEPRECATED("Replace as<char*>() with as<const char*>()")
as() const {
return as<const char *>(); return as<const char *>();
} }
@@ -218,7 +219,8 @@ class VariantConstRef : public VariantRefBase<const VariantData>,
template <typename T> template <typename T>
FORCE_INLINE typename enable_if<is_same<T, char *>::value, const char *>::type FORCE_INLINE typename enable_if<is_same<T, char *>::value, const char *>::type
DEPRECATED("Replace as<char*>() with as<const char*>()") as() const { ARDUINOJSON_DEPRECATED("Replace as<char*>() with as<const char*>()")
as() const {
return as<const char *>(); return as<const char *>();
} }