summaryrefslogtreecommitdiff
path: root/py/obj.h
diff options
context:
space:
mode:
authorstijn <stijn@ignitron.net>2023-11-13 16:04:40 +0100
committerDamien George <damien@micropython.org>2023-11-17 14:31:42 +1100
commita968888f69d94890e8851efe38ace3b9448552d7 (patch)
tree7ac93b59f763373e589bd27be4e235b46d29e4ef /py/obj.h
parent92741a34388e85d07e26511ff81b27af99445f00 (diff)
py/obj: Fix mp_obj_is_type compilation with C++.
Fixes issue #12951. Signed-off-by: stijn <stijn@ignitron.net>
Diffstat (limited to 'py/obj.h')
-rw-r--r--py/obj.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/py/obj.h b/py/obj.h
index 56ae62172..c7b7db0c3 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -928,10 +928,10 @@ void *mp_obj_malloc_helper(size_t num_bytes, const mp_obj_type_t *type);
// optimizations (other tricks like using ({ expr; exper; }) or (exp, expr, expr) in mp_obj_is_type() result
// in missed optimizations)
#define mp_type_assert_not_bool_int_str_nonetype(t) ( \
- MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_bool), assert((t) != &mp_type_bool), \
- MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_int), assert((t) != &mp_type_int), \
- MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_str), assert((t) != &mp_type_str), \
- MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_NoneType), assert((t) != &mp_type_NoneType), \
+ MP_STATIC_ASSERT_NONCONSTEXPR((t) != &mp_type_bool), assert((t) != &mp_type_bool), \
+ MP_STATIC_ASSERT_NONCONSTEXPR((t) != &mp_type_int), assert((t) != &mp_type_int), \
+ MP_STATIC_ASSERT_NONCONSTEXPR((t) != &mp_type_str), assert((t) != &mp_type_str), \
+ MP_STATIC_ASSERT_NONCONSTEXPR((t) != &mp_type_NoneType), assert((t) != &mp_type_NoneType), \
1)
#define mp_obj_is_type(o, t) (mp_type_assert_not_bool_int_str_nonetype(t) && mp_obj_is_exact_type(o, t))