8000 expiredOneShot() qualifed as const, despite asymmetry with expired() … · dok-net/arduino-esp8266@496d557 · GitHub
[go: up one dir, main page]

Skip to content

Commit 496d557

Browse files
committed
expiredOneShot() qualifed as const, despite asymmetry with expired() and expiredRetrigger().
_oneShotExpired qualified as mutable member. This is done as intermediate fix for use in derived class ESP8266WiFiMesh ExpiringTimeTracker.
1 parent bc16b56 commit 496d557

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

cores/esp8266/PolledTimeout.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ class timeoutTemplate
270270
}
271271

272272
IRAM_ATTR // fast
273-
bool expiredOneShot()
273+
bool expiredOneShot() const
274274
{
275275
// returns "always expired" or "has expired"
276276
if (!canWait()) return true;
@@ -285,7 +285,7 @@ class timeoutTemplate
285285
timeType _timeout;
286286
timeType _start;
287287
bool _neverExpires;
288-
bool _oneShotExpired;
288+
mutable bool _oneShotExpired;
289289
};
290290

291291
// legacy type names, deprecated (unit is milliseconds)

libraries/ESP8266WiFiMesh/src/ExpiringTimeTracker.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class ExpiringTimeTracker : private esp8266::polledTimeout::oneShotMs {
6161
* Get the time since the ExpiringTimeTracker instance creation or the last reset(), whichever is more recent.
6262
*/
6363
uint32_t elapsedTime() const;
64-
bool expired();
64+
bool expired() const;
6565
void reset();
6666
void reset(const uint32_t newDuration);
6767
void reset(const calculatorType newDurationCalculator);

0 commit comments

Comments
 (0)
0