diff options
| author | Antonin ENFRUN <antonin.e@me.com> | 2014-05-12 00:21:50 +0200 |
|---|---|---|
| committer | Antonin ENFRUN <antonin.e@me.com> | 2014-05-12 09:06:18 +0200 |
| commit | da1fffaa093d2541f7374a7aaf16d2f00ed29ddc (patch) | |
| tree | c5060041368b8c74678f8ae0609f4a15379b2319 /py | |
| parent | ceac71f1f54220d64c87a0c2ebfd583ea49ca037 (diff) | |
| download | micropython-da1fffaa093d2541f7374a7aaf16d2f00ed29ddc.tar.gz micropython-da1fffaa093d2541f7374a7aaf16d2f00ed29ddc.zip | |
Fix some unused variables, and silence a clang warning about initialization override in vmentrytable.h
Diffstat (limited to 'py')
| -rw-r--r-- | py/modmath.c | 1 | ||||
| -rw-r--r-- | py/objexcept.c | 6 | ||||
| -rw-r--r-- | py/vmentrytable.h | 9 |
3 files changed, 14 insertions, 2 deletions
diff --git a/py/modmath.c b/py/modmath.c index f2253ab41e..485d9462a9 100644 --- a/py/modmath.c +++ b/py/modmath.c @@ -151,6 +151,7 @@ STATIC const mp_map_elem_t mp_module_math_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_copysign), (mp_obj_t)&mp_math_copysign_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_fabs), (mp_obj_t)&mp_math_fabs_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_floor), (mp_obj_t)&mp_math_floor_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_fmod), (mp_obj_t)&mp_math_fmod_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_frexp), (mp_obj_t)&mp_math_frexp_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_ldexp), (mp_obj_t)&mp_math_ldexp_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_modf), (mp_obj_t)&mp_math_modf_obj }, diff --git a/py/objexcept.c b/py/objexcept.c index 60b3565f6d..7f5f9c73d2 100644 --- a/py/objexcept.c +++ b/py/objexcept.c @@ -168,11 +168,13 @@ MP_DEFINE_EXCEPTION(Exception, BaseException) MP_DEFINE_EXCEPTION(KeyError, LookupError) MP_DEFINE_EXCEPTION(MemoryError, Exception) MP_DEFINE_EXCEPTION(NameError, Exception) + /* MP_DEFINE_EXCEPTION_BASE(NameError) - //MP_DEFINE_EXCEPTION(UnboundLocalError, NameError) + MP_DEFINE_EXCEPTION(UnboundLocalError, NameError) + */ MP_DEFINE_EXCEPTION(OSError, Exception) - MP_DEFINE_EXCEPTION_BASE(OSError) /* + MP_DEFINE_EXCEPTION_BASE(OSError) MP_DEFINE_EXCEPTION(BlockingIOError, OSError) MP_DEFINE_EXCEPTION(ChildProcessError, OSError) MP_DEFINE_EXCEPTION(ConnectionError, OSError) diff --git a/py/vmentrytable.h b/py/vmentrytable.h index 217d84d3fd..598b5b8726 100644 --- a/py/vmentrytable.h +++ b/py/vmentrytable.h @@ -24,6 +24,11 @@ * THE SOFTWARE. */ +#if __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Winitializer-overrides" +#endif // __clang__ + static void* entry_table[256] = { [0 ... 255] = &&entry_default, [MP_BC_LOAD_CONST_FALSE] = &&entry_MP_BC_LOAD_CONST_FALSE, @@ -110,3 +115,7 @@ static void* entry_table[256] = { [MP_BC_IMPORT_FROM] = &&entry_MP_BC_IMPORT_FROM, [MP_BC_IMPORT_STAR] = &&entry_MP_BC_IMPORT_STAR, }; + +#if __clang__ +#pragma clang diagnostic pop +#endif // __clang__ |