Solves problems with lambdas and std::bind

dok-net · dok-net · commit 4b6020cffde9 · 2021-06-28T12:48:32.000+02:00
diff --git a/cores/esp8266/Delegate.h b/cores/esp8266/Delegate.h
@@ -102,14 +102,14 @@ namespace detail
             DelegateImpl::obj = std::move(obj);
         }
 
-        DelegateImpl(const FunctionType& functional)
+        template<typename F> DelegateImpl(const F& functional)
         {
             type = FUNC;
             new (&this->functional) FunctionType();
             DelegateImpl::functional = functional;
         }
 
-        DelegateImpl(FunctionType&& functional)
+        template<typename F> DelegateImpl(F&& functional)
         {
             type = FUNC;
             new (&this->functional) FunctionType();
@@ -164,7 +164,7 @@ namespace detail
             return *this;
         }
 
-        DelegateImpl& operator=(const FunctionType& functional)
+        template<typename F> DelegateImpl& operator=(const F& functional)
         {
             if (FUNC != type)
             {
@@ -175,7 +175,7 @@ namespace detail
             return *this;
         }
 
-        DelegateImpl& operator=(FunctionType&& functional)
+        template<typename F> DelegateImpl& operator=(F&& functional)
         {
             if (FUNC != type)
             {
@@ -284,14 +284,14 @@ namespace detail
             DelegateImpl::fn = fn;
         }
 
-        DelegateImpl(const FunctionType& functional)
+        template<typename F> DelegateImpl(const F& functional)
         {
             type = FUNC;
             new (&this->functional) FunctionType();
             DelegateImpl::functional = functional;
         }
 
-        DelegateImpl(FunctionType&& functional)
+        template<typename F> DelegateImpl(F&& functional)
         {
             type = FUNC;
             new (&this->functional) FunctionType();
@@ -344,7 +344,7 @@ namespace detail
             return *this;
         }
 
-        DelegateImpl& operator=(const FunctionType& functional)
+        template<typename F> DelegateImpl& operator=(const F& functional)
         {
             if (FUNC != type)
             {
@@ -355,7 +355,7 @@ namespace detail
             return *this;
         }
 
-        DelegateImpl& operator=(FunctionType&& functional)
+        template<typename F> DelegateImpl& operator=(F&& functional)
         {
             if (FUNC != type)
             {

Original file line number	Diff line number	Diff line change
`@@ -102,14 +102,14 @@ namespace detail`
`102`	`102`	`DelegateImpl::obj = std::move(obj);`
`103`	`103`	`}`
`104`	`104`
`105`		`- DelegateImpl(const FunctionType& functional)`
	`105`	`+ template<typename F> DelegateImpl(const F& functional)`
`106`	`106`	`{`
`107`	`107`	`type = FUNC;`
`108`	`108`	`new (&this->functional) FunctionType();`
`109`	`109`	`DelegateImpl::functional = functional;`
`110`	`110`	`}`
`111`	`111`
`112`		`- DelegateImpl(FunctionType&& functional)`
	`112`	`+ template<typename F> DelegateImpl(F&& functional)`
`113`	`113`	`{`
`114`	`114`	`type = FUNC;`
`115`	`115`	`new (&this->functional) FunctionType();`
`@@ -164,7 +164,7 @@ namespace detail`
`164`	`164`	`return *this;`
`165`	`165`	`}`
`166`	`166`
`167`		`- DelegateImpl& operator=(const FunctionType& functional)`
	`167`	`+ template<typename F> DelegateImpl& operator=(const F& functional)`
`168`	`168`	`{`
`169`	`169`	`if (FUNC != type)`
`170`	`170`	`{`
`@@ -175,7 +175,7 @@ namespace detail`
`175`	`175`	`return *this;`
`176`	`176`	`}`
`177`	`177`
`178`		`- DelegateImpl& operator=(FunctionType&& functional)`
	`178`	`+ template<typename F> DelegateImpl& operator=(F&& functional)`
`179`	`179`	`{`
`180`	`180`	`if (FUNC != type)`
`181`	`181`	`{`
`@@ -284,14 +284,14 @@ namespace detail`
`284`	`284`	`DelegateImpl::fn = fn;`
`285`	`285`	`}`
`286`	`286`
`287`		`- DelegateImpl(const FunctionType& functional)`
	`287`	`+ template<typename F> DelegateImpl(const F& functional)`
`288`	`288`	`{`
`289`	`289`	`type = FUNC;`
`290`	`290`	`new (&this->functional) FunctionType();`
`291`	`291`	`DelegateImpl::functional = functional;`
`292`	`292`	`}`
`293`	`293`
`294`		`- DelegateImpl(FunctionType&& functional)`
	`294`	`+ template<typename F> DelegateImpl(F&& functional)`
`295`	`295`	`{`
`296`	`296`	`type = FUNC;`
`297`	`297`	`new (&this->functional) FunctionType();`
`@@ -344,7 +344,7 @@ namespace detail`
`344`	`344`	`return *this;`
`345`	`345`	`}`
`346`	`346`
`347`		`- DelegateImpl& operator=(const FunctionType& functional)`
	`347`	`+ template<typename F> DelegateImpl& operator=(const F& functional)`
`348`	`348`	`{`
`349`	`349`	`if (FUNC != type)`
`350`	`350`	`{`
`@@ -355,7 +355,7 @@ namespace detail`
`355`	`355`	`return *this;`
`356`	`356`	`}`
`357`	`357`
`358`		`- DelegateImpl& operator=(FunctionType&& functional)`
	`358`	`+ template<typename F> DelegateImpl& operator=(F&& functional)`
`359`	`359`	`{`
`360`	`360`	`if (FUNC != type)`
`361`	`361`	`{`