mirror of
https://github.com/ETLCPP/etl.git
synced 2026-04-30 19:09:10 +08:00
Restore ETL_NOEXCEPT_FROM missing from merges
This commit is contained in:
parent
d14f7a66a9
commit
fa10567482
@ -344,9 +344,11 @@ SOFTWARE.
|
||||
#if ETL_USING_EXCEPTIONS
|
||||
#define ETL_NOEXCEPT noexcept
|
||||
#define ETL_NOEXCEPT_EXPR(...) noexcept(__VA_ARGS__)
|
||||
#define ETL_NOEXCEPT_FROM(x) noexcept(noexcept(x))
|
||||
#else
|
||||
#define ETL_NOEXCEPT
|
||||
#define ETL_NOEXCEPT_EXPR(...)
|
||||
#define ETL_NOEXCEPT_FROM(x)
|
||||
#endif
|
||||
#else
|
||||
#define ETL_CONSTEXPR
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user