2007-10-28 Mark Rowe <mrowe@apple.com>

        Disable assertions in a manner that doesn't break the Qt Windows build.

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

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 03ee012ebf4ff4bffdec8e4f3ef7cc7ed97e818c..891f1f885f47bc2949854bbde746bb6e6abac835 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-28  Mark Rowe  <mrowe@apple.com>
+
+        Disable assertions in a manner that doesn't break the Qt Windows build.
+
+        * wtf/HashTable.h:
+        (WTF::::lookup):
+        (WTF::::lookupForWriting):
+        (WTF::::fullLookupForWriting):
+
 2007-10-28  Geoffrey Garen  <ggaren@apple.com>
 
         Temporarily disabling some ASSERTs I introduced in my last check-in 

diff --git a/JavaScriptCore/wtf/HashTable.h b/JavaScriptCore/wtf/HashTable.h
index a519a336cbdf4f0d5f9b03de59774820a4203659..acec34985dcf173524525090abb454771bf96c66 100644 (file)
--- a/JavaScriptCore/wtf/HashTable.h
+++ b/JavaScriptCore/wtf/HashTable.h
@@ -402,7 +402,7 @@ namespace WTF {
     inline Value* HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::lookup(const T& key)
     {
         ASSERT(m_table);
-#if !ASSERT_DISABLED && false
+#if !ASSERT_DISABLED && 0
         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);
-#if !ASSERT_DISABLED && false
+#if !ASSERT_DISABLED && 0
         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);
-#if !ASSERT_DISABLED && false
+#if !ASSERT_DISABLED && 0
         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)
     {
-#if !ASSERT_DISABLED && false
+#if !ASSERT_DISABLED && 0
         if (HashFunctions::safeToCompareToEmptyOrDeleted) {
             ASSERT(!HashTranslator::equal(KeyTraits::emptyValue(), key));
             ASSERT(!HashTranslator::equal(KeyTraits::deletedValue(), key));