summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-11-18 14:08:45 (GMT)
committerTobias Markmann <tm@ayena.de>2015-11-18 14:08:45 (GMT)
commitcda6fd478b3d8f7f30f771b18324db389a01b1b3 (patch)
tree2d71e6787a0e937701968b5ce440f01c74c911ca /Swiften/Network/PlatformDomainNameResolver.h
parenteb2cdc07f275d565b76940396381784e29125981 (diff)
downloadswift-cda6fd478b3d8f7f30f771b18324db389a01b1b3.zip
swift-cda6fd478b3d8f7f30f771b18324db389a01b1b3.tar.bz2
Fix virtual destructors and mismatching signal disconnection
Test-Information: Unit tests pass on OS X 10.10.5. Change-Id: I7b505513b4342001596ee8518bfdcf9e77c91479
Diffstat (limited to 'Swiften/Network/PlatformDomainNameResolver.h')
-rw-r--r--Swiften/Network/PlatformDomainNameResolver.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/Swiften/Network/PlatformDomainNameResolver.h b/Swiften/Network/PlatformDomainNameResolver.h
index e2d28a9..ae94179 100644
--- a/Swiften/Network/PlatformDomainNameResolver.h
+++ b/Swiften/Network/PlatformDomainNameResolver.h
@@ -7,16 +7,17 @@
#pragma once
#include <deque>
-#include <boost/thread/thread.hpp>
-#include <boost/thread/mutex.hpp>
+
#include <boost/thread/condition_variable.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
#include <Swiften/Base/API.h>
#include <Swiften/Base/Atomic.h>
+#include <Swiften/Network/DomainNameAddressQuery.h>
#include <Swiften/Network/DomainNameResolver.h>
-#include <Swiften/Network/PlatformDomainNameQuery.h>
#include <Swiften/Network/DomainNameServiceQuery.h>
-#include <Swiften/Network/DomainNameAddressQuery.h>
+#include <Swiften/Network/PlatformDomainNameQuery.h>
namespace Swift {
class IDNConverter;
@@ -25,7 +26,7 @@ namespace Swift {
class SWIFTEN_API PlatformDomainNameResolver : public DomainNameResolver {
public:
PlatformDomainNameResolver(IDNConverter* idnConverter, EventLoop* eventLoop);
- ~PlatformDomainNameResolver();
+ virtual ~PlatformDomainNameResolver();
virtual DomainNameServiceQuery::ref createServiceQuery(const std::string& serviceLookupPrefix, const std::string& domain);
virtual DomainNameAddressQuery::ref createAddressQuery(const std::string& name);