<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[27110] trunk/JavaScriptCore</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/27110">27110</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2007-10-26 06:31:15 -0700 (Fri, 26 Oct 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>2007-10-26  Mark Rowe  &lt;mrowe@apple.com&gt;

        Windows build fix.

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreChangeLog">trunk/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkJavaScriptCorekjscollectorcpp">trunk/JavaScriptCore/kjs/collector.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (27109 => 27110)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog        2007-10-26 12:22:37 UTC (rev 27109)
+++ trunk/JavaScriptCore/ChangeLog        2007-10-26 13:31:15 UTC (rev 27110)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2007-10-26  Mark Rowe  &lt;mrowe@apple.com&gt;
+
+        Windows build fix.
+
+        * kjs/collector.cpp:
+        (KJS::Collector::collect):
+
</ins><span class="cx"> 2007-10-26  Oliver Hunt  &lt;oliver@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Maciej.
</span></span></pre></div>
<a id="trunkJavaScriptCorekjscollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/kjs/collector.cpp (27109 => 27110)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/kjs/collector.cpp        2007-10-26 12:22:37 UTC (rev 27109)
+++ trunk/JavaScriptCore/kjs/collector.cpp        2007-10-26 13:31:15 UTC (rev 27110)
</span><span class="lines">@@ -784,6 +784,7 @@
</span><span class="cx"> 
</span><span class="cx"> template &lt;Collector::HeapType heapType&gt; size_t Collector::sweep(bool currentThreadIsMainThread)
</span><span class="cx"> {
</span><ins>+    UNUSED_PARAM(currentThreadIsMainThread); // currentThreadIsMainThread is only used in ASSERTs
</ins><span class="cx">     // SWEEP: delete everything with a zero refcount (garbage) and unmark everything else
</span><span class="cx">     CollectorHeap&amp; heap = heapType == Collector::PrimaryHeap ? primaryHeap : numberHeap;
</span><span class="cx">     
</span><span class="lines">@@ -893,8 +894,8 @@
</span><span class="cx">   ASSERT(JSLock::lockCount() &gt; 0);
</span><span class="cx">   ASSERT(JSLock::currentThreadIsHoldingLock());
</span><span class="cx"> 
</span><del>-  ASSERT(primaryHeap.operationInProgress == NoOperation | numberHeap.operationInProgress == NoOperation);
-  if (primaryHeap.operationInProgress != NoOperation | numberHeap.operationInProgress != NoOperation)
</del><ins>+  ASSERT((primaryHeap.operationInProgress == NoOperation) | (numberHeap.operationInProgress == NoOperation));
+  if ((primaryHeap.operationInProgress != NoOperation) | (numberHeap.operationInProgress != NoOperation))
</ins><span class="cx">     abort();
</span><span class="cx">     
</span><span class="cx">   primaryHeap.operationInProgress = Collection;
</span><span class="lines">@@ -1016,7 +1017,7 @@
</span><span class="cx"> 
</span><span class="cx"> bool Collector::isBusy()
</span><span class="cx"> {
</span><del>-    return primaryHeap.operationInProgress != NoOperation | numberHeap.operationInProgress != NoOperation;
</del><ins>+    return (primaryHeap.operationInProgress != NoOperation) | (numberHeap.operationInProgress != NoOperation)
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void Collector::reportOutOfMemoryToAllInterpreters()
</span></span></pre>
</div>
</div>

</body>
</html>