commit 8355b387ebec5f35ed7fbfd4d335248c13930a75
author mark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sat Feb 01 02:42:30 2014 +0000
committer mark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sat Feb 01 02:42:30 2014 +0000
tree 35d3152c479a680cb995c6f60901c4b0a1878984
parent b361d14495f94e6aa00c2ccc4b9473e376038768

Gardening: fix build breakage.

Not reviewed.

* interpreter/CallFrame.h:



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

Source/JavaScriptCore/ChangeLog

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 0c9c142..b5e3255 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,5 +1,13 @@
 2014-01-31  Mark Lam  <mark.lam@apple.com>
 
+        Gardening: fix build breakage.
+
+        Not reviewed.
+
+        * interpreter/CallFrame.h:
+
+2014-01-31  Mark Lam  <mark.lam@apple.com>
+
         Gardening: Fix a merge problem to unbreak bots.
 
         Not reviewed.

Source/JavaScriptCore/interpreter/CallFrame.h

diff --git a/Source/JavaScriptCore/interpreter/CallFrame.h b/Source/JavaScriptCore/interpreter/CallFrame.h
index 77c4b81..eb686fe 100644
--- a/Source/JavaScriptCore/interpreter/CallFrame.h
+++ b/Source/JavaScriptCore/interpreter/CallFrame.h
@@ -52,7 +52,7 @@
 
         bool hasActivation() const { return !!uncheckedActivation(); }
         JSActivation* activation() const;
-        inline JSValue uncheckedActivation() const;
+        JSValue uncheckedActivation() const;
 
         // Global object in which execution began.
         JS_EXPORT_PRIVATE JSGlobalObject* vmEntryGlobalObject();