Attachment #433746 for bug #582522

Lines 719-725 Link Here

(-)qt-everywhere-opensource-src-4.8.7-orig/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexCompiler.cpp (-1 / +1 lines)
719		719
720	constructor.setupOffsets();	720	constructor.setupOffsets();
721		721
722	return false;	722	return NULL;
723	};	723	};
724		724
725		725

Lines 317-323 Link Here

(-)qt-everywhere-opensource-src-4.8.7-orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.h (-1 / +1 lines)
317	TransitionTable* transitionTable = new TransitionTable;	317	TransitionTable* transitionTable = new TransitionTable;
318	setTransitionTable(transitionTable);	318	setTransitionTable(transitionTable);
319	if (existingTransition)	319	if (existingTransition)
320	add(StructureTransitionTableHash::Key(RefPtr<UString::Rep>(existingTransition->m_nameInPrevious.get()), existingTransition->m_attributesInPrevious), existingTransition, existingTransition->m_specificValueInPrevious);	320	add(StructureTransitionTableHash::Key(RefPtr<UString::Rep>(existingTransition->m_nameInPrevious.get()), static_cast<unsigned int>(existingTransition->m_attributesInPrevious)), existingTransition, existingTransition->m_specificValueInPrevious);
321	}	321	}
322	} // namespace JSC	322	} // namespace JSC
323		323

Lines 157-163 Link Here

(-)qt-everywhere-opensource-src-4.8.7-orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp (-1 / +1 lines)
157	{	157	{
158	if (m_previous) {	158	if (m_previous) {
159	if (m_nameInPrevious)	159	if (m_nameInPrevious)
160	m_previous->table.remove(StructureTransitionTableHash::Key(RefPtr<UString::Rep>(m_nameInPrevious.get()), m_attributesInPrevious), m_specificValueInPrevious);	160	m_previous->table.remove(StructureTransitionTableHash::Key(RefPtr<UString::Rep>(m_nameInPrevious.get()), static_cast<unsigned int>(m_attributesInPrevious)), m_specificValueInPrevious);
161	else	161	else
162	m_previous->table.removeAnonymousSlotTransition(m_anonymousSlotsInPrevious);	162	m_previous->table.removeAnonymousSlotTransition(m_anonymousSlotsInPrevious);
163		163

Lines 25-32 Link Here

(-)qt-everywhere-opensource-src-4.8.7-orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/TypeTraits.h (+4 lines)
25	#include "Platform.h"	25	#include "Platform.h"
26		26
27	#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) \|\| (defined(_MSC_VER) && (_MSC_VER >= 1600))	27	#if (defined(__GLIBCXX__) && (__GLIBCXX__ >= 20070724) && defined(__GXX_EXPERIMENTAL_CXX0X__)) \|\| (defined(_MSC_VER) && (_MSC_VER >= 1600))
		28	#if (__cplusplus >= 201402L)
		29	#include <tr1/type_traits>
		30	#else
28	#include <type_traits>	31	#include <type_traits>
29	#endif	32	#endif
		33	#endif
30		34
31	namespace WTF {	35	namespace WTF {
32		36

Lines 257-263 Link Here

(-)qt-everywhere-opensource-src-4.8.7-orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/HashTable.h (-1 / +1 lines)
257		257
258	using std::swap;	258	using std::swap;
259		259
260	#if !COMPILER(MSVC) && !OS(QNX) && !defined(_LIBCPP_VERSION)	260	#if !COMPILER(MSVC) && !OS(QNX) && !defined(_LIBCPP_VERSION) && (__cplusplus < 201402L)
261	// The Dinkumware C++ library (used by MSVC and QNX) and clang's libc++ have a swap for pairs defined.	261	// The Dinkumware C++ library (used by MSVC and QNX) and clang's libc++ have a swap for pairs defined.
262		262
263	// swap pairs by component, in case of pair members that specialize swap	263	// swap pairs by component, in case of pair members that specialize swap

Return to bug 582522