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.h | |
| parent | b5d0be6e0d5b57effc5b7883d6e6e72aa2a1f062 (diff) | |
| download | swift-410d721ec495e29e15d45cbd921a9bb59133973d.zip swift-410d721ec495e29e15d45cbd921a9bb59133973d.tar.bz2 | |
Make ByteArray an std::vector<unsigned char>.
Diffstat (limited to 'Swiften/Base/ByteArray.h')
| -rw-r--r-- | Swiften/Base/ByteArray.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Swiften/Base/ByteArray.h b/Swiften/Base/ByteArray.h index d274663..26adedc 100644 --- a/Swiften/Base/ByteArray.h +++ b/Swiften/Base/ByteArray.h @@ -16,7 +16,7 @@ namespace Swift { class ByteArray { public: - typedef std::vector<char>::const_iterator const_iterator; + typedef std::vector<unsigned char>::const_iterator const_iterator; ByteArray() : data_() {} @@ -43,11 +43,11 @@ namespace Swift { } } - const char* getData() const { + const unsigned char* getData() const { return data_.empty() ? NULL : &data_[0]; } - char* getData() { + unsigned char* getData() { return data_.empty() ? NULL : &data_[0]; } @@ -95,11 +95,11 @@ namespace Swift { } - const char& operator[](size_t i) const { + const unsigned char& operator[](size_t i) const { return data_[i]; } - char& operator[](size_t i) { + unsigned char& operator[](size_t i) { return data_[i]; } @@ -112,7 +112,7 @@ namespace Swift { } std::string toString() const { - return std::string(getData(), getSize()); + return std::string(reinterpret_cast<const char*>(getData()), getSize()); } void readFromFile(const std::string& file); @@ -122,7 +122,7 @@ namespace Swift { } private: - std::vector<char> data_; + std::vector<unsigned char> data_; }; } |