summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/javascriptcore
diff options
context:
space:
mode:
authorJohn Brooks <special@dereferenced.net>2010-03-27 17:35:27 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-03-27 17:46:06 (GMT)
commitdcb055cde3a8d31e52a2d2143f14ca8662859541 (patch)
treec9343e1acf5a8941d39ef032b482eeb6bc405776 /src/3rdparty/javascriptcore
parentcaada5afef099b0ba7ecedb8a08ef0ecc7b5802d (diff)
downloadQt-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/javascriptcore')
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/runtime/StructureTransitionTable.h4
1 files changed, 2 insertions, 2 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));
}
}