summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2018-07-31 15:42:11 (GMT)
committerTobias Markmann <tm@ayena.de>2018-07-31 15:42:11 (GMT)
commit0007bbfa11e74f2a76aebc83995843ee8f6840ab (patch)
tree809fdb606a6bf37acfd800742dd0aeee72d2dbbf /Swiften/StreamStack/StreamStack.cpp
parent9d88d2c7130ebccdec12abf6420843d0f5e08e8e (diff)
downloadswift-0007bbfa11e74f2a76aebc83995843ee8f6840ab.zip
swift-0007bbfa11e74f2a76aebc83995843ee8f6840ab.tar.bz2
Have StreamStack own intermediate layers via std::unique_ptr
Test-Information: `./scons test=all` passes with no errors on macOS with clang 7 master. Change-Id: I31765ac15750dc5af7b70d1a85171dc8e3590181
Diffstat (limited to 'Swiften/StreamStack/StreamStack.cpp')
-rw-r--r--Swiften/StreamStack/StreamStack.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/Swiften/StreamStack/StreamStack.cpp b/Swiften/StreamStack/StreamStack.cpp
index 44a018d..f14f95c 100644
--- a/Swiften/StreamStack/StreamStack.cpp
+++ b/Swiften/StreamStack/StreamStack.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -22,16 +22,16 @@ StreamStack::StreamStack(XMPPLayer* xmppLayer, LowLayer* physicalLayer) : xmppLa
StreamStack::~StreamStack() {
}
-void StreamStack::addLayer(StreamLayer* newLayer) {
- LowLayer* lowLayer = layers_.empty() ? physicalLayer_ : *layers_.rbegin();
+void StreamStack::addLayer(std::unique_ptr<StreamLayer> streamLayer) {
+ LowLayer* lowLayer = layers_.empty() ? physicalLayer_ : layers_.rbegin()->get();
- xmppLayer_->setChildLayer(newLayer);
- newLayer->setParentLayer(xmppLayer_);
+ xmppLayer_->setChildLayer(streamLayer.get());
+ streamLayer->setParentLayer(xmppLayer_);
- lowLayer->setParentLayer(newLayer);
- newLayer->setChildLayer(lowLayer);
+ lowLayer->setParentLayer(streamLayer.get());
+ streamLayer->setChildLayer(lowLayer);
- layers_.push_back(newLayer);
+ layers_.emplace_back(std::move(streamLayer));
}
}