diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
| commit | dd91e772430dc294e3bf478c119ef8d43c0a3358 (patch) | |
| tree | 6f33ce4d5872a5691e0291eb45bf6ab373a5f567 /Source/JavaScriptCore/wtf/HashTable.h | |
| parent | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (diff) | |
| download | qtwebkit-dd91e772430dc294e3bf478c119ef8d43c0a3358.tar.gz | |
Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)
This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
Diffstat (limited to 'Source/JavaScriptCore/wtf/HashTable.h')
| -rw-r--r-- | Source/JavaScriptCore/wtf/HashTable.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/Source/JavaScriptCore/wtf/HashTable.h b/Source/JavaScriptCore/wtf/HashTable.h index cbcc09817..05722d9c5 100644 --- a/Source/JavaScriptCore/wtf/HashTable.h +++ b/Source/JavaScriptCore/wtf/HashTable.h @@ -22,13 +22,13 @@ #ifndef WTF_HashTable_h #define WTF_HashTable_h -#include "Alignment.h" -#include "Assertions.h" -#include "FastMalloc.h" -#include "HashTraits.h" -#include "StdLibExtras.h" -#include "Threading.h" -#include "ValueCheck.h" +#include <wtf/Alignment.h> +#include <wtf/Assertions.h> +#include <wtf/FastMalloc.h> +#include <wtf/HashTraits.h> +#include <wtf/StdLibExtras.h> +#include <wtf/Threading.h> +#include <wtf/ValueCheck.h> namespace WTF { @@ -310,7 +310,8 @@ namespace WTF { ~HashTable() { invalidateIterators(); - deallocateTable(m_table, m_tableSize); + if (m_table) + deallocateTable(m_table, m_tableSize); #if CHECK_HASHTABLE_USE_AFTER_DESTRUCTION m_table = (ValueType*)(uintptr_t)0xbbadbeef; #endif @@ -979,6 +980,9 @@ namespace WTF { void HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::clear() { invalidateIterators(); + if (!m_table) + return; + deallocateTable(m_table, m_tableSize); m_table = 0; m_tableSize = 0; @@ -1240,6 +1244,6 @@ namespace WTF { } // namespace WTF -#include "HashIterators.h" +#include <wtf/HashIterators.h> #endif // WTF_HashTable_h |