summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2017-06-26 03:57:43 (GMT)
committerTobias Markmann <tm@ayena.de>2017-06-26 08:15:04 (GMT)
commit96528818b201c5a250701b58bb9c4d11048b237e (patch)
treee0685e693f4adacf5bab77357ab0b6b3353d126e /Swiften/Network/UnixProxyProvider.cpp
parentbd0e671455f6b042bbbd385f1551e9a5011badf5 (diff)
downloadswift-96528818b201c5a250701b58bb9c4d11048b237e.zip
swift-96528818b201c5a250701b58bb9c4d11048b237e.tar.bz2
Fix compiler warnings raise by Clang on Linux
Clang raises warnings about unused members and macros on Linux. These are fixed with this change. Test-Information: Tested with clang-3.9 on Debian Stretch. Change-Id: I87bc0606cfd14365330aaad4ed433d3bca2d5330
Diffstat (limited to 'Swiften/Network/UnixProxyProvider.cpp')
-rw-r--r--Swiften/Network/UnixProxyProvider.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/Swiften/Network/UnixProxyProvider.cpp b/Swiften/Network/UnixProxyProvider.cpp
index e6afa3d..854d501 100644
--- a/Swiften/Network/UnixProxyProvider.cpp
+++ b/Swiften/Network/UnixProxyProvider.cpp
@@ -3,60 +3,62 @@
* Licensed under the simplified BSD license.
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
/*
* Copyright (c) 2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swiften/Network/UnixProxyProvider.h>
#if defined(HAVE_GCONF)
# include "Swiften/Network/GConfProxyProvider.h"
#endif
namespace Swift {
UnixProxyProvider::UnixProxyProvider() :
gconfProxyProvider(nullptr),
environmentProxyProvider()
{
#if defined(HAVE_GCONF)
gconfProxyProvider = new GConfProxyProvider();
#endif
}
UnixProxyProvider::~UnixProxyProvider() {
#if defined(HAVE_GCONF)
delete gconfProxyProvider;
+#else
+ (void)gconfProxyProvider;
#endif
}
HostAddressPort UnixProxyProvider::getSOCKS5Proxy() const {
HostAddressPort proxy;
#if defined(HAVE_GCONF)
proxy = gconfProxyProvider->getSOCKS5Proxy();
if(proxy.isValid()) {
return proxy;
}
#endif
proxy = environmentProxyProvider.getSOCKS5Proxy();
if(proxy.isValid()) {
return proxy;
}
return HostAddressPort(HostAddress(), 0);
}
HostAddressPort UnixProxyProvider::getHTTPConnectProxy() const {
HostAddressPort proxy;
#if defined(HAVE_GCONF)
proxy = gconfProxyProvider->getHTTPConnectProxy();
if(proxy.isValid()) {
return proxy;
}
#endif
proxy = environmentProxyProvider.getHTTPConnectProxy();
if(proxy.isValid()) {
return proxy;
}