From 7d69f7108d72c608c8469209f7f3f501d8fff781 2017-10-30 15:47:40
From: Steffen Vogel <post@steffenvogel.de>
Date: 2017-10-30 15:47:40
Subject: [PATCH] Use std:unique_ptr only for Swiften >= 4.0

---

diff --git a/include/Swiften/SwiftenCompat.h b/include/Swiften/SwiftenCompat.h
index 7e31baea2e6b53af3712df968c3802484d64f1cf..e97d6f356aaf84effe840249e91c224ab595303b 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 7e5dea0a93fbf2c74c9ca43332a370ca61f4f2a3..3efc1a7cb105e28183873ed1e74ad99e6c21da19 100644
--- a/spectrum/src/frontends/xmpp/storageparser.h
+++ b/spectrum/src/frontends/xmpp/storageparser.h
@@ -2,6 +2,7 @@
 
 #include <boost/optional.hpp>
 
+#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<Swift::PayloadParser> currentPayloadParser;
+			SWIFTEN_UNIQUE_PTR<Swift::PayloadParser> currentPayloadParser;
 	};
 }