From ac6cf9659718a18b1ea22f72dbf0cdb64cbf9a24 Mon Sep 17 00:00:00 2001 From: Tobias Markmann <tm@ayena.de> Date: Tue, 6 Oct 2015 09:33:24 +0200 Subject: Fix compiler warnings about unused variables/arguments Test-Informations: Code compiles without warnings and tests still pass. Change-Id: If74c615706b8125c3c5186f0d940c103749ddb80 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 @@ -172,14 +172,14 @@ boost::shared_ptr<TransportSession> DefaultFileTransferTransporter::createIBBRec } boost::shared_ptr<TransportSession> DefaultFileTransferTransporter::createRemoteCandidateSession( - boost::shared_ptr<ReadBytestream> stream, const JingleS5BTransportPayload::Candidate& candidate) { + boost::shared_ptr<ReadBytestream> stream, const JingleS5BTransportPayload::Candidate& /* candidate */) { closeLocalSession(); return boost::make_shared<S5BTransportSession<SOCKS5BytestreamClientSession> >( remoteS5BClientSession, stream); } boost::shared_ptr<TransportSession> DefaultFileTransferTransporter::createRemoteCandidateSession( - boost::shared_ptr<WriteBytestream> stream, const JingleS5BTransportPayload::Candidate& candidate) { + boost::shared_ptr<WriteBytestream> stream, const JingleS5BTransportPayload::Candidate& /* candidate */) { closeLocalSession(); return boost::make_shared<S5BTransportSession<SOCKS5BytestreamClientSession> >( remoteS5BClientSession, stream); 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,5 +1,5 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -24,6 +24,7 @@ boost::shared_ptr<DNSSDQuerier> PlatformDNSSDQuerierFactory::createQuerier() { #elif defined(HAVE_AVAHI) return boost::shared_ptr<DNSSDQuerier>(new AvahiQuerier(eventLoop)); #else + (void)eventLoop; return boost::shared_ptr<DNSSDQuerier>(); #endif } 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,5 +1,5 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -12,9 +12,9 @@ #include <boost/thread/mutex.hpp> #include <Swiften/Base/API.h> -#include <Swiften/Network/Connection.h> -#include <Swiften/EventLoop/EventOwner.h> #include <Swiften/Base/SafeByteArray.h> +#include <Swiften/EventLoop/EventOwner.h> +#include <Swiften/Network/Connection.h> namespace boost { class thread; @@ -30,7 +30,7 @@ namespace Swift { public: typedef boost::shared_ptr<BoostConnection> ref; - ~BoostConnection(); + virtual ~BoostConnection(); static ref create(boost::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) { return ref(new BoostConnection(ioService, eventLoop)); -- cgit v0.10.2-6-g49f6