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/Base/ByteArray.cpp | |
| parent | b5d0be6e0d5b57effc5b7883d6e6e72aa2a1f062 (diff) | |
| download | swift-410d721ec495e29e15d45cbd921a9bb59133973d.zip swift-410d721ec495e29e15d45cbd921a9bb59133973d.tar.bz2 | |
Make ByteArray an std::vector<unsigned char>.
Diffstat (limited to 'Swiften/Base/ByteArray.cpp')
| -rw-r--r-- | Swiften/Base/ByteArray.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swiften/Base/ByteArray.cpp b/Swiften/Base/ByteArray.cpp index 7701268..928e145 100644 --- a/Swiften/Base/ByteArray.cpp +++ b/Swiften/Base/ByteArray.cpp @@ -31,7 +31,7 @@ void ByteArray::readFromFile(const std::string& file) { while (input.good()) { size_t oldSize = data_.size(); data_.resize(oldSize + BUFFER_SIZE); - input.read(&data_[oldSize], BUFFER_SIZE); + input.read(reinterpret_cast<char*>(&data_[oldSize]), BUFFER_SIZE); data_.resize(oldSize + input.gcount()); } input.close(); |