Skip to content

Commit 8da7ec3

Browse files
committed
Use terse function notation - match std::function, the optional 1st argument for C-style FP is now ONLY in 3rd template argument.
1 parent b54f63e commit 8da7ec3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

cores/esp8266/core_esp8266_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ extern "C" void __esp_delay(unsigned long ms) {
153153

154154
extern "C" void esp_delay(unsigned long ms) __attribute__((weak, alias("__esp_delay")));
155155

156-
using IsBlockedCB = Delegate<bool(void*), void*>;
156+
using IsBlockedCB = Delegate<bool(), void*>;
157157

158158
void esp_delay(const uint32_t timeout_ms, const IsBlockedCB& blocked, const uint32_t intvl_ms) {
159159
const auto start = millis();

cores/esp8266/coredecls.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ uint32_t crc32 (const void* data, size_t length, uint32_t crc = 0xffffffff);
3030

3131
#include <Delegate.h>
3232

33-
using BoolCB = Delegate<void(bool)>;
34-
using TrivialCB = Delegate<void()>;
33+
using BoolCB = Delegate<void(bool), void*>;
34+
using TrivialCB = Delegate<void(), void*>;
3535

3636
void settimeofday_cb (BoolCB&& cb);
3737
void settimeofday_cb (const BoolCB& cb);
3838
void settimeofday_cb (const TrivialCB& cb);
3939

40-
using IsBlockedCB = Delegate<bool(void*), void*>;
40+
using IsBlockedCB = Delegate<bool(), void*>;
4141

4242
inline void esp_yield(const IsBlockedCB& blocked) {
4343
do {

0 commit comments

Comments
 (0)