Fix compiler errors. v5.2.0 v5.2.0-rc1
authorErik Verbruggen <erik.verbruggen@me.com>
Mon, 18 Nov 2013 10:58:33 +0000 (11:58 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 18 Nov 2013 14:54:56 +0000 (15:54 +0100)
commit15bb30b0e90c628cc3812627923d1d459d461505
tree9e8ac40f800bcf9d699e1004224fa5c7579599f5
parent78985c5c2c4ec8c7d06bf0c59c5534f968d62f07
Fix compiler errors.

On Mavericks with Apple's Clang 5.0 (3.3 based):
../3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.h:320:117: error: non-const reference cannot bind to bit-field 'm_attributesInPrevious'
  ...add(StructureTransitionTableHash::Key(RefPtr<UString::Rep>(existingTransition->m_nameInPrevious.get()), existingTransition->m_attributesInPrevious), exi...
                                                                                                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

C++11 specific:
../3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h:179:35: error: non-constant-expression cannot be narrowed from type 'size_t'
      (aka 'unsigned long') to 'uint32_t' (aka 'unsigned int') in initializer list [-Wc++11-narrowing]
                LineInfo info = { instructions().size(), n->lineNo() };
                                  ^~~~~~~~~~~~~~~~~~~~~

Both occur in multiple places.

Task-number: QTBUG-34842

Change-Id: I98a29b51718a6e0db8749ac1b495e071e9fe479d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.h
src/3rdparty/javascriptcore/JavaScriptCore/runtime/Identifier.cpp
src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSONObject.cpp
src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp
src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.h
src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/UTF8.cpp