diff options
authorTobias Markmann <>2015-06-08 16:47:53 (GMT)
committerKevin Smith <>2015-06-14 20:10:53 (GMT)
commit823d751ca2ca5c7b36ce674f20c57f7a5196d992 (patch)
tree25a9ad697d3ba2e117d8e8ccd07671ba7e91054a /Swiften/Client
parent0e9e80c94a0a59b2c348c3dcbc35d90f6fe4b194 (diff)
Fix Swiften DLL building on Windows
Template classes cannot have SWIFTEN_API annotations as with annotation code for instantiations of the template are expected to be in the DLL which cannot be guaranteed for any user type. With the complete implementation in available in the header it is not needed because 3rdParty Swiften users can instantiate an implementation as needed. This also conditionally includes SQLiteHistoryStorage.h conditionally in MemoryStorages.cpp, as otherwise the linker will expect an implementation of SQLiteHistoryStorage in the DLL. However, it is only built into the DLL if experimental features are turned on. Test-Information: Tested with experimental=on/off and swiften_dll=on/off. Change-Id: Ieec85675c167ec34cffd4745ac854a5949fb2037
Diffstat (limited to 'Swiften/Client')
1 files changed, 3 insertions, 1 deletions
diff --git a/Swiften/Client/MemoryStorages.cpp b/Swiften/Client/MemoryStorages.cpp
index f0f1493..fc65cd5 100644
--- a/Swiften/Client/MemoryStorages.cpp
+++ b/Swiften/Client/MemoryStorages.cpp
@@ -1,5 +1,5 @@
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
@@ -9,7 +9,9 @@
#include <Swiften/Avatars/AvatarMemoryStorage.h>
#include <Swiften/Disco/CapsMemoryStorage.h>
#include <Swiften/Roster/RosterMemoryStorage.h>
#include <Swiften/History/SQLiteHistoryStorage.h>
namespace Swift {