diff options
| author | John Brooks <special@dereferenced.net> | 2010-03-27 17:35:27 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-27 17:46:06 (GMT) |
| commit | dcb055cde3a8d31e52a2d2143f14ca8662859541 (patch) | |
| tree | c9343e1acf5a8941d39ef032b482eeb6bc405776 /src/3rdparty | |
| parent | caada5afef099b0ba7ecedb8a08ef0ecc7b5802d (diff) | |
| download | Qt-dcb055cde3a8d31e52a2d2143f14ca8662859541.zip Qt-dcb055cde3a8d31e52a2d2143f14ca8662859541.tar.gz Qt-dcb055cde3a8d31e52a2d2143f14ca8662859541.tar.bz2 | |
Trivial fix to JavaScriptCore to fix building with MSVC 2010
Reviewed-By: Thiago Macieira
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/runtime/StructureTransitionTable.h | 4 | ||||
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/StructureTransitionTable.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/StructureTransitionTable.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/StructureTransitionTable.h index 35fb7e4..2ecf0d3 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/StructureTransitionTable.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/StructureTransitionTable.h @@ -143,14 +143,14 @@ namespace JSC { if (!specificValue) { TransitionTable::iterator find = table()->find(key); if (find == table()->end()) - table()->add(key, Transition(structure, 0)); + table()->add(key, Transition(structure, (Structure*)0)); else find->second.first = structure; } else { // If we're adding a transition to a specific value, then there cannot be // an existing transition ASSERT(!table()->contains(key)); - table()->add(key, Transition(0, structure)); + table()->add(key, Transition((Structure*)0, structure)); } } diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/StructureTransitionTable.h b/src/3rdparty/webkit/JavaScriptCore/runtime/StructureTransitionTable.h index 0fa7b73..f39560a 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/StructureTransitionTable.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/StructureTransitionTable.h @@ -143,14 +143,14 @@ namespace JSC { if (!specificValue) { TransitionTable::iterator find = table()->find(key); if (find == table()->end()) - table()->add(key, Transition(structure, 0)); + table()->add(key, Transition(structure, (Structure*)0)); else find->second.first = structure; } else { // If we're adding a transition to a specific value, then there cannot be // an existing transition ASSERT(!table()->contains(key)); - table()->add(key, Transition(0, structure)); + table()->add(key, Transition((Structure*)0, structure)); } } |