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

Fixed naming conflict with "CAPACITY" (issue #839)

Browse Source
This commit is contained in:
Benoit Blanchon
2019-03-01 18:11:27 +01:00
parent 136ee0d576
commit 91dd45c387
5 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ArduinoJson/Document/StaticJsonDocument.hpp
View File

@ -8,28 +8,28 @@
namespace ARDUINOJSON_NAMESPACE {
template <size_t CAPACITY>
template <size_t desiredCapacity>
class StaticJsonDocument : public JsonDocument {
static const size_t ACTUAL_CAPACITY =
AddPadding<Max<1, CAPACITY>::value>::value;
static const size_t _capacity =
AddPadding<Max<1, desiredCapacity>::value>::value;
public:
StaticJsonDocument() : JsonDocument(_buffer, ACTUAL_CAPACITY) {}
StaticJsonDocument() : JsonDocument(_buffer, _capacity) {}
StaticJsonDocument(const StaticJsonDocument& src)
: JsonDocument(_buffer, ACTUAL_CAPACITY) {
: JsonDocument(_buffer, _capacity) {
set(src);
}
template <typename T>
StaticJsonDocument(const T& src,
typename enable_if<IsVisitable<T>::value>::type* = 0)
: JsonDocument(_buffer, ACTUAL_CAPACITY) {
: JsonDocument(_buffer, _capacity) {
set(src);
}
// disambiguate
StaticJsonDocument(VariantRef src) : JsonDocument(_buffer, ACTUAL_CAPACITY) {
StaticJsonDocument(VariantRef src) : JsonDocument(_buffer, _capacity) {
set(src);
}
@ -45,7 +45,7 @@ class StaticJsonDocument : public JsonDocument {
}
private:
char _buffer[ACTUAL_CAPACITY];
char _buffer[_capacity];
};
} // namespace ARDUINOJSON_NAMESPACE