Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-10-06 07:33:24 (GMT)
committerSwift Review <review@swift.im>2015-10-14 16:44:01 (GMT)
commitac6cf9659718a18b1ea22f72dbf0cdb64cbf9a24 (patch)
tree2350ed917d70d2ba7daf027f230e52246117c10f
parent192e8631d4c9a196e13a20d22f57c392bac9dd73 (diff)
downloadswift-ac6cf9659718a18b1ea22f72dbf0cdb64cbf9a24.zip
swift-ac6cf9659718a18b1ea22f72dbf0cdb64cbf9a24.tar.bz2
Fix compiler warnings about unused variables/arguments
Test-Informations: Code compiles without warnings and tests still pass. Change-Id: If74c615706b8125c3c5186f0d940c103749ddb80
Diffstat
-rw-r--r--Swiften/FileTransfer/DefaultFileTransferTransporter.cpp4
-rw-r--r--Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.cpp3
-rw-r--r--Swiften/Network/BoostConnection.h8
3 files changed, 8 insertions, 7 deletions
diff --git a/Swiften/FileTransfer/DefaultFileTransferTransporter.cpp b/Swiften/FileTransfer/DefaultFileTransferTransporter.cpp
index ca29898..20635f9 100644
--- a/Swiften/FileTransfer/DefaultFileTransferTransporter.cpp
+++ b/Swiften/FileTransfer/DefaultFileTransferTransporter.cpp
@@ -170,18 +170,18 @@ boost::shared_ptr<TransportSession> DefaultFileTransferTransporter::createIBBRec
170 sessionID, initiator, responder, size, stream, router); 170 sessionID, initiator, responder, size, stream, router);
171 return boost::make_shared<IBBReceiveTransportSession>(ibbSession); 171 return boost::make_shared<IBBReceiveTransportSession>(ibbSession);
172} 172}
173 173
174boost::shared_ptr<TransportSession> DefaultFileTransferTransporter::createRemoteCandidateSession( 174boost::shared_ptr<TransportSession> DefaultFileTransferTransporter::createRemoteCandidateSession(
175 boost::shared_ptr<ReadBytestream> stream, const JingleS5BTransportPayload::Candidate& candidate) { 175 boost::shared_ptr<ReadBytestream> stream, const JingleS5BTransportPayload::Candidate& /* candidate */) {
176 closeLocalSession(); 176 closeLocalSession();
177 return boost::make_shared<S5BTransportSession<SOCKS5BytestreamClientSession> >( 177 return boost::make_shared<S5BTransportSession<SOCKS5BytestreamClientSession> >(
178 remoteS5BClientSession, stream); 178 remoteS5BClientSession, stream);
179} 179}
180 180
181boost::shared_ptr<TransportSession> DefaultFileTransferTransporter::createRemoteCandidateSession( 181boost::shared_ptr<TransportSession> DefaultFileTransferTransporter::createRemoteCandidateSession(
182 boost::shared_ptr<WriteBytestream> stream, const JingleS5BTransportPayload::Candidate& candidate) { 182 boost::shared_ptr<WriteBytestream> stream, const JingleS5BTransportPayload::Candidate& /* candidate */) {
183 closeLocalSession(); 183 closeLocalSession();
184 return boost::make_shared<S5BTransportSession<SOCKS5BytestreamClientSession> >( 184 return boost::make_shared<S5BTransportSession<SOCKS5BytestreamClientSession> >(
185 remoteS5BClientSession, stream); 185 remoteS5BClientSession, stream);
186} 186}
187 187
diff --git a/Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.cpp b/Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.cpp
index 4218de2..ee7194f 100644
--- a/Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.cpp
+++ b/Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.cpp
@@ -1,7 +1,7 @@
1/* 1/*
2 * Copyright (c) 2010 Isode Limited. 2 * Copyright (c) 2010-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
6 6
7#include <Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.h> 7#include <Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.h>
@@ -22,10 +22,11 @@ boost::shared_ptr<DNSSDQuerier> PlatformDNSSDQuerierFactory::createQuerier() {
22#if defined(HAVE_BONJOUR) 22#if defined(HAVE_BONJOUR)
23 return boost::shared_ptr<DNSSDQuerier>(new BonjourQuerier(eventLoop)); 23 return boost::shared_ptr<DNSSDQuerier>(new BonjourQuerier(eventLoop));
24#elif defined(HAVE_AVAHI) 24#elif defined(HAVE_AVAHI)
25 return boost::shared_ptr<DNSSDQuerier>(new AvahiQuerier(eventLoop)); 25 return boost::shared_ptr<DNSSDQuerier>(new AvahiQuerier(eventLoop));
26#else 26#else
27 (void)eventLoop;
27 return boost::shared_ptr<DNSSDQuerier>(); 28 return boost::shared_ptr<DNSSDQuerier>();
28#endif 29#endif
29} 30}
30 31
31bool PlatformDNSSDQuerierFactory::canCreate() { 32bool PlatformDNSSDQuerierFactory::canCreate() {
diff --git a/Swiften/Network/BoostConnection.h b/Swiften/Network/BoostConnection.h
index d238a3f..83a8f01 100644
--- a/Swiften/Network/BoostConnection.h
+++ b/Swiften/Network/BoostConnection.h
@@ -1,7 +1,7 @@
1/* 1/*
2 * Copyright (c) 2010 Isode Limited. 2 * Copyright (c) 2010-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
6 6
7#pragma once 7#pragma once
@@ -10,13 +10,13 @@
10#include <boost/asio/ip/tcp.hpp> 10#include <boost/asio/ip/tcp.hpp>
11#include <boost/enable_shared_from_this.hpp> 11#include <boost/enable_shared_from_this.hpp>
12#include <boost/thread/mutex.hpp> 12#include <boost/thread/mutex.hpp>
13 13
14#include <Swiften/Base/API.h> 14#include <Swiften/Base/API.h>
15#include <Swiften/Network/Connection.h>
16#include <Swiften/EventLoop/EventOwner.h>
17#include <Swiften/Base/SafeByteArray.h> 15#include <Swiften/Base/SafeByteArray.h>
16#include <Swiften/EventLoop/EventOwner.h>
17#include <Swiften/Network/Connection.h>
18 18
19namespace boost { 19namespace boost {
20 class thread; 20 class thread;
21 namespace system { 21 namespace system {
22 class error_code; 22 class error_code;
@@ -28,11 +28,11 @@ namespace Swift {
28 28
29 class SWIFTEN_API BoostConnection : public Connection, public EventOwner, public boost::enable_shared_from_this<BoostConnection> { 29 class SWIFTEN_API BoostConnection : public Connection, public EventOwner, public boost::enable_shared_from_this<BoostConnection> {
30 public: 30 public:
31 typedef boost::shared_ptr<BoostConnection> ref; 31 typedef boost::shared_ptr<BoostConnection> ref;
32 32
33 ~BoostConnection(); 33 virtual ~BoostConnection();
34 34
35 static ref create(boost::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) { 35 static ref create(boost::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) {
36 return ref(new BoostConnection(ioService, eventLoop)); 36 return ref(new BoostConnection(ioService, eventLoop));
37 } 37 }
38 38