Changeset 154864 in webkit


Ignore:
Timestamp:
Aug 29, 2013 7:08:32 PM (11 years ago)
Author:
ryuan.choi@samsung.com
Message:

Fix build break after r154861
​https://bugs.webkit.org/show_bug.cgi?id=120503

Reviewed by Geoffrey Garen.

Unreviewed build fix attempt for GTK, Qt Windows and CMake based ports.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
  • Target.pri:
  • runtime/MapData.h:

(JSC::MapData::KeyType::KeyType):

Location:
trunk/Source/JavaScriptCore
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r154861 r154864  
    336336    runtime/JSLock.cpp
    337337    runtime/JSMap.cpp
    338     runtime/JSMapConstructor.cpp
    339     runtime/JSMapPrototype.cpp
    340338    runtime/JSNameScope.cpp
    341339    runtime/JSNotAnObject.cpp
    … …  
    365363    runtime/LiteralParser.cpp
    366364    runtime/Lookup.cpp
     365    runtime/MapConstructor.cpp
    367366    runtime/MapData.cpp
     367    runtime/MapPrototype.cpp
    368368    runtime/MathObject.cpp
    369369    runtime/MemoryStatistics.cpp

  • trunk/Source/JavaScriptCore/ChangeLog

    r154863 r154864  
     12013-08-29  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        Fix build break after r154861
     4        https://bugs.webkit.org/show_bug.cgi?id=120503
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        Unreviewed build fix attempt for GTK, Qt Windows and CMake based ports.
     9
     10        * CMakeLists.txt:
     11        * GNUmakefile.list.am:
     12        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
     13        * Target.pri:
     14        * runtime/MapData.h:
     15        (JSC::MapData::KeyType::KeyType):
     16
    1172013-08-29  Andreas Kling  <akling@apple.com>
    218

  • trunk/Source/JavaScriptCore/GNUmakefile.list.am

    r154861 r154864  
    874874        Source/JavaScriptCore/runtime/JSLock.h \
    875875        Source/JavaScriptCore/runtime/JSMap.cpp \
    876         Source/JavaScriptCore/runtime/JSMapConstructor.cpp \
    877         Source/JavaScriptCore/runtime/JSMapPrototype.cpp \
    878876        Source/JavaScriptCore/runtime/JSNotAnObject.cpp \
    879877        Source/JavaScriptCore/runtime/JSNotAnObject.h \
    … …  
    936934        Source/JavaScriptCore/runtime/Lookup.cpp \
    937935        Source/JavaScriptCore/runtime/Lookup.h \
     936        Source/JavaScriptCore/runtime/MapConstructor.cpp \
     937        Source/JavaScriptCore/runtime/MapConstructor.h\
     938        Source/JavaScriptCore/runtime/MapData.cpp \
     939        Source/JavaScriptCore/runtime/MapData.h \
     940        Source/JavaScriptCore/runtime/MapPrototype.cpp \
     941        Source/JavaScriptCore/runtime/MapPrototype.h \
    938942        Source/JavaScriptCore/runtime/MatchResult.h \
    939943        Source/JavaScriptCore/runtime/MathObject.cpp \

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters

    r154861 r154864  
    577577      <Filter>runtime</Filter>
    578578    </ClCompile>
    579     <ClCompile Include="..\runtime\JSMapPrototype.cpp">
    580       <Filter>runtime</Filter>
    581     </ClCompile>
    582     <ClCompile Include="..\runtime\JSMapConstructor.cpp">
    583       <Filter>runtime</Filter>
    584     </ClCompile>
    585579    <ClCompile Include="..\runtime\JSNameScope.cpp">
    586580      <Filter>runtime</Filter>
    … …  
    631625      <Filter>runtime</Filter>
    632626    </ClCompile>
     627    <ClCompile Include="..\runtime\MapPrototype.cpp">
     628      <Filter>runtime</Filter>
     629    </ClCompile>
    633630    <ClCompile Include="..\runtime\MapData.cpp">
     631      <Filter>runtime</Filter>
     632    </ClCompile>
     633    <ClCompile Include="..\runtime\MapConstructor.cpp">
    634634      <Filter>runtime</Filter>
    635635    </ClCompile>

  • trunk/Source/JavaScriptCore/Target.pri

    r154861 r154864  
    325325    runtime/JSLock.cpp \
    326326    runtime/JSMap.cpp \
    327     runtime/JSMapConstructor.cpp \
    328     runtime/JSPrototype.cpp \
    329327    runtime/JSNameScope.cpp \
    330328    runtime/JSNameScope.cpp \
    … …  
    354352    runtime/LiteralParser.cpp \
    355353    runtime/Lookup.cpp \
     354    runtime/MapConstructor.cpp \
    356355    runtime/MapData.cpp \
     356    runtime/Prototype.cpp \
    357357    runtime/MathObject.cpp \
    358358    runtime/MemoryStatistics.cpp \

  • trunk/Source/JavaScriptCore/runtime/MapData.h

    r154862 r154864  
    3333#include <wtf/HashFunctions.h>
    3434#include <wtf/HashMap.h>
     35#include <wtf/MathExtras.h>
    3536
    3637namespace JSC {
    … …  
    149150    }
    150151    double d = v.asDouble();
    151     if (std::isnan(d) || (signbit(d) && d == 0.0)) {
     152    if (std::isnan(d) || (std::signbit(d) && d == 0.0)) {
    152153        value = v;
    153154        return;
Note: See TracChangeset for help on using the changeset viewer.