summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2018-07-28 11:45:35 (GMT)
committerTobias Markmann <tm@ayena.de>2018-07-30 13:27:15 (GMT)
commit798f8ec3331043a92f6ca3bc810b9477c3f8261e (patch)
tree868bde2ddcbad1a66d4256edd6050f486860eb2b /Swiften/StreamStack/TLSLayer.h
parent48596613cfe0f45c0916beabbcc3a27e01752c4b (diff)
downloadswift-798f8ec3331043a92f6ca3bc810b9477c3f8261e.zip
swift-798f8ec3331043a92f6ca3bc810b9477c3f8261e.tar.bz2
Use std::unique_ptr to have TLS classes own the TLSContext
TLSLayer and TLSConnection now own the TLSContext they use. The TLSContextFactory interface is adjusted to use std::unique_ptr. Test-Information: Builds and all tests pass on macOS with clang-7-master. Change-Id: I14e33c98b48445094f404b73ea41af0a51d2dde6
Diffstat (limited to 'Swiften/StreamStack/TLSLayer.h')
-rw-r--r--Swiften/StreamStack/TLSLayer.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/StreamStack/TLSLayer.h b/Swiften/StreamStack/TLSLayer.h
index 415a3f0..89588e3 100644
--- a/Swiften/StreamStack/TLSLayer.h
+++ b/Swiften/StreamStack/TLSLayer.h
@@ -1,3 +1,3 @@
/*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
* All rights reserved.
@@ -25,3 +25,3 @@ namespace Swift {
public:
- TLSLayer(TLSContextFactory*, const TLSOptions&);
+ TLSLayer(std::unique_ptr<TLSContext> tlsContext);
virtual ~TLSLayer();
@@ -39,3 +39,3 @@ namespace Swift {
TLSContext* getContext() const {
- return context;
+ return context_.get();
}
@@ -47,3 +47,3 @@ namespace Swift {
private:
- TLSContext* context;
+ std::unique_ptr<TLSContext> context_;
};