Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-03-12 16:22:03 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-03-12 16:22:03 (GMT) |
| commit | 410d721ec495e29e15d45cbd921a9bb59133973d (patch) | |
| tree | 9d1dfd3f5d85ecdf41ba1296b518b65c269edc2a /Swiften/FileTransfer | |
| parent | b5d0be6e0d5b57effc5b7883d6e6e72aa2a1f062 (diff) | |
| download | swift-contrib-410d721ec495e29e15d45cbd921a9bb59133973d.zip swift-contrib-410d721ec495e29e15d45cbd921a9bb59133973d.tar.bz2 | |
Make ByteArray an std::vector<unsigned char>.
Diffstat (limited to 'Swiften/FileTransfer')
| -rw-r--r-- | Swiften/FileTransfer/FileReadBytestream.cpp | 2 | ||||
| -rw-r--r-- | Swiften/FileTransfer/FileWriteBytestream.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/FileTransfer/FileReadBytestream.cpp b/Swiften/FileTransfer/FileReadBytestream.cpp index 7ed33af..c08747b 100644 --- a/Swiften/FileTransfer/FileReadBytestream.cpp +++ b/Swiften/FileTransfer/FileReadBytestream.cpp @@ -28,7 +28,7 @@ ByteArray FileReadBytestream::read(size_t size) { ByteArray result; result.resize(size); assert(stream->good()); - stream->read(result.getData(), size); + stream->read(reinterpret_cast<char*>(result.getData()), size); result.resize(stream->gcount()); return result; } diff --git a/Swiften/FileTransfer/FileWriteBytestream.cpp b/Swiften/FileTransfer/FileWriteBytestream.cpp index b864b6f..4d29bd1 100644 --- a/Swiften/FileTransfer/FileWriteBytestream.cpp +++ b/Swiften/FileTransfer/FileWriteBytestream.cpp @@ -26,7 +26,7 @@ void FileWriteBytestream::write(const ByteArray& data) { stream = new boost::filesystem::ofstream(file, std::ios_base::out|std::ios_base::binary); } assert(stream->good()); - stream->write(data.getData(), data.getSize()); + stream->write(reinterpret_cast<const char*>(data.getData()), data.getSize()); } } |