summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2011-09-01 09:30:40 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-06-13 07:57:45 (GMT)
commitdc5492dc5ae68ee97db2fdd8cb8867f749732948 (patch)
tree85dfdefe5851461dda7760198feaea7af46b6c2d
parent21f04f75a261dbd9628b45cd35e17520cf2e85de (diff)
downloadqtjsbackend-dc5492dc5ae68ee97db2fdd8cb8867f749732948.tar.gz
qtjsbackend-dc5492dc5ae68ee97db2fdd8cb8867f749732948.tar.xz
[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: I8ee37e11b42c724a450e56c10f01e0fbb51bc6f0 Reviewed-by: Kent Hansen <kent.hansen@nokia.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 6a7614c..5ed2e2c 100644
--- a/src/3rdparty/v8/src/objects.cc
+++ b/src/3rdparty/v8/src/objects.cc
@@ -11124,6 +11124,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);
@@ -11216,7 +11217,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.