Reviewed by Darin Adler.
authorggaren <ggaren@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 29 Oct 2007 05:53:48 +0000 (05:53 +0000)
committerggaren <ggaren@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 29 Oct 2007 05:53:48 +0000 (05:53 +0000)
        Fixed http://bugs.webkit.org/show_bug.cgi?id=15746
        #ifndef ASSERT_DISABLED is no good!

        Replaced with #if !ASSERT_DISABLED.

        * wtf/HashTable.h:
        (WTF::::lookup):
        (WTF::::lookupForWriting):
        (WTF::::fullLookupForWriting):
        (WTF::::add):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27211 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog
JavaScriptCore/wtf/HashTable.h

index 51215abfe1aade2d0fa9860259f0d1437c5d7390..704e52363b8607a7fa694a860e45dcb5de959ef5 100644 (file)
@@ -1,3 +1,18 @@
+2007-10-28  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Darin Adler.
+        
+        Fixed http://bugs.webkit.org/show_bug.cgi?id=15746
+        #ifndef ASSERT_DISABLED is no good!
+        
+        Replaced with #if !ASSERT_DISABLED.
+
+        * wtf/HashTable.h:
+        (WTF::::lookup):
+        (WTF::::lookupForWriting):
+        (WTF::::fullLookupForWriting):
+        (WTF::::add):
+
 2007-10-28  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Darin Adler.
 2007-10-28  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Darin Adler.
index e08b4e91608836a281d613c2cbd916313b4e946d..32a79d76fcf523c33b9aabc4edddc110eefe8c8b 100644 (file)
@@ -402,7 +402,7 @@ namespace WTF {
     inline Value* HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::lookup(const T& key)
     {
         ASSERT(m_table);
     inline Value* HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::lookup(const T& key)
     {
         ASSERT(m_table);
-#ifndef ASSERT_DISABLED
+#if !ASSERT_DISABLED
         if (HashFunctions::safeToCompareToEmptyOrDeleted) {
             ASSERT(!HashTranslator::equal(KeyTraits::emptyValue(), key));
             ASSERT(!HashTranslator::equal(KeyTraits::deletedValue(), key));
         if (HashFunctions::safeToCompareToEmptyOrDeleted) {
             ASSERT(!HashTranslator::equal(KeyTraits::emptyValue(), key));
             ASSERT(!HashTranslator::equal(KeyTraits::deletedValue(), key));
@@ -452,7 +452,7 @@ namespace WTF {
     inline typename HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::LookupType HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::lookupForWriting(const T& key)
     {
         ASSERT(m_table);
     inline typename HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::LookupType HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::lookupForWriting(const T& key)
     {
         ASSERT(m_table);
-#ifndef ASSERT_DISABLED
+#if !ASSERT_DISABLED
         if (HashFunctions::safeToCompareToEmptyOrDeleted) {
             ASSERT(!HashTranslator::equal(KeyTraits::emptyValue(), key));
             ASSERT(!HashTranslator::equal(KeyTraits::deletedValue(), key));
         if (HashFunctions::safeToCompareToEmptyOrDeleted) {
             ASSERT(!HashTranslator::equal(KeyTraits::emptyValue(), key));
             ASSERT(!HashTranslator::equal(KeyTraits::deletedValue(), key));
@@ -509,7 +509,7 @@ namespace WTF {
     inline typename HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::FullLookupType HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::fullLookupForWriting(const T& key)
     {
         ASSERT(m_table);
     inline typename HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::FullLookupType HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::fullLookupForWriting(const T& key)
     {
         ASSERT(m_table);
-#ifndef ASSERT_DISABLED
+#if !ASSERT_DISABLED
         if (HashFunctions::safeToCompareToEmptyOrDeleted) {
             ASSERT(!HashTranslator::equal(KeyTraits::emptyValue(), key));
             ASSERT(!HashTranslator::equal(KeyTraits::deletedValue(), key));
         if (HashFunctions::safeToCompareToEmptyOrDeleted) {
             ASSERT(!HashTranslator::equal(KeyTraits::emptyValue(), key));
             ASSERT(!HashTranslator::equal(KeyTraits::deletedValue(), key));
@@ -565,7 +565,7 @@ namespace WTF {
     template<typename T, typename Extra, typename HashTranslator>
     inline pair<typename HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::iterator, bool> HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::add(const T& key, const Extra& extra)
     {
     template<typename T, typename Extra, typename HashTranslator>
     inline pair<typename HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::iterator, bool> HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::add(const T& key, const Extra& extra)
     {
-#ifndef ASSERT_DISABLED
+#if !ASSERT_DISABLED
         if (HashFunctions::safeToCompareToEmptyOrDeleted) {
             ASSERT(!HashTranslator::equal(KeyTraits::emptyValue(), key));
             ASSERT(!HashTranslator::equal(KeyTraits::deletedValue(), key));
         if (HashFunctions::safeToCompareToEmptyOrDeleted) {
             ASSERT(!HashTranslator::equal(KeyTraits::emptyValue(), key));
             ASSERT(!HashTranslator::equal(KeyTraits::deletedValue(), key));