summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2011-09-01 11:30:40 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-09 13:06:49 +0100
commit6fe10a0e8c8b8498ad499e053090f54bd690dad4 (patch)
treed3ddeda7f03302a230f4f3798abc63e0d5ef4fb4
parent85145850b68d2e18103621ea9c643039df397d37 (diff)
downloadqtjsbackend-6fe10a0e8c8b8498ad499e053090f54bd690dad4.tar.gz
[V8] Fix compilation with Intel CC.
Issue reported upstream at: http://code.google.com/p/v8/issues/detail?id=1885 http://code.google.com/p/v8/issues/detail?id=689 Change-Id: If651c5f68dc9d425f4fb086e57205d79f4b68878 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
-rw-r--r--src/3rdparty/v8/src/objects.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/v8/src/objects.cc b/src/3rdparty/v8/src/objects.cc
index f12a2b7..5fa4473 100644
--- a/src/3rdparty/v8/src/objects.cc
+++ b/src/3rdparty/v8/src/objects.cc
@@ -11997,6 +11997,7 @@ template class Dictionary<SeededNumberDictionaryShape, uint32_t>;
template class Dictionary<UnseededNumberDictionaryShape, uint32_t>;
+#ifndef __INTEL_COMPILER
template MaybeObject* Dictionary<SeededNumberDictionaryShape, uint32_t>::
Allocate(int at_least_space_for);
@@ -12089,7 +12090,7 @@ int Dictionary<StringDictionaryShape, String*>::NumberOfEnumElements();
template
int HashTable<SeededNumberDictionaryShape, uint32_t>::FindEntry(uint32_t);
-
+#endif
// Collates undefined and unexisting elements below limit from position
// zero of the elements. The object stays in Dictionary mode.