From 7d69f7108d72c608c8469209f7f3f501d8fff781 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Mon, 30 Oct 2017 15:47:40 +0100 Subject: [PATCH] Use std:unique_ptr only for Swiften >= 4.0 --- include/Swiften/SwiftenCompat.h | 2 ++ spectrum/src/frontends/xmpp/storageparser.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/Swiften/SwiftenCompat.h b/include/Swiften/SwiftenCompat.h index 7e31baea..e97d6f35 100644 --- a/include/Swiften/SwiftenCompat.h +++ b/include/Swiften/SwiftenCompat.h @@ -36,10 +36,12 @@ */ #if (SWIFTEN_VERSION >= 0x040000) +#define SWIFTEN_UNQPTR std::unique_ptr #define SWIFTEN_SHRPTR_NAMESPACE std #define SWIFTEN_SIGNAL_NAMESPACE boost::signals2 #define SWIFT_HOSTADDRESS(x) *(Swift::HostAddress::fromString(x)) #else +#define SWIFTEN_UNQPTR std::auto_ptr #define SWIFTEN_SHRPTR_NAMESPACE boost #define SWIFTEN_SIGNAL_NAMESPACE boost::signals #define SWIFT_HOSTADDRESS(x) Swift::HostAddress(x) diff --git a/spectrum/src/frontends/xmpp/storageparser.h b/spectrum/src/frontends/xmpp/storageparser.h index 7e5dea0a..3efc1a7c 100644 --- a/spectrum/src/frontends/xmpp/storageparser.h +++ b/spectrum/src/frontends/xmpp/storageparser.h @@ -2,6 +2,7 @@ #include +#include "Swiften/SwiftenCompat.h" #include "Swiften/Elements/PrivateStorage.h" #include "Swiften/Parser/GenericPayloadParser.h" @@ -18,6 +19,6 @@ namespace Transport { private: int level; - std::unique_ptr currentPayloadParser; + SWIFTEN_UNIQUE_PTR currentPayloadParser; }; }