Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-06-18 12:18:45 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2015-06-18 12:18:45 (GMT) |
| commit | e9a95bd55757cce0e6e126660bc65561ae007baf (patch) | |
| tree | 5363498aefd98dc1654c22ed06a7d3975c31b1bf | |
| parent | c565fb97c2925b66f81e05ffb6a394d3d53173a0 (diff) | |
| download | swift-e9a95bd55757cce0e6e126660bc65561ae007baf.zip swift-e9a95bd55757cce0e6e126660bc65561ae007baf.tar.bz2 | |
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
| -rw-r--r-- | Swiften/Client/MemoryStorages.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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() { | |||
| 32 | delete avatarStorage; | 32 | delete avatarStorage; |
| 33 | delete capsStorage; | 33 | delete capsStorage; |
| 34 | delete vcardStorage; | 34 | delete vcardStorage; |
| 35 | #ifdef SWIFT_EXPERIMENTAL_HISTORY | ||
| 35 | delete historyStorage; | 36 | delete historyStorage; |
| 37 | #endif | ||
| 36 | } | 38 | } |
| 37 | 39 | ||
| 38 | VCardStorage* MemoryStorages::getVCardStorage() const { | 40 | VCardStorage* MemoryStorages::getVCardStorage() const { |