Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/webkit-25-misc.diff
author simonjin
Mon, 17 May 2010 09:20:42 +0000
changeset 2650 901d2088a9b2
child 2663 a8edf8722649
permissions -rw-r--r--
Bump webkit to 1.1.90
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2650
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
     1
 
diff -r f96dc080483f JavaScriptCore/wtf/Vector.h
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
     2
 
--- a/JavaScriptCore/wtf/Vector.h	Thu Apr 22 12:51:41 2010 +0800
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
     3
 
+++ b/JavaScriptCore/wtf/Vector.h	Tue May 04 13:48:16 2010 +0800
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
     4
 
@@ -948,7 +964,7 @@
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
     5
 
         // one is needed.
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
     6
 
         new (end()) T(static_cast<T>(*ptr));
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
     7
 
 #else
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
     8
 
-        new (end()) T(*ptr);
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
     9
 
+	new (end()) T(*(T*)ptr);
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
    10
 
 #endif
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
    11
 
         ++m_size;
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
    12
 
     }
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
    13
 
diff -r 42df7d3e6809 JavaScriptCore/runtime/SmallStrings.cpp
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
    14
 
--- a/JavaScriptCore/runtime/SmallStrings.cpp	Thu May 13 17:59:14 2010 +0800
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
    15
 
+++ b/JavaScriptCore/runtime/SmallStrings.cpp	Thu May 13 18:02:32 2010 +0800
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
    16
 
@@ -61,7 +61,7 @@
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
    17
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
    18
 
 SmallStrings::SmallStrings()
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
    19
 
 {
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
    20
 
-    COMPILE_ASSERT(numCharactersToStore == arrayLength(m_singleCharacterStrings), IsNumCharactersConstInSyncWithClassUsage);
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
    21
 
+    //COMPILE_ASSERT(numCharactersToStore == arrayLength(m_singleCharacterStrings), IsNumCharactersConstInSyncWithClassUsage);
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
    22
 
     clear();
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
    23
 
 }
901d2088a9b2 Bump webkit to 1.1.90
simonjin
parents:
diff changeset 
    24
upstream/spec-files-extra