aboutsummaryrefslogtreecommitdiff
path: root/extmod
diff options
context:
space:
mode:
authorDamien George2014-07-31 13:47:06 +0000
committerDamien George2014-07-31 13:47:06 +0000
commit8cc2018d47bc15a1b10295965fc0ccd27c0dcbba (patch)
tree5e8ba4bed5de1f1973203b9cff2c8aab78b419fc /extmod
parentc9aa58e6381018cca2513e3468363af0b5442d1f (diff)
parentbb4c6f35c627ab3487cdd6bafb4588cc633cd6a4 (diff)
Merge branch 'master' of https://github.com/micropython/micropython
Diffstat (limited to 'extmod')
-rw-r--r--extmod/moductypes.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index dd78102ae..3fffd98e4 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -296,13 +296,13 @@ static inline void set_aligned_basic(uint val_type, void *p, mp_uint_t v) {
STATIC mp_obj_t get_aligned(uint val_type, void *p, mp_int_t index) {
switch (val_type) {
case UINT8:
- return MP_OBJ_NEW_SMALL_INT((mp_int_t)((uint8_t*)p)[index]);
+ return MP_OBJ_NEW_SMALL_INT(((uint8_t*)p)[index]);
case INT8:
- return MP_OBJ_NEW_SMALL_INT((mp_int_t)((int8_t*)p)[index]);
+ return MP_OBJ_NEW_SMALL_INT(((int8_t*)p)[index]);
case UINT16:
- return MP_OBJ_NEW_SMALL_INT((mp_int_t)((uint16_t*)p)[index]);
+ return MP_OBJ_NEW_SMALL_INT(((uint16_t*)p)[index]);
case INT16:
- return MP_OBJ_NEW_SMALL_INT((mp_int_t)((int16_t*)p)[index]);
+ return MP_OBJ_NEW_SMALL_INT(((int16_t*)p)[index]);
case UINT32:
return mp_obj_new_int_from_uint(((uint32_t*)p)[index]);
case INT32: