summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-10-29 19:28:27 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-10-30 12:52:51 (GMT)
commit3cc7e86420e4b3d67c5882d8d68e1e6a003c6154 (patch)
tree5ad268b5ba8730ecc1310c1348406dcd132fbaaf
parent826041be3ee406c90b34401ab4510d7c50dbd4a6 (diff)
downloadswift-3cc7e86420e4b3d67c5882d8d68e1e6a003c6154.zip
swift-3cc7e86420e4b3d67c5882d8d68e1e6a003c6154.tar.bz2
Fix code in response to clang compiler warnings
Test-Information: Code builds without warnings, unit tests still pass on OS X 10.10.5. Change-Id: I9108b53fb00b0fc85a8dd4e2a347e21d0e6008ab
-rw-r--r--Swiften/QA/FileTransferTest/FileTransferTest.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/QA/FileTransferTest/FileTransferTest.cpp b/Swiften/QA/FileTransferTest/FileTransferTest.cpp
index 8faf8a9..2dcaeb8 100644
--- a/Swiften/QA/FileTransferTest/FileTransferTest.cpp
+++ b/Swiften/QA/FileTransferTest/FileTransferTest.cpp
@@ -85,7 +85,7 @@ class FileTransferTest {
}
std::ofstream outfile(sendFilePath_.native().c_str(), std::ios::out | std::ios::binary);
- outfile.write(reinterpret_cast<char *>(&sendData_[0]), sendData_.size());
+ outfile.write(reinterpret_cast<char *>(&sendData_[0]), boost::numeric_cast<ptrdiff_t>(sendData_.size()));
outfile.close();
}
@@ -261,7 +261,7 @@ class FileTransferTest {
Timer::ref timeOut_;
};
-bool runTest(int senderCandidates, int receiverCandidates) {
+static bool runTest(int senderCandidates, int receiverCandidates) {
bool success = false;
std::cout << "senderCandidates: " << senderCandidates << ", receiverCandidates: " << receiverCandidates << std::endl;