From e9a95bd55757cce0e6e126660bc65561ae007baf Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Thu, 18 Jun 2015 14:18:45 +0200 Subject: Only delete HistoryStorage if building with experimental features Clang raises a warning in non-experimental builds because the full type of HistoryStorage is not known and it tries to delete an instance (even though a null ptr) in the dtor. Test-Information: Tested on OS X 10.9.5 with Clang (Apple LLVM version 6.0). Change-Id: I8a06890967427af21e11e077e9ac59b67bdb810c diff --git a/Swiften/Client/MemoryStorages.cpp b/Swiften/Client/MemoryStorages.cpp index fc65cd5..8825fa2 100644 --- a/Swiften/Client/MemoryStorages.cpp +++ b/Swiften/Client/MemoryStorages.cpp @@ -32,7 +32,9 @@ MemoryStorages::~MemoryStorages() { delete avatarStorage; delete capsStorage; delete vcardStorage; +#ifdef SWIFT_EXPERIMENTAL_HISTORY delete historyStorage; +#endif } VCardStorage* MemoryStorages::getVCardStorage() const { -- cgit v0.10.2-6-g49f6