feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Remove safe bool idiom (#1820)

Browse Source
This commit is contained in:
Benoit Blanchon
2023-02-13 11:12:41 +01:00
parent 8f7211a50f
commit 34dd46110b
3 changed files with 8 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ArduinoJson/Deserialization/DeserializationError.hpp
View File

@ -4,7 +4,6 @@
#pragma once #pragma once
#include <ArduinoJson/Misc/SafeBoolIdiom.hpp>
#include <ArduinoJson/Namespace.hpp> #include <ArduinoJson/Namespace.hpp>
#include <ArduinoJson/Polyfills/pgmspace_generic.hpp> #include <ArduinoJson/Polyfills/pgmspace_generic.hpp>
#include <ArduinoJson/Polyfills/preprocessor.hpp> #include <ArduinoJson/Polyfills/preprocessor.hpp>
@ -15,7 +14,7 @@
namespace ARDUINOJSON_NAMESPACE { namespace ARDUINOJSON_NAMESPACE {
class DeserializationError : public SafeBoolIdom<DeserializationError> { class DeserializationError {
public: public:
enum Code { enum Code {
Ok, Ok,
@ -53,9 +52,9 @@ class DeserializationError : public SafeBoolIdom<DeserializationError> {
return lhs != rhs._code; return lhs != rhs._code;
} }
// Behaves like a bool // Returns true if there is an error
operator bool_type() const { explicit operator bool() const {
return _code != Ok ? safe_true() : safe_false(); return _code != Ok;
} }
// Returns internal enum, useful for switch statement // Returns internal enum, useful for switch statement

26
src/ArduinoJson/Misc/SafeBoolIdiom.hpp
View File

@ -1,26 +0,0 @@
// ArduinoJson - https://arduinojson.org
// Copyright © 2014-2022, Benoit BLANCHON
// MIT License
#pragma once
#include <ArduinoJson/Polyfills/type_traits.hpp>
namespace ARDUINOJSON_NAMESPACE {
template <typename T>
class SafeBoolIdom {
protected:
typedef void (T::*bool_type)() const;
void safeBoolHelper() const {}
static bool_type safe_true() {
return &SafeBoolIdom::safeBoolHelper;
}
static bool_type safe_false() {
return 0;
}
};
} // namespace ARDUINOJSON_NAMESPACE

10
src/ArduinoJson/Strings/JsonString.hpp
View File

@ -4,8 +4,6 @@
#pragma once #pragma once
#include <ArduinoJson/Misc/SafeBoolIdiom.hpp>
#if ARDUINOJSON_ENABLE_STD_STREAM #if ARDUINOJSON_ENABLE_STD_STREAM
# include <ostream> # include <ostream>
#endif #endif
@ -14,7 +12,7 @@ namespace ARDUINOJSON_NAMESPACE {
// A string. // A string.
// https://arduinojson.org/v6/api/jsonstring/ // https://arduinojson.org/v6/api/jsonstring/
class JsonString : public SafeBoolIdom<JsonString> { class JsonString {
public: public:
enum Ownership { Copied, Linked }; enum Ownership { Copied, Linked };
@ -47,9 +45,9 @@ class JsonString : public SafeBoolIdom<JsonString> {
return _size; return _size;
} }
// safe bool idiom // Returns true if the string is non-null
operator bool_type() const { explicit operator bool() const {
return _data ? safe_true() : safe_false(); return _data != 0;
} }
// Returns true if strings are equal. // Returns true if strings are equal.