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

Removed implicit conversion in comparison operators (issue #998)

Browse Source
This commit is contained in:
Benoit Blanchon
2019-05-23 21:54:42 +02:00
parent 4eb8074358
commit 630107ae8a
14 changed files with 398 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ArduinoJson/Strings/ConstRamStringAdapter.hpp
View File

@@ -6,6 +6,7 @@
#include <stddef.h> // size_t
#include <string.h> // strcmp
#include "../Polyfills/safe_strcmp.hpp"
namespace ARDUINOJSON_NAMESPACE {
@@ -13,10 +14,12 @@ class ConstRamStringAdapter {
public:
ConstRamStringAdapter(const char* str = 0) : _str(str) {}
int8_t compare(const char* other) const {
return safe_strcmp(_str, other);
}
bool equals(const char* expected) const {
const char* actual = _str;
if (!actual || !expected) return actual == expected;
return strcmp(actual, expected) == 0;
return compare(expected) == 0;
}
bool isNull() const {