Title: [125270] branches/safari-536.26-branch/Source/_javascript_Core
- Revision
- 125270
- Author
- [email protected]
- Date
- 2012-08-10 04:27:53 -0700 (Fri, 10 Aug 2012)
Log Message
Windows build fix after merging radar 12050720.
Modified Paths
Diff
Modified: branches/safari-536.26-branch/Source/_javascript_Core/ChangeLog (125269 => 125270)
--- branches/safari-536.26-branch/Source/_javascript_Core/ChangeLog 2012-08-10 10:09:52 UTC (rev 125269)
+++ branches/safari-536.26-branch/Source/_javascript_Core/ChangeLog 2012-08-10 11:27:53 UTC (rev 125270)
@@ -1,3 +1,10 @@
+2012-08-10 Lucas Forschler <[email protected]>
+
+ Windows Build fix after merging radar 12050720.
+
+ * runtime/JSLock.cpp:
+ (JSC::JSLock::DropAllLocks::DropAllLocks):
+
2012-08-06 Lucas Forschler <[email protected]>
Merge patch for <rdar://problem/11781190>
Modified: branches/safari-536.26-branch/Source/_javascript_Core/runtime/JSLock.cpp (125269 => 125270)
--- branches/safari-536.26-branch/Source/_javascript_Core/runtime/JSLock.cpp 2012-08-10 10:09:52 UTC (rev 125269)
+++ branches/safari-536.26-branch/Source/_javascript_Core/runtime/JSLock.cpp 2012-08-10 11:27:53 UTC (rev 125270)
@@ -347,11 +347,11 @@
{
}
-JSLock::DropAllLocks::DropAllLocks(ExecState*)
+JSLock::DropAllLocks::DropAllLocks(ExecState*, AlwaysDropLocksTag)
{
}
-JSLock::DropAllLocks::DropAllLocks(JSGlobalData*)
+JSLock::DropAllLocks::DropAllLocks(JSGlobalData*, AlwaysDropLocksTag)
{
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
