Verified Commit 12e4a4a5 authored by Thomas Haller's avatar Thomas Haller

modem: suppress deprecated warning from libmm for MM_MODEM_CAPABILITY_LTE_ADVANCED

On Ubuntu 20.10, we build against ModemManager 1.14.0 and get a compiler warning:

  ../src/devices/wwan/nm-modem-broadband.c: In function 'try_create_connect_properties':
  ../src/devices/wwan/nm-modem-broadband.c:492:2: error: 'MMModemCapabilityDeprecated' is deprecated [-Werror=deprecated-declarations]
    492 |  if (MODEM_CAPS_3GPP (ctx->caps)) {
        |  ^~

Suppress it.

An alternative would be to drop the flag entirely. It seems the flag
was never used (and never will be used). But if that's true, there is
little harm done checking it. If it's not true, we better keep checking
for older versions.

mobile-broadband/ModemManager@0cd76bf1
(cherry picked from commit 03dc7590)
parent e2492625
Pipeline #169472 passed with stage
in 87 minutes and 26 seconds
......@@ -20,9 +20,22 @@
#define NM_MODEM_BROADBAND_MODEM "modem"
#define MODEM_CAPS_3GPP(caps) (caps & (MM_MODEM_CAPABILITY_GSM_UMTS | \
MM_MODEM_CAPABILITY_LTE | \
MM_MODEM_CAPABILITY_LTE_ADVANCED))
static gboolean
MODEM_CAPS_3GPP (MMModemCapability caps)
{
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
/* MM_MODEM_CAPABILITY_LTE_ADVANCED is marked as deprecated since ModemManager 1.14.0.
*
* The flag probably was never used, it certainly isn't used since 1.14.0.
*
* Still, just to be sure, there is no harm in checking it here. Suppress the
* warning, it should have no bad effect.
*/
return NM_FLAGS_ANY (caps, ( MM_MODEM_CAPABILITY_GSM_UMTS
| MM_MODEM_CAPABILITY_LTE
| MM_MODEM_CAPABILITY_LTE_ADVANCED));
G_GNUC_END_IGNORE_DEPRECATIONS
}
#define MODEM_CAPS_3GPP2(caps) (caps & (MM_MODEM_CAPABILITY_CDMA_EVDO))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment