summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Swiften/FileTransfer/JingleFileTransfer.cpp8
-rw-r--r--Swiften/Network/DomainNameServiceQuery.cpp5
2 files changed, 4 insertions, 9 deletions
diff --git a/Swiften/FileTransfer/JingleFileTransfer.cpp b/Swiften/FileTransfer/JingleFileTransfer.cpp
index 62c3a53..cc1cd1c 100644
--- a/Swiften/FileTransfer/JingleFileTransfer.cpp
+++ b/Swiften/FileTransfer/JingleFileTransfer.cpp
@@ -1,3 +1,3 @@
/*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2018 Isode Limited.
* All rights reserved.
@@ -8,4 +8,2 @@
-#include <boost/typeof/typeof.hpp>
-
#include <Swiften/Base/Log.h>
@@ -31,3 +29,2 @@ JingleFileTransfer::JingleFileTransfer(
session->addListener(this);
-
}
@@ -178,3 +175,3 @@ void JingleFileTransfer::handleTransportInfoReceived(
if (!s5bPayload->hasCandidateError()) {
- BOOST_AUTO(theirCandidate, localCandidates.find(s5bPayload->getCandidateUsed()));
+ auto theirCandidate = localCandidates.find(s5bPayload->getCandidateUsed());
if (theirCandidate == localCandidates.end()) {
@@ -233,2 +230 @@ void JingleFileTransfer::removeTransporter() {
}
-
diff --git a/Swiften/Network/DomainNameServiceQuery.cpp b/Swiften/Network/DomainNameServiceQuery.cpp
index 708bbce..0c6c543 100644
--- a/Swiften/Network/DomainNameServiceQuery.cpp
+++ b/Swiften/Network/DomainNameServiceQuery.cpp
@@ -1,3 +1,3 @@
/*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
* All rights reserved.
@@ -16,3 +16,2 @@
#include <boost/numeric/conversion/cast.hpp>
-#include <boost/typeof/typeof.hpp>
@@ -55,3 +54,3 @@ void DomainNameServiceQuery::sortResults(std::vector<DomainNameServiceQuery::Res
int randomNumber = generator.generateRandomInteger(cumulativeWeights.back());
- BOOST_AUTO(selectedIndex, std::lower_bound(cumulativeWeights.begin(), cumulativeWeights.end(), randomNumber) - cumulativeWeights.begin());
+ auto selectedIndex = std::lower_bound(cumulativeWeights.begin(), cumulativeWeights.end(), randomNumber) - cumulativeWeights.begin();
std::swap(i[j], i[j + selectedIndex]);