Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2026-01-05 03:30:14 +01:00
Code Issues Actions 52 Packages Projects Releases Wiki Activity

py/obj: Fix mp_obj_is_type compilation with C++.

Browse Source 
Fixes issue #12951.

Signed-off-by: stijn <stijn@ignitron.net>
This commit is contained in:
stijn
2023-11-13 16:04:40 +01:00
committed by Damien George
parent 92741a3438
commit a968888f69
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
py/misc.h
View File

@@ -52,10 +52,15 @@ typedef unsigned int uint;
// Static assertion macro
#define MP_STATIC_ASSERT(cond) ((void)sizeof(char[1 - 2 * !(cond)]))
#if defined(_MSC_VER)
#define MP_STATIC_ASSERT_NOT_MSC(cond) (1)
// In C++ things like comparing extern const pointers are not constant-expressions so cannot be used
// in MP_STATIC_ASSERT. Note that not all possible compiler versions will reject this. Some gcc versions
// do, others only with -Werror=vla, msvc always does.
// The (void) is needed to avoid "left operand of comma operator has no effect [-Werror=unused-value]"
// when using this macro on the left-hand side of a comma.
#if defined(_MSC_VER) || defined(__cplusplus)
#define MP_STATIC_ASSERT_NONCONSTEXPR(cond) ((void)1)
#else
#define MP_STATIC_ASSERT_NOT_MSC(cond) MP_STATIC_ASSERT(cond)
#define MP_STATIC_ASSERT_NONCONSTEXPR(cond) MP_STATIC_ASSERT(cond)
#endif
// Round-up integer division