Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2018-08-02 09:00:25 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2018-08-02 09:00:25 (GMT) |
| commit | 091f6e520694360a0407ab0cf3bb036fb461e6e3 (patch) | |
| tree | 717ff863e8cd799842e5c82fc2d833ae026c9b20 /Swiften/StreamStack/StreamStack.h | |
| parent | 80f74201f0a35718642e434c58b631b238fd85df (diff) | |
| download | swift-091f6e520694360a0407ab0cf3bb036fb461e6e3.zip swift-091f6e520694360a0407ab0cf3bb036fb461e6e3.tar.bz2 | |
Have StreamStack own the top and bottom layer
Test-Information:
Builds, unit tests and integration tests pass on macOS with
clang 7.0 master.
Change-Id: I0db411e49339ccb2301edd1a16612cb1ad2c927c
Diffstat (limited to 'Swiften/StreamStack/StreamStack.h')
| -rw-r--r-- | Swiften/StreamStack/StreamStack.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Swiften/StreamStack/StreamStack.h b/Swiften/StreamStack/StreamStack.h index bd95811..263b1f5 100644 --- a/Swiften/StreamStack/StreamStack.h +++ b/Swiften/StreamStack/StreamStack.h @@ -21,13 +21,13 @@ namespace Swift { class SWIFTEN_API StreamStack { public: - StreamStack(HighLayer* topLayer, LowLayer* bottomLayer); + StreamStack(std::unique_ptr<HighLayer> topLayer, std::unique_ptr<LowLayer> bottomLayer); ~StreamStack(); void addLayer(std::unique_ptr<StreamLayer> /* streamLayer */); HighLayer* getTopLayer() const { - return topLayer_; + return topLayer_.get(); } template<typename T> T* getLayer() const { @@ -37,12 +37,18 @@ namespace Swift { return layer; } } + if (T* layer = dynamic_cast<T*>(topLayer_.get())) { + return layer; + } + if (T* layer = dynamic_cast<T*>(bottomLayer_.get())) { + return layer; + } return nullptr; } private: - HighLayer* topLayer_; - LowLayer* bottomLayer_; + std::unique_ptr<HighLayer> topLayer_; + std::unique_ptr<LowLayer> bottomLayer_; std::vector<std::unique_ptr<StreamLayer>> layers_; }; } |