8000 Fixed naming conflict with "CAPACITY" (issue #839) · joglosemarduino/ArduinoJson@91dd45c · GitHub
[go: up one dir, main page]
Skip to content

Commit 91dd45c

Browse files
bblanchonbblanchon
committed
Fixed naming conflict with "CAPACITY" (issue bblanchon#839)
1 parent 136ee0d commit 91dd45c

File tree

5 files changed

+52
-16
lines changed

5 files changed

+52
-16
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ HEAD
77
* Fixed warning "unused variable" with GCC 4.4 (issue #912)
88
* Fixed warning "cast increases required alignment" (issue #914)
99
* Fixed warning "conversion may alter value" (issue #914)
10+
* Fixed naming conflict with "CAPACITY" (issue #839)
1011
* Muted warning "will change in GCC 7.1" (issue #914)
1112
* Added a clear error message for `StaticJsonBuffer` and `DynamicJsonBuffer`
1213
* Marked ArduinoJson.h as a "system header"

‎src/ArduinoJson/Document/StaticJsonDocument.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,28 @@
88

99
namespace ARDUINOJSON_NAMESPACE {
1010

11-
template <size_t CAPACITY>
11+
template <size_t desiredCapacity>
1212
class StaticJsonDocument : public JsonDocument {
13-
static const size_t ACTUAL_CAPACITY =
14-
AddPadding<Max<1, CAPACITY>::value>::value;
13+
static const size_t _capacity =
14+
AddPadding<Max<1, desiredCapacity>::value>::value;
1515

1616
public:
17-
StaticJsonDocument() : JsonDocument(_buffer, ACTUAL_CAPACITY) {}
17+
StaticJsonDocument() : JsonDocument(_buffer, _capacity) {}
1818

1919
StaticJsonDocument(const StaticJsonDocument& src)
20-
: JsonDocument(_buffer, ACTUAL_CAPACITY) {
20+
: JsonDocument(_buffer, _capacity) {
2121
set(src);
2222
}
2323

2424
template <typename T>
2525
StaticJsonDocument(const T& src,
2626
typename enable_if<IsVisitable<T>::value>::type* = 0)
27-
: JsonDocument(_buffer, ACTUAL_CAPACITY) {
27+
: JsonDocument(_buffer, _capacity) {
2828
set(src);
2929
}
3030

3131
// disambiguate
32-
StaticJsonDocument(VariantRef src) : JsonDocument(_buffer, ACTUAL_CAPACITY) {
32+
StaticJsonDocument(VariantRef src) : JsonDocument(_buffer, _capacity) {
3333
set(src);
3434
}
3535

@@ -45,7 +45,7 @@ class StaticJsonDocument : public JsonDocument {
4545
}
4646

4747
private:
48-
char _buffer[ACTUAL_CAPACITY];
48+
char _buffer[_capacity];
4949
};
5050

5151
} // namespace ARDUINOJSON_NAMESPACE

‎test/Misc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# MIT License
44

55
add_executable(MiscTests
6-
empty.cpp
6+
conflicts.cpp
77
FloatParts.cpp
88
StringWriter.cpp
99
TypeTraits.cpp

‎test/Misc/conflicts.cpp

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// ArduinoJson - arduinojson.org
2+
// Copyright Benoit Blanchon 2014-2019
3+
// MIT License
4+
5+
// All cores
6+
#define bit()
7+
#define constrain()
8+
#define DEFAULT
9+
#define DISABLED
10+
#define HIGH
11+
#define INPUT
12+
#define LOW
13+
#define max()
14+
#define min()
15+
#define OUTPUT
16+
#define round()
17+
#define sq()
18+
#define word()
19+
#define bitRead()
20+
#define bitSet()
21+
#define bitClear()
22+
#define bitWrite()
23+
#define interrupts()
24+
#define lowByte()
25+
#define highByte()
26+
#define DEC
27+
#define HEX
28+
#define OCT
29+
#define BIN
30+
#define cbi()
31+
#define sbi()
32+
33+
// ESP8266
34+
#define _max()
35+
#define _min()
36+
37+
// issue #839
38+
#define BLOCKSIZE
39+
#define CAPACITY
40+
41+
// catch.hpp mutes several warnings, this file also allows to detect them
42+
#include "ArduinoJson.h"

‎test/Misc/empty.cpp

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0