summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorstijn <stijn@ignitron.net>2022-03-17 12:49:38 +0100
committerDamien George <damien@micropython.org>2022-03-30 16:29:25 +1100
commit594c753c27c07df2a1b36e4eb772a6a2165eee9c (patch)
tree6ade9a8b8b38605334226115a9e07f84712c0f27
parent90aaf2dbef657e5afb8855a42d26093c3ef2a38d (diff)
downloadmicropython-594c753c27c07df2a1b36e4eb772a6a2165eee9c.tar.gz
micropython-594c753c27c07df2a1b36e4eb772a6a2165eee9c.zip
py/bc.h: Fix C++20 compilation with "volatile".
C++20 is deprecating several usages of the volatile keyword so remove this one affected case in the codebase which causes such warning.
-rw-r--r--py/bc.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/py/bc.h b/py/bc.h
index 8709b42389..3b7b625fec 100644
--- a/py/bc.h
+++ b/py/bc.h
@@ -262,7 +262,11 @@ mp_uint_t mp_decode_uint(const byte **ptr);
mp_uint_t mp_decode_uint_value(const byte *ptr);
const byte *mp_decode_uint_skip(const byte *ptr);
-mp_vm_return_kind_t mp_execute_bytecode(mp_code_state_t *code_state, volatile mp_obj_t inject_exc);
+mp_vm_return_kind_t mp_execute_bytecode(mp_code_state_t *code_state,
+#ifndef __cplusplus
+ volatile
+#endif
+ mp_obj_t inject_exc);
mp_code_state_t *mp_obj_fun_bc_prepare_codestate(mp_obj_t func, size_t n_args, size_t n_kw, const mp_obj_t *args);
void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args);
void mp_bytecode_print(const mp_print_t *print, const struct _mp_raw_code_t *rc, const mp_module_constants_t *cm);