Skip to content

Commit d21b0a2

Browse files
author
John Wellbelove
committed
Restore ETL_NOEXCEPT_FROM missing from merges
1 parent ed718a9 commit d21b0a2

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

include/etl/platform.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,9 +344,11 @@ SOFTWARE.
344344
#if ETL_USING_EXCEPTIONS
345345
#define ETL_NOEXCEPT noexcept
346346
#define ETL_NOEXCEPT_EXPR(...) noexcept(__VA_ARGS__)
347+
#define ETL_NOEXCEPT_FROM(x) noexcept(noexcept(x))
347348
#else
348349
#define ETL_NOEXCEPT
349350
#define ETL_NOEXCEPT_EXPR(...)
351+
#define ETL_NOEXCEPT_FROM(x)
350352
#endif
351353
#else
352354
#define ETL_CONSTEXPR

0 commit comments

Comments
 (0)