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/StreamStack | |
| parent | b5d0be6e0d5b57effc5b7883d6e6e72aa2a1f062 (diff) | |
| download | swift-contrib-410d721ec495e29e15d45cbd921a9bb59133973d.zip swift-contrib-410d721ec495e29e15d45cbd921a9bb59133973d.tar.bz2 | |
Make ByteArray an std::vector<unsigned char>.
Diffstat (limited to 'Swiften/StreamStack')
| -rw-r--r-- | Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp | 2 | ||||
| -rw-r--r-- | Swiften/StreamStack/XMPPLayer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp b/Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp index 6c69a5f..9d5e745 100644 --- a/Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp +++ b/Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp @@ -121,7 +121,7 @@ class XMPPLayerTest : public CppUnit::TestFixture { class DummyLowLayer : public LowLayer { public: virtual void writeData(const ByteArray& data) { - writtenData += std::string(data.getData(), data.getSize()); + writtenData += data.toString(); } std::string writtenData; diff --git a/Swiften/StreamStack/XMPPLayer.cpp b/Swiften/StreamStack/XMPPLayer.cpp index a1e7ba3..684dfe6 100644 --- a/Swiften/StreamStack/XMPPLayer.cpp +++ b/Swiften/StreamStack/XMPPLayer.cpp @@ -52,7 +52,7 @@ void XMPPLayer::writeDataInternal(const ByteArray& data) { void XMPPLayer::handleDataRead(const ByteArray& data) { onDataRead(data); inParser_ = true; - if (!xmppParser_->parse(std::string(data.getData(), data.getSize()))) { + if (!xmppParser_->parse(data.toString())) { inParser_ = false; onError(); return; |