Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2018-07-31 15:42:11 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2018-07-31 15:42:11 (GMT) |
| commit | 0007bbfa11e74f2a76aebc83995843ee8f6840ab (patch) | |
| tree | 809fdb606a6bf37acfd800742dd0aeee72d2dbbf /Swiften/StreamStack/StreamStack.h | |
| parent | 9d88d2c7130ebccdec12abf6420843d0f5e08e8e (diff) | |
| download | swift-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.h')
| -rw-r--r-- | Swiften/StreamStack/StreamStack.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/StreamStack/StreamStack.h b/Swiften/StreamStack/StreamStack.h index b12a69f..5b77085 100644 --- a/Swiften/StreamStack/StreamStack.h +++ b/Swiften/StreamStack/StreamStack.h @@ -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. */ @@ -24,15 +24,15 @@ namespace Swift { StreamStack(XMPPLayer* xmppLayer, LowLayer* physicalLayer); ~StreamStack(); - void addLayer(StreamLayer*); + void addLayer(std::unique_ptr<StreamLayer> /* streamLayer */); XMPPLayer* getXMPPLayer() const { return xmppLayer_; } - template<typename T> T* getLayer() { - for (auto& i : layers_) { - T* layer = dynamic_cast<T*>(i); + template<typename T> T* getLayer() const { + for (const auto& i : layers_) { + T* layer = dynamic_cast<T*>(i.get()); if (layer) { return layer; } @@ -43,6 +43,6 @@ namespace Swift { private: XMPPLayer* xmppLayer_; LowLayer* physicalLayer_; - std::vector<StreamLayer*> layers_; + std::vector<std::unique_ptr<StreamLayer>> layers_; }; } |