build: disable `-Wnon-virtual-dtor` compiler warning
It's overkill and suffers from annoying false positives that
prevent us from applying the "protected non-virtual destructor"
idiom in several perfectly valid cases. See for instance the
GCC bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102168
The -Wdelete-non-virtual-dtor warning (included in -Wall) is
the preferred alternative and is enough to catch the unsafe
cases without false positives.
Partially reverts 847de408cbb2358bbb664d971cc33e73b0b2ef7f
Change-Id: I46ee1f01e7d4e2b125c2c534c6550824ba1de4c0
diff --git a/daemon/face/ethernet-factory.cpp b/daemon/face/ethernet-factory.cpp
index ee887c0..f7fb63f 100644
--- a/daemon/face/ethernet-factory.cpp
+++ b/daemon/face/ethernet-factory.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2022, Regents of the University of California,
+ * Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -47,8 +47,8 @@
: ProtocolFactory(params)
{
m_netifAddConn = netmon->onInterfaceAdded.connect([this] (const auto& netif) {
- this->applyUnicastConfigToNetif(netif);
- this->applyMcastConfigToNetif(*netif);
+ applyUnicastConfigToNetif(netif);
+ applyMcastConfigToNetif(*netif);
});
}
@@ -157,11 +157,11 @@
}
}
- // Even if there's no configuration change, we still need to re-apply configuration because
- // netifs may have changed.
- m_unicastConfig = unicastConfig;
- m_mcastConfig = mcastConfig;
- this->applyConfig(context);
+ // Even if there are no configuration changes, we still need to re-apply
+ // the configuration because netifs may have changed.
+ m_unicastConfig = std::move(unicastConfig);
+ m_mcastConfig = std::move(mcastConfig);
+ applyConfig(context);
}
void
@@ -347,6 +347,7 @@
// new face: register with forwarding
this->addFace(face);
}
+
return face;
}
@@ -366,9 +367,9 @@
// create channels and multicast faces if requested by config
for (const auto& netif : netmon->listNetworkInterfaces()) {
- this->applyUnicastConfigToNetif(netif);
+ applyUnicastConfigToNetif(netif);
- auto face = this->applyMcastConfigToNetif(*netif);
+ auto face = applyMcastConfigToNetif(*netif);
if (face != nullptr) {
// don't destroy face
oldFaces.erase(face);