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

        Windows build fix.

        * kjs/collector.cpp:
        (KJS::Collector::collect):

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index c25eda934ac3949234df49f03fa6ba3daf707781..ea0fe6833d13da70a1ef7f4b3a5ea6b9828e6371 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-26  Mark Rowe  <mrowe@apple.com>
+
+        Windows build fix.
+
+        * kjs/collector.cpp:
+        (KJS::Collector::collect):
+
 2007-10-26  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Maciej.

diff --git a/JavaScriptCore/kjs/collector.cpp b/JavaScriptCore/kjs/collector.cpp
index 0f342bcdbd1ed2f2e2e1afd6824ed0d35fde61a8..4d945cc1d51c5d3fe7931827c8cf179c439b42b8 100644 (file)
--- a/JavaScriptCore/kjs/collector.cpp
+++ b/JavaScriptCore/kjs/collector.cpp
@@ -784,6 +784,7 @@ void Collector::markMainThreadOnlyObjects()
 
 template <Collector::HeapType heapType> size_t Collector::sweep(bool currentThreadIsMainThread)
 {
+    UNUSED_PARAM(currentThreadIsMainThread); // currentThreadIsMainThread is only used in ASSERTs
     // SWEEP: delete everything with a zero refcount (garbage) and unmark everything else
     CollectorHeap& heap = heapType == Collector::PrimaryHeap ? primaryHeap : numberHeap;
     
@@ -893,8 +894,8 @@ bool Collector::collect()
   ASSERT(JSLock::lockCount() > 0);
   ASSERT(JSLock::currentThreadIsHoldingLock());
 
-  ASSERT(primaryHeap.operationInProgress == NoOperation | numberHeap.operationInProgress == NoOperation);
-  if (primaryHeap.operationInProgress != NoOperation | numberHeap.operationInProgress != NoOperation)
+  ASSERT((primaryHeap.operationInProgress == NoOperation) | (numberHeap.operationInProgress == NoOperation));
+  if ((primaryHeap.operationInProgress != NoOperation) | (numberHeap.operationInProgress != NoOperation))
     abort();
     
   primaryHeap.operationInProgress = Collection;
@@ -1016,7 +1017,7 @@ HashCountedSet<const char*>* Collector::rootObjectTypeCounts()
 
 bool Collector::isBusy()
 {
-    return primaryHeap.operationInProgress != NoOperation | numberHeap.operationInProgress != NoOperation;
+    return (primaryHeap.operationInProgress != NoOperation) | (numberHeap.operationInProgress != NoOperation)
 }
 
 void Collector::reportOutOfMemoryToAllInterpreters()