8000 Conform to C++ 17 and later. · dok-net/arduino-esp8266@3cd6b91 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3cd6b91

Browse files
dok-netdok-net
committed
Conform to C++ 17 and later.
1 parent 960c8f5 commit 3cd6b91

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

‎cores/esp8266/Delegate.h

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1666,12 +1666,13 @@ namespace delegate
16661666
using detail::DelegatePImpl<A, R, P...>::DelegatePImpl;
16671667
using detail::DelegatePImpl<A, R, P...>::operator=;
16681668
using detail::DelegatePImpl<A, R, P...>::operator bool;
1669-
using detail::DelegatePImpl<A, R, P...>::operator FunVPPtr;
16701669
using detail::DelegatePImpl<A, R, P...>::arg;
1670+
using detail::DelegatePImpl<A, R, P...>::operator();
1671+
1672+
operator FunVPPtr() { return detail::DelegatePImpl<A, R, P...>::operator FunVPPtr(); }
16711673
#if !defined(ARDUINO) || defined(ESP8266) || defined(ESP32)
1672-
using detail::DelegatePImpl<A, R, P...>::operator FunctionType;
1674+
operator FunctionType() { return detail::DelegatePImpl<A, R, P...>::operator FunctionType(); }
16731675
#endif
1674-
using detail::DelegatePImpl<A, R, P...>::operator();
16751676
};
16761677

16771678
template<typename R, typename A, typename... P>
@@ -1687,10 +1688,8 @@ namespace delegate
16871688
using detail::DelegatePImpl<A*, R, P...>::DelegatePImpl;
16881689
using detail::DelegatePImpl<A*, R, P...>::operator=;
16891690
using detail::DelegatePImpl<A*, R, P...>::operator bool;
1690-
#if !defined(ARDUINO) || defined(ESP8266) || defined(ESP32)
1691-
using detail::DelegatePImpl<A*, R, P...>::operator FunctionType;
1692-
#endif
16931691
using detail::DelegatePImpl<A*, R, P...>::operator();
1692+
16941693
operator FunVPPtr() const
16951694
{
16961695
if (detail::DelegatePImpl<A*, R, P...>::FPA == detail::DelegatePImpl<A*, R, P...>::kind)
@@ -1702,6 +1701,9 @@ namespace delegate
17021701
return detail::DelegatePImpl<A*, R, P...>::operator FunVPPtr();
17031702
}
17041703
}
1704+
#if !defined(ARDUINO) || defined(ESP8266) || defined(ESP32)
1705+
operator FunctionType() { return detail::DelegatePImpl<A*, R, P...>::operator FunctionType(); }
1706+
#endif
17051707
void* arg() const
17061708
{
17071709
if (detail::DelegatePImpl<A*, R, P...>::FPA == detail::DelegatePImpl<A*, R, P...>::kind)
@@ -1728,12 +1730,13 @@ namespace delegate
17281730
using detail::DelegateImpl<A, R>::DelegateImpl;
17291731
using detail::DelegateImpl<A, R>::operator=;
17301732
using detail::DelegateImpl<A, R>::operator bool;
1731-
using detail::DelegateImpl<A, R>::operator FunVPPtr;
17321733
using detail::DelegateImpl<A, R>::arg;
1734+
using detail::DelegateImpl<A, R>::operator();
1735+
1736+
operator FunVPPtr() { return detail::DelegateImpl<A, R>::operator FunVPPtr(); }
17331737
#if !defined(ARDUINO) || defined(ESP8266) || defined(ESP32)
1734-
using detail::DelegateImpl<A, R>::operator FunctionType;
1738+
operator FunctionType() { return detail::DelegateImpl<A, R>::operator FunctionType(); }
17351739
#endif
1736-
using detail::DelegateImpl<A, R>::operator();
17371740
};
17381741

17391742
template<typename R, typename A>
@@ -1749,10 +1752,8 @@ namespace delegate
17491752
using detail::DelegateImpl<A*, R>::DelegateImpl;
17501753
using detail::DelegateImpl<A*, R>::operator=;
17511754
using detail::DelegateImpl<A*, R>::operator bool;
1752-
#if !defined(ARDUINO) || defined(ESP8266) || defined(ESP32)
1753-
using detail::DelegateImpl<A*, R>::operator FunctionType;
1754-
#endif
17551755
using detail::DelegateImpl<A*, R>::operator();
1756+
17561757
operator FunVPPtr() const
17571758
{
17581759
if (detail::DelegateImpl<A*, R>::FPA == detail::DelegateImpl<A*, R>::kind)
@@ -1764,6 +1765,9 @@ namespace delegate
17641765
return detail::DelegateImpl<A*, R>::operator FunVPPtr();
17651766
}
17661767
}
1768+
#if !defined(ARDUINO) || defined(ESP8266) || defined(ESP32)
1769+
operator FunctionType() { return detail::DelegateImpl<A*, R>::operator FunctionType(); }
1770+
#endif
17671771
void* arg() const
17681772
{
17691773
if (detail::DelegateImpl<A*, R>::FPA == detail::DelegateImpl<A*, R>::kind)

0 commit comments

Comments
 (0)
0