Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-10-29 19:28:27 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-10-30 12:52:51 (GMT) |
| commit | 3cc7e86420e4b3d67c5882d8d68e1e6a003c6154 (patch) | |
| tree | 5ad268b5ba8730ecc1310c1348406dcd132fbaaf | |
| parent | 826041be3ee406c90b34401ab4510d7c50dbd4a6 (diff) | |
| download | swift-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.cpp | 4 |
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 | |||
| @@ -83,11 +83,11 @@ class FileTransferTest { | |||
| 83 | for (size_t n = 0; n < sendData_.size(); n++) { | 83 | for (size_t n = 0; n < sendData_.size(); n++) { |
| 84 | sendData_[n] = boost::numeric_cast<unsigned char>(randGen.generateRandomInteger(255)); | 84 | sendData_[n] = boost::numeric_cast<unsigned char>(randGen.generateRandomInteger(255)); |
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | std::ofstream outfile(sendFilePath_.native().c_str(), std::ios::out | std::ios::binary); | 87 | std::ofstream outfile(sendFilePath_.native().c_str(), std::ios::out | std::ios::binary); |
| 88 | outfile.write(reinterpret_cast<char *>(&sendData_[0]), sendData_.size()); | 88 | outfile.write(reinterpret_cast<char *>(&sendData_[0]), boost::numeric_cast<ptrdiff_t>(sendData_.size())); |
| 89 | outfile.close(); | 89 | outfile.close(); |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | ~FileTransferTest() { | 92 | ~FileTransferTest() { |
| 93 | timeOut_->stop(); | 93 | timeOut_->stop(); |
| @@ -259,11 +259,11 @@ class FileTransferTest { | |||
| 259 | bool receiverIsDone_; | 259 | bool receiverIsDone_; |
| 260 | 260 | ||
| 261 | Timer::ref timeOut_; | 261 | Timer::ref timeOut_; |
| 262 | }; | 262 | }; |
| 263 | 263 | ||
| 264 | bool runTest(int senderCandidates, int receiverCandidates) { | 264 | static bool runTest(int senderCandidates, int receiverCandidates) { |
| 265 | bool success = false; | 265 | bool success = false; |
| 266 | 266 | ||
| 267 | std::cout << "senderCandidates: " << senderCandidates << ", receiverCandidates: " << receiverCandidates << std::endl; | 267 | std::cout << "senderCandidates: " << senderCandidates << ", receiverCandidates: " << receiverCandidates << std::endl; |
| 268 | bool expectSuccess = (senderCandidates & receiverCandidates) > 0; | 268 | bool expectSuccess = (senderCandidates & receiverCandidates) > 0; |
| 269 | 269 | ||