Skip to content

Change variable name so doesn't cause issues on Zephyr OS #1561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Change variable name so doesn't cause issues on Zephyr OS #1561

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/ArduinoJson/Json/Latch.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ class Latch {
}

int last() const {
return _current;
return __current;
}

FORCE_INLINE char current() {
if (!_loaded) {
load();
}
return _current;
return __current;
}

private:
Expand All @@ -40,12 +40,12 @@ class Latch {
if (c <= 0)
_ended = true;
#endif
_current = static_cast<char>(c > 0 ? c : 0);
__current = static_cast<char>(c > 0 ? c : 0);
_loaded = true;
}

TReader _reader;
char _current;
char __current;
bool _loaded;
#if ARDUINOJSON_DEBUG
bool _ended;
Expand Down