Title: [153299] trunk/Source/_javascript_Core
- Revision
- 153299
- Author
- [email protected]
- Date
- 2013-07-24 22:59:09 -0700 (Wed, 24 Jul 2013)
Log Message
Unreviewed buildfix after FTL upstream for non C++11 builds.
* interpreter/CallFrame.h:
* interpreter/StackIteratorPrivate.h:
(JSC::StackIterator::end):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (153298 => 153299)
--- trunk/Source/_javascript_Core/ChangeLog 2013-07-25 05:02:45 UTC (rev 153298)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-07-25 05:59:09 UTC (rev 153299)
@@ -1,3 +1,11 @@
+2013-07-24 Csaba Osztrogonác <[email protected]>
+
+ Unreviewed buildfix after FTL upstream for non C++11 builds.
+
+ * interpreter/CallFrame.h:
+ * interpreter/StackIteratorPrivate.h:
+ (JSC::StackIterator::end):
+
2013-07-24 Oliver Hunt <[email protected]>
Endeavour to fix CMakelist builds
Modified: trunk/Source/_javascript_Core/interpreter/CallFrame.h (153298 => 153299)
--- trunk/Source/_javascript_Core/interpreter/CallFrame.h 2013-07-25 05:02:45 UTC (rev 153298)
+++ trunk/Source/_javascript_Core/interpreter/CallFrame.h 2013-07-25 05:59:09 UTC (rev 153299)
@@ -277,8 +277,8 @@
#endif
CallFrame* callerFrameNoFlags() { return callerFrame()->removeHostCallFrameFlag(); }
- JS_EXPORT_PRIVATE StackIterator begin(StackIterator::FrameFilter = nullptr);
- JS_EXPORT_PRIVATE StackIterator find(JSFunction* calleeFunctionObj, StackIterator::FrameFilter = nullptr);
+ JS_EXPORT_PRIVATE StackIterator begin(StackIterator::FrameFilter = 0);
+ JS_EXPORT_PRIVATE StackIterator find(JSFunction* calleeFunctionObj, StackIterator::FrameFilter = 0);
JS_EXPORT_PRIVATE StackIterator::Frame* end();
private:
Modified: trunk/Source/_javascript_Core/interpreter/StackIteratorPrivate.h (153298 => 153299)
--- trunk/Source/_javascript_Core/interpreter/StackIteratorPrivate.h 2013-07-25 05:02:45 UTC (rev 153298)
+++ trunk/Source/_javascript_Core/interpreter/StackIteratorPrivate.h 2013-07-25 05:59:09 UTC (rev 153299)
@@ -48,9 +48,9 @@
void find(JSFunction*);
private:
- JS_EXPORT_PRIVATE StackIterator(CallFrame* startFrame, FrameFilter = nullptr);
+ JS_EXPORT_PRIVATE StackIterator(CallFrame* startFrame, FrameFilter = 0);
- static Frame* end() { return nullptr; }
+ static Frame* end() { return 0; }
JS_EXPORT_PRIVATE void gotoNextFrame();
Frame* m_frame;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
