diff options
| author | Michael Biebl <biebl@debian.org> | 2020-06-28 18:59:08 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2020-06-28 18:59:08 +0200 |
| commit | 215112eefc83274273a10d9ddb5e107c9beec548 (patch) | |
| tree | a16052cef4bb8707d6a906dd784a50c75945d03e /src/devices/nm-device-macvlan.c | |
| parent | 5ed4e66e01b005212aee22c255c9c6b2a4b040a9 (diff) | |
| parent | a54ac63bbf9b2c71026ac9028a8ffaf186cf3c82 (diff) | |
Update upstream source from tag 'upstream/1.25.90'
Update to upstream version '1.25.90' with Debian dir 16d4caa71e8ba8c27ee163c88f11456b6cdc0490
Diffstat (limited to 'src/devices/nm-device-macvlan.c')
| -rw-r--r-- | src/devices/nm-device-macvlan.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c index 2f8c4c32..3435df1b 100644 --- a/src/devices/nm-device-macvlan.c +++ b/src/devices/nm-device-macvlan.c @@ -462,16 +462,16 @@ nm_device_macvlan_init (NMDeviceMacvlan *self) { } +#if NM_MORE_ASSERTS static void dispose (GObject *object) { - NMDeviceMacvlanPrivate *priv = NM_DEVICE_MACVLAN_GET_PRIVATE (object); - G_OBJECT_CLASS (nm_device_macvlan_parent_class)->dispose (object); - nm_assert (priv->parent_state_id == 0); - nm_assert (priv->parent_mtu_id == 0); + nm_assert (NM_DEVICE_MACVLAN_GET_PRIVATE (object)->parent_state_id == 0); + nm_assert (NM_DEVICE_MACVLAN_GET_PRIVATE (object)->parent_mtu_id == 0); } +#endif static const NMDBusInterfaceInfoExtended interface_info_device_macvlan = { .parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT ( @@ -496,7 +496,9 @@ nm_device_macvlan_class_init (NMDeviceMacvlanClass *klass) NMDBusObjectClass *dbus_object_class = NM_DBUS_OBJECT_CLASS (klass); NMDeviceClass *device_class = NM_DEVICE_CLASS (klass); +#if NM_MORE_ASSERTS object_class->dispose = dispose; +#endif object_class->get_property = get_property; object_class->set_property = set_property; |