aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2016-03-24 13:58:35 -0700
committerAleksander Morgado <aleksander@aleksander.es>2016-03-25 11:14:00 +0100
commit34961f20a6a7fc892983841eec6eee4796ce7450 (patch)
tree17324355ee20bc07b8fd6d95b59e25d16e7ae443
parent2c1230ba7ba9d70f26bc2f76198a458321283a58 (diff)
libmm-glib: fix enum conversion warning/error
mm-modem-oma.c:400:51: error: implicit conversion from enumeration type 'MMOmaSessionType' to different enumeration type 'MMOmaFeature' [-Werror,-Wenum-conversion] g_return_val_if_fail (MM_IS_MODEM_OMA (self), MM_OMA_SESSION_TYPE_UNKNOWN); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/glib-2.0/glib/gmessages.h:382:11: note: expanded from macro 'g_return_val_if_fail' return (val); \ ~~~~~~ ^~~ This should be MMOmaFeature, not MMOmaSessionType. The end result is the same, as both are 0.
-rw-r--r--libmm-glib/mm-modem-oma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmm-glib/mm-modem-oma.c b/libmm-glib/mm-modem-oma.c
index 380bb08c..77c682d9 100644
--- a/libmm-glib/mm-modem-oma.c
+++ b/libmm-glib/mm-modem-oma.c
@@ -397,7 +397,7 @@ mm_modem_oma_cancel_session_sync (MMModemOma *self,
MMOmaFeature
mm_modem_oma_get_features (MMModemOma *self)
{
- g_return_val_if_fail (MM_IS_MODEM_OMA (self), MM_OMA_SESSION_TYPE_UNKNOWN);
+ g_return_val_if_fail (MM_IS_MODEM_OMA (self), MM_OMA_FEATURE_NONE);
return (MMOmaFeature) mm_gdbus_modem_oma_get_features (MM_GDBUS_MODEM_OMA (self));
}