Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-09-26 12:49:48 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-09-26 22:04:37 (GMT) |
| commit | 65596031acaf7d4f277bd75758bb1c551501ce86 (patch) | |
| tree | aac3a8bf6dbdccc1d476225b50ba25decf1a46cc /Swiften/Network | |
| parent | 05fbe78f5c3b30517f7152b37c157a99120682dc (diff) | |
| download | swift-65596031acaf7d4f277bd75758bb1c551501ce86.zip swift-65596031acaf7d4f277bd75758bb1c551501ce86.tar.bz2 | |
Use const std::unique_ptr for pimpl idiom usage
All our pimpl idiom usage used std::shared_ptr due to being
written in C++03. Now we use C++11 and const std::unique_ptr
is more sensible.
Test-Information:
Builds on macOS 10.12 and unit tests pass.
Change-Id: I1b9b3fbb22e337d53ae71e5a5e03118998cc3376
Diffstat (limited to 'Swiften/Network')
| -rw-r--r-- | Swiften/Network/MiniUPnPInterface.cpp | 2 | ||||
| -rw-r--r-- | Swiften/Network/MiniUPnPInterface.h | 2 | ||||
| -rw-r--r-- | Swiften/Network/NATPMPInterface.cpp | 2 | ||||
| -rw-r--r-- | Swiften/Network/NATPMPInterface.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Network/MiniUPnPInterface.cpp b/Swiften/Network/MiniUPnPInterface.cpp index 94305b9..9006ceb 100644 --- a/Swiften/Network/MiniUPnPInterface.cpp +++ b/Swiften/Network/MiniUPnPInterface.cpp @@ -32,7 +32,7 @@ struct MiniUPnPInterface::Private { IGDdatas data; }; -MiniUPnPInterface::MiniUPnPInterface() : p(std::make_shared<Private>()) { +MiniUPnPInterface::MiniUPnPInterface() : p(new Private()) { p->isValid = false; int error = 0; #if MINIUPNPC_API_VERSION > 14 diff --git a/Swiften/Network/MiniUPnPInterface.h b/Swiften/Network/MiniUPnPInterface.h index ea956d9..89457b8 100644 --- a/Swiften/Network/MiniUPnPInterface.h +++ b/Swiften/Network/MiniUPnPInterface.h @@ -28,6 +28,6 @@ namespace Swift { private: struct Private; - std::shared_ptr<Private> p; + const std::unique_ptr<Private> p; }; } diff --git a/Swiften/Network/NATPMPInterface.cpp b/Swiften/Network/NATPMPInterface.cpp index c811212..5e0b3b3 100644 --- a/Swiften/Network/NATPMPInterface.cpp +++ b/Swiften/Network/NATPMPInterface.cpp @@ -30,7 +30,7 @@ struct NATPMPInterface::Private { natpmp_t natpmp; }; -NATPMPInterface::NATPMPInterface() : p(std::make_shared<Private>()) { +NATPMPInterface::NATPMPInterface() : p(new Private()) { initnatpmp(&p->natpmp, 0, 0); } diff --git a/Swiften/Network/NATPMPInterface.h b/Swiften/Network/NATPMPInterface.h index 80f619c..e1666c8 100644 --- a/Swiften/Network/NATPMPInterface.h +++ b/Swiften/Network/NATPMPInterface.h @@ -28,6 +28,6 @@ namespace Swift { private: struct Private; - std::shared_ptr<Private> p; + const std::unique_ptr<Private> p; }; } |