Constness fix for iterator dereference

dok-net · dok-net · commit 57a87ca97f46 · 2021-06-28T12:48:39.000+02:00
diff --git a/cores/esp8266/MultiDelegate.h b/cores/esp8266/MultiDelegate.h
@@ -244,11 +244,11 @@ namespace delegate
                 bool operator!=(const iterator& rhs) const {
                     return !operator==(rhs);
                 }
-                const Delegate& operator*() const
+                Delegate& operator*() const
                 {
                     return current->mDelegate;
                 }
-                const Delegate* const operator->() const
+                Delegate* const operator->() const
                 {
                     return &current->mDelegate;
                 }
@@ -349,7 +349,7 @@ namespace delegate
                 auto it = begin();
                 while (it)
                 {
-                    if (del == &it.current->mDelegate)
+                    if (del == &(*it))
                     {
                         erase(it);
                         return true;
@@ -382,7 +382,7 @@ namespace delegate
                 R result;
                 do
                 {
-                    result = CallP<Delegate, R, ISQUEUE, P...>::execute(it.current->mDelegate, args...);
+                    result = CallP<Delegate, R, ISQUEUE, P...>::execute(*it, args...);
                     if (result && ISQUEUE)
                         it = erase(it);
                     else
@@ -422,7 +422,7 @@ namespace delegate
                 R result;
                 do
                 {
-                    result = Call<Delegate, R, ISQUEUE>::execute(it.current->mDelegate);
+                    result = Call<Delegate, R, ISQUEUE>::execute(*it);
                     if (result && ISQUEUE)
                         it = this->erase(it);
                     else
@@ -477,7 +477,7 @@ namespace delegate
 
                 do
                 {
-                    CallP<Delegate, void, ISQUEUE, P...>::execute(it.current->mDelegate, args...);
+                    CallP<Delegate, void, ISQUEUE, P...>::execute(*it, args...);
                     if (ISQUEUE)
                         it = this->erase(it);
                     else
@@ -515,7 +515,7 @@ namespace delegate
 
                 do
                 {
-                    Call<Delegate, void, ISQUEUE>::execute(it.current->mDelegate);
+                    Call<Delegate, void, ISQUEUE>::execute(*it);
                     if (ISQUEUE)
                         it = this->erase(it);
                     else

Original file line number	Diff line number	Diff line change
`@@ -244,11 +244,11 @@ namespace delegate`
`244`	`244`	`bool operator!=(const iterator& rhs) const {`
`245`	`245`	`return !operator==(rhs);`
`246`	`246`	`}`
`247`		`- const Delegate& operator*() const`
	`247`	`+ Delegate& operator*() const`
`248`	`248`	`{`
`249`	`249`	`return current->mDelegate;`
`250`	`250`	`}`
`251`		`- const Delegate* const operator->() const`
	`251`	`+ Delegate* const operator->() const`
`252`	`252`	`{`
`253`	`253`	`return &current->mDelegate;`
`254`	`254`	`}`
`@@ -349,7 +349,7 @@ namespace delegate`
`349`	`349`	`auto it = begin();`
`350`	`350`	`while (it)`
`351`	`351`	`{`
`352`		`- if (del == &it.current->mDelegate)`
	`352`	`+ if (del == &(*it))`
`353`	`353`	`{`
`354`	`354`	`erase(it);`
`355`	`355`	`return true;`
`@@ -382,7 +382,7 @@ namespace delegate`
`382`	`382`	`R result;`
`383`	`383`	`do`
`384`	`384`	`{`
`385`		`- result = CallP<Delegate, R, ISQUEUE, P...>::execute(it.current->mDelegate, args...);`
	`385`	`+ result = CallP<Delegate, R, ISQUEUE, P...>::execute(*it, args...);`
`386`	`386`	`if (result && ISQUEUE)`
`387`	`387`	`it = erase(it);`
`388`	`388`	`else`
`@@ -422,7 +422,7 @@ namespace delegate`
`422`	`422`	`R result;`
`423`	`423`	`do`
`424`	`424`	`{`
`425`		`- result = Call<Delegate, R, ISQUEUE>::execute(it.current->mDelegate);`
	`425`	`+ result = Call<Delegate, R, ISQUEUE>::execute(*it);`
`426`	`426`	`if (result && ISQUEUE)`
`427`	`427`	`it = this->erase(it);`
`428`	`428`	`else`
`@@ -477,7 +477,7 @@ namespace delegate`
`477`	`477`
`478`	`478`	`do`
`479`	`479`	`{`
`480`		`- CallP<Delegate, void, ISQUEUE, P...>::execute(it.current->mDelegate, args...);`
	`480`	`+ CallP<Delegate, void, ISQUEUE, P...>::execute(*it, args...);`
`481`	`481`	`if (ISQUEUE)`
`482`	`482`	`it = this->erase(it);`
`483`	`483`	`else`
`@@ -515,7 +515,7 @@ namespace delegate`
`515`	`515`
`516`	`516`	`do`
`517`	`517`	`{`
`518`		`- Call<Delegate, void, ISQUEUE>::execute(it.current->mDelegate);`
	`518`	`+ Call<Delegate, void, ISQUEUE>::execute(*it);`
`519`	`519`	`if (ISQUEUE)`
`520`	`520`	`it = this->erase(it);`
`521`	`521`	`else`