merge from dev

This commit is contained in:
daan 2020-02-14 09:44:27 -08:00
commit 38a0f53ef7

View File

@ -26,9 +26,9 @@ terms of the MIT license. A copy of the license can be found in the file
#if (__cplusplus >= 201703)
#define mi_decl_nodiscard [[nodiscard]]
#elif (__GNUC__ >= 4)
#elif (__GNUC__ >= 4) || defined(__clang__) // includes clang, icc, and clang-cl
#define mi_decl_nodiscard __attribute__((warn_unused_result))
#elif (_MSC_VER >= 1700)
#elif (_MSC_VER >= 1700)
#define mi_decl_nodiscard _Check_return_
#else
#define mi_decl_nodiscard