⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 155402 in webkit


Ignore:
Timestamp:
Sep 9, 2013, 4:37:43 PM (13 years ago)
Author:
andersca@apple.com
Message:

Remove wtf/TypeTraits.h
https://bugs.webkit.org/show_bug.cgi?id=121047

Reviewed by Darin Adler.

  • GNUmakefile.list.am:
  • WTF.pro:
  • WTF.vcxproj/WTF.vcxproj:
  • WTF.vcxproj/WTF.vcxproj.filters:
  • WTF.xcodeproj/project.pbxproj:
  • wtf/CMakeLists.txt:
  • wtf/TypeTraits.cpp: Removed.
  • wtf/TypeTraits.h: Removed.
  • wtf/VectorTraits.h:
Location:
trunk/Source
Files:
2 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/jsc.cpp

    r155239 r155402  
    262262};
    263263
    264 COMPILE_ASSERT(!IsInteger<GlobalObject>::value, WTF_IsInteger_GlobalObject_false);
    265 
    266264const ClassInfo GlobalObject::s_info = { "global", &JSGlobalObject::s_info, 0, ExecState::globalObjectTable, CREATE_METHOD_TABLE(GlobalObject) };
    267265const GlobalObjectMethodTable GlobalObject::s_globalObjectMethodTable = { &allowsAccessFrom, &supportsProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &javaScriptExperimentsEnabled, 0 };
  • trunk/Source/JavaScriptCore/testRegExp.cpp

    r154038 r155402  
    139139    }
    140140};
    141 
    142 COMPILE_ASSERT(!IsInteger<GlobalObject>::value, WTF_IsInteger_GlobalObject_false);
    143141
    144142const ClassInfo GlobalObject::s_info = { "global", &JSGlobalObject::s_info, 0, ExecState::globalObjectTable, CREATE_METHOD_TABLE(GlobalObject) };
  • trunk/Source/WTF/ChangeLog

    r155360 r155402  
     12013-09-09  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove wtf/TypeTraits.h
     4        https://bugs.webkit.org/show_bug.cgi?id=121047
     5
     6        Reviewed by Darin Adler.
     7
     8        * GNUmakefile.list.am:
     9        * WTF.pro:
     10        * WTF.vcxproj/WTF.vcxproj:
     11        * WTF.vcxproj/WTF.vcxproj.filters:
     12        * WTF.xcodeproj/project.pbxproj:
     13        * wtf/CMakeLists.txt:
     14        * wtf/TypeTraits.cpp: Removed.
     15        * wtf/TypeTraits.h: Removed.
     16        * wtf/VectorTraits.h:
     17
    1182013-09-09  Luciano Wolf  <luciano.wolf@openbossa.org>
    219
  • trunk/Source/WTF/GNUmakefile.list.am

    r155308 r155402  
    179179    Source/WTF/wtf/ThreadingWin.cpp \
    180180    Source/WTF/wtf/TriState.h \
    181     Source/WTF/wtf/TypeTraits.cpp \
    182     Source/WTF/wtf/TypeTraits.h \
    183181    Source/WTF/wtf/UnionFind.h \
    184182    Source/WTF/wtf/UniStdExtras.h \
  • trunk/Source/WTF/WTF.pro

    r155338 r155402  
    155155    ThreadSafeRefCounted.h \
    156156    ThreadSpecific.h \
    157     TypeTraits.h \
    158157    unicode/CharacterNames.h \
    159158    unicode/Collator.h \
     
    221220    TCSystemAlloc.cpp \
    222221    Threading.cpp \
    223     TypeTraits.cpp \
    224222    WTFThreadData.cpp \
    225223    text/AtomicString.cpp \
  • trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj

    r155308 r155402  
    110110    <ClCompile Include="..\wtf\threads\BinarySemaphore.cpp" />
    111111    <ClCompile Include="..\wtf\threads\win\BinarySemaphoreWin.cpp" />
    112     <ClCompile Include="..\wtf\TypeTraits.cpp" />
    113112    <ClCompile Include="..\wtf\unicode\icu\CollatorICU.cpp" />
    114113    <ClCompile Include="..\wtf\unicode\UTF8.cpp" />
     
    262261    <ClInclude Include="..\wtf\threadspecific.h" />
    263262    <ClInclude Include="..\wtf\threads\BinarySemaphore.h" />
    264     <ClInclude Include="..\wtf\TypeTraits.h" />
    265263    <ClInclude Include="..\wtf\unicode\CharacterNames.h" />
    266264    <ClInclude Include="..\wtf\unicode\Collator.h" />
  • trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters

    r155308 r155402  
    199199      <Filter>wtf</Filter>
    200200    </ClCompile>
    201     <ClCompile Include="..\wtf\TypeTraits.cpp">
    202       <Filter>wtf</Filter>
    203     </ClCompile>
    204201    <ClCompile Include="..\wtf\WTFThreadData.cpp">
    205202      <Filter>wtf</Filter>
     
    646643    </ClInclude>
    647644    <ClInclude Include="..\wtf\ThreadRestrictionVerifier.h">
    648       <Filter>wtf</Filter>
    649     </ClInclude>
    650     <ClInclude Include="..\wtf\TypeTraits.h">
    651645      <Filter>wtf</Filter>
    652646    </ClInclude>
  • trunk/Source/WTF/WTF.xcodeproj/project.pbxproj

    r155308 r155402  
    244244                A8A47454151A825B004123FF /* ThreadSafeRefCounted.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A4733E151A825B004123FF /* ThreadSafeRefCounted.h */; };
    245245                A8A47455151A825B004123FF /* ThreadSpecific.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A4733F151A825B004123FF /* ThreadSpecific.h */; };
    246                 A8A47458151A825B004123FF /* TypeTraits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A47342151A825B004123FF /* TypeTraits.cpp */; };
    247                 A8A47459151A825B004123FF /* TypeTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47343151A825B004123FF /* TypeTraits.h */; };
    248246                A8A4745E151A825B004123FF /* CharacterNames.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47349151A825B004123FF /* CharacterNames.h */; };
    249247                A8A4745F151A825B004123FF /* Collator.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A4734A151A825B004123FF /* Collator.h */; };
     
    517515                A8A4733E151A825B004123FF /* ThreadSafeRefCounted.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadSafeRefCounted.h; sourceTree = "<group>"; };
    518516                A8A4733F151A825B004123FF /* ThreadSpecific.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadSpecific.h; sourceTree = "<group>"; };
    519                 A8A47342151A825B004123FF /* TypeTraits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TypeTraits.cpp; sourceTree = "<group>"; };
    520                 A8A47343151A825B004123FF /* TypeTraits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TypeTraits.h; sourceTree = "<group>"; };
    521517                A8A47349151A825B004123FF /* CharacterNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CharacterNames.h; sourceTree = "<group>"; };
    522518                A8A4734A151A825B004123FF /* Collator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Collator.h; sourceTree = "<group>"; };
     
    794790                                A8A4733F151A825B004123FF /* ThreadSpecific.h */,
    795791                                149EF16216BBFE0D000A4331 /* TriState.h */,
    796                                 A8A47342151A825B004123FF /* TypeTraits.cpp */,
    797                                 A8A47343151A825B004123FF /* TypeTraits.h */,
    798792                                A8A4735C151A825B004123FF /* UnionFind.h */,
    799793                                A8A4736F151A825B004123FF /* ValueCheck.h */,
     
    10821076                                A8A47455151A825B004123FF /* ThreadSpecific.h in Headers */,
    10831077                                149EF16316BBFE0D000A4331 /* TriState.h in Headers */,
    1084                                 A8A47459151A825B004123FF /* TypeTraits.h in Headers */,
    10851078                                A8A47467151A825B004123FF /* Unicode.h in Headers */,
    10861079                                A8A47464151A825B004123FF /* UnicodeIcu.h in Headers */,
     
    12321225                                A8A4744A151A825B004123FF /* Threading.cpp in Sources */,
    12331226                                A8A4744E151A825B004123FF /* ThreadingPthreads.cpp in Sources */,
    1234                                 A8A47458151A825B004123FF /* TypeTraits.cpp in Sources */,
    12351227                                A8A47469151A825B004123FF /* UTF8.cpp in Sources */,
    12361228                                1FA47C8A152502DA00568D1B /* WebCoreThread.cpp in Sources */,
  • trunk/Source/WTF/wtf/CMakeLists.txt

    r155308 r155402  
    107107    Threading.h
    108108    ThreadingPrimitives.h
    109     TypeTraits.h
    110109    VMTags.h
    111110    ValueCheck.h
     
    183182    TCSystemAlloc.cpp
    184183    Threading.cpp
    185     TypeTraits.cpp
    186184    WTFThreadData.cpp
    187185    dtoa.cpp
  • trunk/Source/WTF/wtf/VectorTraits.h

    r154997 r155402  
    2626#include <wtf/Ref.h>
    2727#include <wtf/RefPtr.h>
    28 #include <wtf/TypeTraits.h>
    2928#include <utility>
    3029#include <memory>
     
    6463
    6564    template<typename T>
    66     struct VectorTraits : VectorTraitsBase<IsPod<T>::value, T> { };
     65    struct VectorTraits : VectorTraitsBase<std::is_pod<T>::value, T> { };
    6766
    6867    struct SimpleClassVectorTraits : VectorTraitsBase<false, void>
     
    9190
    9291    template<typename First, typename Second>
    93     struct VectorTraits<pair<First, Second> >
     92    struct VectorTraits<std::pair<First, Second> >
    9493    {
    9594        typedef VectorTraits<First> FirstTraits;
  • trunk/Source/WebCore/platform/CrossThreadCopier.cpp

    r127757 r155402  
    7474};
    7575
    76 COMPILE_ASSERT((WTF::IsSameType<
     76COMPILE_ASSERT((std::is_same<
    7777                  PassRefPtr<CopierThreadSafeRefCountedTest>,
    7878                  CrossThreadCopier<PassRefPtr<CopierThreadSafeRefCountedTest> >::Type
    7979                  >::value),
    8080               PassRefPtrTest);
    81 COMPILE_ASSERT((WTF::IsSameType<
     81COMPILE_ASSERT((std::is_same<
    8282                  PassRefPtr<CopierThreadSafeRefCountedTest>,
    8383                  CrossThreadCopier<RefPtr<CopierThreadSafeRefCountedTest> >::Type
    8484                  >::value),
    8585               RefPtrTest);
    86 COMPILE_ASSERT((WTF::IsSameType<
     86COMPILE_ASSERT((std::is_same<
    8787                  PassRefPtr<CopierThreadSafeRefCountedTest>,
    8888                  CrossThreadCopier<CopierThreadSafeRefCountedTest*>::Type
     
    100100};
    101101
    102 COMPILE_ASSERT((WTF::IsSameType<
     102COMPILE_ASSERT((std::is_same<
    103103                  int,
    104104                  CrossThreadCopier<PassRefPtr<CopierRefCountedTest> >::Type
     
    106106               PassRefPtrRefCountedTest);
    107107
    108 COMPILE_ASSERT((WTF::IsSameType<
     108COMPILE_ASSERT((std::is_same<
    109109                  int,
    110110                  CrossThreadCopier<RefPtr<CopierRefCountedTest> >::Type
     
    112112               RefPtrRefCountedTest);
    113113
    114 COMPILE_ASSERT((WTF::IsSameType<
     114COMPILE_ASSERT((std::is_same<
    115115                  int,
    116116                  CrossThreadCopier<CopierRefCountedTest*>::Type
     
    119119
    120120// Verify that PassOwnPtr gets passed through.
    121 COMPILE_ASSERT((WTF::IsSameType<
     121COMPILE_ASSERT((std::is_same<
    122122                  PassOwnPtr<float>,
    123123                  CrossThreadCopier<PassOwnPtr<float> >::Type
     
    126126
    127127// Verify that PassOwnPtr does not get passed through.
    128 COMPILE_ASSERT((WTF::IsSameType<
     128COMPILE_ASSERT((std::is_same<
    129129                  int,
    130130                  CrossThreadCopier<OwnPtr<float> >::Type
  • trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h

    r155357 r155402  
    155155};
    156156
    157 template<typename T> struct ArgumentCoder<Vector<T>> : VectorArgumentCoder<WTF::IsArithmetic<T>::value, T> { };
     157template<typename T> struct ArgumentCoder<Vector<T>> : VectorArgumentCoder<std::is_arithmetic<T>::value, T> { };
    158158
    159159template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg> struct ArgumentCoder<HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>> {
  • trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.h

    r155357 r155402  
    6464    template<typename T> bool decodeEnum(T& result)
    6565    {
    66         COMPILE_ASSERT(sizeof(T) <= sizeof(uint64_t), enum_type_must_not_be_larger_than_64_bits);
     66        static_assert(sizeof(T) <= 8, "Enum type T must not be larger than 64 bits!");
    6767
    6868        uint64_t value;
     
    7777    bool bufferIsLargeEnoughToContain(size_t numElements) const
    7878    {
    79         COMPILE_ASSERT(WTF::IsArithmetic<T>::value, type_must_have_known_encoded_size);
    80      
     79        static_assert(std::is_arithmetic<T>::value, "Type T must have a fixed, known encoded size!");
     80
    8181        if (numElements > std::numeric_limits<size_t>::max() / sizeof(T))
    8282            return false;
Note: See TracChangeset for help on using the changeset viewer.