From 34961f20a6a7fc892983841eec6eee4796ce7450 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Thu, 24 Mar 2016 13:58:35 -0700 Subject: [PATCH] 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. --- libmm-glib/mm-modem-oma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)); }