colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

device: fix compilation error "--without-more-asserts"

Browse Source 
Defining the name "dispose" breaks

   object_class->dispose = dispose;

below.

Fixes: fdba9200c0 ('device: avoid coverity warning about unused variable')
This commit is contained in:
Thomas Haller
2020-05-07 11:14:26 +02:00
parent be3549abbd
commit d170f8b7f2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/devices/nm-device-macvlan.c
View File

@@ -471,8 +471,6 @@ dispose (GObject *object)
nm_assert (NM_DEVICE_MACVLAN_GET_PRIVATE (object)->parent_state_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); nm_assert (NM_DEVICE_MACVLAN_GET_PRIVATE (object)->parent_mtu_id == 0);
} }
#else
#define dispose ((void (*) (GObject *object)) NULL)
#endif #endif
static const NMDBusInterfaceInfoExtended interface_info_device_macvlan = { static const NMDBusInterfaceInfoExtended interface_info_device_macvlan = {
@@ -498,7 +496,9 @@ nm_device_macvlan_class_init (NMDeviceMacvlanClass *klass)
NMDBusObjectClass *dbus_object_class = NM_DBUS_OBJECT_CLASS (klass); NMDBusObjectClass *dbus_object_class = NM_DBUS_OBJECT_CLASS (klass);
NMDeviceClass *device_class = NM_DEVICE_CLASS (klass); NMDeviceClass *device_class = NM_DEVICE_CLASS (klass);
#if NM_MORE_ASSERTS
object_class->dispose = dispose; object_class->dispose = dispose;
#endif
object_class->get_property = get_property; object_class->get_property = get_property;
object_class->set_property = set_property; object_class->set_property = set_property;