summaryrefslogtreecommitdiffstatshomepage
path: root/py
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-01-27 15:54:44 -0800
committerDamien George <damien.p.george@gmail.com>2014-01-27 15:54:44 -0800
commitc674f02d5c1deca3ed75763fb6261da5edb9ecbd (patch)
treeefb04acc4282e689737b9da5f3e2b8a2f59c13cf /py
parentc7aa9fcae571a442a50c90409396788dd0b28c24 (diff)
parent8d3b0a9f74c39f5876b74a5829bddf0c0588276b (diff)
downloadmicropython-c674f02d5c1deca3ed75763fb6261da5edb9ecbd.tar.gz
micropython-c674f02d5c1deca3ed75763fb6261da5edb9ecbd.zip
Merge pull request #231 from iabdalkader/master
Fix implicit double conversion warning
Diffstat (limited to 'py')
-rw-r--r--py/objcomplex.c4
-rw-r--r--py/objfloat.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/py/objcomplex.c b/py/objcomplex.c
index af148a2786..24762e8b11 100644
--- a/py/objcomplex.c
+++ b/py/objcomplex.c
@@ -24,9 +24,9 @@ mp_obj_t mp_obj_new_complex(mp_float_t real, mp_float_t imag);
void complex_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) {
mp_obj_complex_t *o = o_in;
if (o->real == 0) {
- print(env, "%.8gj", o->imag);
+ print(env, "%.8gj", (double) o->imag);
} else {
- print(env, "(%.8g+%.8gj)", o->real, o->imag);
+ print(env, "(%.8g+%.8gj)", (double) o->real, (double) o->imag);
}
}
diff --git a/py/objfloat.c b/py/objfloat.c
index 9f1f478cab..69fd65e199 100644
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -21,7 +21,7 @@ mp_obj_t mp_obj_new_float(mp_float_t value);
static void float_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t o_in, mp_print_kind_t kind) {
mp_obj_float_t *o = o_in;
- print(env, "%.8g", o->value);
+ print(env, "%.8g", (double) o->value);
}
static mp_obj_t float_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {