Merge remote-tracking branches 'neheb/j', 'neheb/f', 'neheb/qwe' and 'neheb/hgf'

src/lib/upnp/ContentDirectoryService.cxx

@@ -44,10 +44,8 @@ ContentDirectoryService::ContentDirectoryService(const UPnPDevice &device,
 	}
 }
 
-ContentDirectoryService::~ContentDirectoryService() noexcept
-{
-	/* this destructor exists here just so it won't get inlined */
-}
+/* this destructor exists here just so it won't get inlined */
+ContentDirectoryService::~ContentDirectoryService() noexcept = default;
 
 std::forward_list<std::string>
 ContentDirectoryService::getSearchCapabilities(UpnpClient_Handle hdl) const

src/lib/upnp/Device.cxx

@@ -23,10 +23,8 @@
 
 #include <string.h>
 
-UPnPDevice::~UPnPDevice() noexcept
-{
-	/* this destructor exists here just so it won't get inlined */
-}
+/* this destructor exists here just so it won't get inlined */
+UPnPDevice::~UPnPDevice() noexcept = default;
 
 /**
  * An XML parser which constructs an UPnP device object from the

src/lib/upnp/ixmlwrap.cxx

@@ -38,4 +38,4 @@ getFirstElementValue(IXML_Document *doc, const char *name) noexcept
 	return ixmlNode_getNodeValue(dnode);
 }
 
-}
+} // namespace ixmlwrap