From cb9c90f2d06aa2d523e2b0f91c740b57d9d4cb54 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Mon, 26 Dec 2022 10:23:48 +0100 Subject: [PATCH] Mark adapter's `storagePolicy()` as `const` --- src/ArduinoJson/Strings/Adapters/FlashString.hpp | 2 +- src/ArduinoJson/Strings/Adapters/JsonString.hpp | 2 +- src/ArduinoJson/Strings/Adapters/RamString.hpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ArduinoJson/Strings/Adapters/FlashString.hpp b/src/ArduinoJson/Strings/Adapters/FlashString.hpp index efefdb29..ccd07bfa 100644 --- a/src/ArduinoJson/Strings/Adapters/FlashString.hpp +++ b/src/ArduinoJson/Strings/Adapters/FlashString.hpp @@ -61,7 +61,7 @@ class FlashString { ::memcpy_P(p, s._str, n); } - StringStoragePolicy::Copy storagePolicy() { + StringStoragePolicy::Copy storagePolicy() const { return StringStoragePolicy::Copy(); } diff --git a/src/ArduinoJson/Strings/Adapters/JsonString.hpp b/src/ArduinoJson/Strings/Adapters/JsonString.hpp index 69c18d11..eb203ba2 100644 --- a/src/ArduinoJson/Strings/Adapters/JsonString.hpp +++ b/src/ArduinoJson/Strings/Adapters/JsonString.hpp @@ -15,7 +15,7 @@ class JsonStringAdapter : public SizedRamString { JsonStringAdapter(const JsonString& s) : SizedRamString(s.c_str(), s.size()), _linked(s.isLinked()) {} - StringStoragePolicy::LinkOrCopy storagePolicy() { + StringStoragePolicy::LinkOrCopy storagePolicy() const { StringStoragePolicy::LinkOrCopy policy = {_linked}; return policy; } diff --git a/src/ArduinoJson/Strings/Adapters/RamString.hpp b/src/ArduinoJson/Strings/Adapters/RamString.hpp index 7a77a296..164478ef 100644 --- a/src/ArduinoJson/Strings/Adapters/RamString.hpp +++ b/src/ArduinoJson/Strings/Adapters/RamString.hpp @@ -53,7 +53,7 @@ class ZeroTerminatedRamString { return stringCompare(a, b) == 0; } - StringStoragePolicy::Copy storagePolicy() { + StringStoragePolicy::Copy storagePolicy() const { return StringStoragePolicy::Copy(); } @@ -83,7 +83,7 @@ class StaticStringAdapter : public ZeroTerminatedRamString { public: StaticStringAdapter(const char* str) : ZeroTerminatedRamString(str) {} - StringStoragePolicy::Link storagePolicy() { + StringStoragePolicy::Link storagePolicy() const { return StringStoragePolicy::Link(); } }; @@ -121,7 +121,7 @@ class SizedRamString { return _str; } - StringStoragePolicy::Copy storagePolicy() { + StringStoragePolicy::Copy storagePolicy() const { return StringStoragePolicy::Copy(); }