Attachment #434940 for bug #583744

View | Details | Raw Unified | Return to bug 583744
Collapse All | Expand All




        friend void deleteAllValues<>(const HashSet&);
        friend void fastDeleteAllValues<>(const HashSet&);

#if (COMPILER(MSVC) && _MSC_VER >= 1700) || (__cplusplus >= 201402L)
        // MSVC2012/MSVC2013 has trouble constructing a HashTableConstIteratorAdapter from a
        // HashTableIterator despite the existence of a const_iterator cast method on the latter class.
        pair<iterator, bool> iterator_const_cast(const pair<typename HashTableType::iterator, bool>& p)
        {
            return make_pair(iterator(typename HashTableType::const_iterator(p.first)), p.second);
        }
#endif
        HashTableType m_impl;

    template<typename T, typename U, typename V>
    inline pair<typename HashSet<T, U, V>::iterator, bool> HashSet<T, U, V>::add(const ValueType& value)
    {
#if (COMPILER(MSVC) && _MSC_VER >= 1700) || (__cplusplus >= 201402L)
        return iterator_const_cast(m_impl.add(value));
#else
        return m_impl.add(value);

    HashSet<Value, HashFunctions, Traits>::add(const T& value)
    {
        typedef HashSetTranslatorAdapter<ValueType, ValueTraits, T, HashTranslator> Adapter;
#if (COMPILER(MSVC) && _MSC_VER >= 1700) || (__cplusplus >= 201402L)
        return iterator_const_cast(m_impl.template addPassingHashCode<T, T, Adapter>(value, value));
#else
        return m_impl.template addPassingHashCode<T, T, Adapter>(value, value);

Lines 233-240 Link Here

(-)qt-everywhere-opensource-src-4.8.7-orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/unicode/UTF8.cpp (-2 / +2 lines)
233	// Magic values subtracted from a buffer value during UTF8 conversion.	233	// Magic values subtracted from a buffer value during UTF8 conversion.
234	// This table contains as many values as there might be trailing bytes	234	// This table contains as many values as there might be trailing bytes
235	// in a UTF-8 sequence.	235	// in a UTF-8 sequence.
236	static const UChar32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL,	236	static const UChar32 offsetsFromUTF8[6] = { static_cast<const UChar32>(0x00000000UL), static_cast<const UChar32>(0x00003080UL), static_cast<const UChar32>(0x000E2080UL),
237	0x03C82080UL, 0xFA082080UL, 0x82082080UL };	237	static_cast<const UChar32>(0x03C82080UL), static_cast<const UChar32>(0xFA082080UL), static_cast<const UChar32>(0x82082080UL) };
238		238
239	static inline UChar32 readUTF8Sequence(const char*& sequence, unsigned length)	239	static inline UChar32 readUTF8Sequence(const char*& sequence, unsigned length)
240	{	240	{

Lines 25-32 Link Here

(-)qt-everywhere-opensource-src-4.8.7-orig/src/3rdparty/webkit/Source/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 1080-1086 Link Here

(-)qt-everywhere-opensource-src-4.8.7-orig/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp (-1 / +1 lines)
1080	{	1080	{
1081	// Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called.	1081	// Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called.
1082	RefPtr<RenderStyle> currentStyle(renderStyle());	1082	RefPtr<RenderStyle> currentStyle(renderStyle());
1083	bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false;	1083	bool hasParentStyle = parentNodeForRenderingAndStyle() ? (parentNodeForRenderingAndStyle()->renderStyle() != static_cast<WebCore::RenderStyle*>(0)) : false;
1084	bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();	1084	bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();
1085	bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules();	1085	bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules();
1086		1086

Return to bug 583744

Lines 92-103 Link Here

(-)qt-everywhere-opensource-src-4.8.7-orig/src/3rdparty/webkit/Source/JavaScriptCore/wtf/HashSet.h (-4 / +4 lines)
92	friend void deleteAllValues<>(const HashSet&);	92	friend void deleteAllValues<>(const HashSet&);
93	friend void fastDeleteAllValues<>(const HashSet&);	93	friend void fastDeleteAllValues<>(const HashSet&);
94		94
95	#if COMPILER(MSVC) && _MSC_VER >= 1700	95	#if (COMPILER(MSVC) && _MSC_VER >= 1700) \|\| (__cplusplus >= 201402L)
96	// MSVC2012/MSVC2013 has trouble constructing a HashTableConstIteratorAdapter from a	96	// MSVC2012/MSVC2013 has trouble constructing a HashTableConstIteratorAdapter from a
97	// HashTableIterator despite the existence of a const_iterator cast method on the latter class.	97	// HashTableIterator despite the existence of a const_iterator cast method on the latter class.
98	pair<iterator, bool> iterator_const_cast(const pair<typename HashTableType::iterator, bool>& p)	98	pair<iterator, bool> iterator_const_cast(const pair<typename HashTableType::iterator, bool>& p)
99	{	99	{
100	return make_pair(iterator(HashTableType::const_iterator(p.first)), p.second);	100	return make_pair(iterator(typename HashTableType::const_iterator(p.first)), p.second);
101	}	101	}
102	#endif	102	#endif
103	HashTableType m_impl;	103	HashTableType m_impl;
Lines 185-191 Link Here
185	template<typename T, typename U, typename V>	185	template<typename T, typename U, typename V>
186	inline pair<typename HashSet<T, U, V>::iterator, bool> HashSet<T, U, V>::add(const ValueType& value)	186	inline pair<typename HashSet<T, U, V>::iterator, bool> HashSet<T, U, V>::add(const ValueType& value)
187	{	187	{
188	#if COMPILER(MSVC) && _MSC_VER >= 1700	188	#if (COMPILER(MSVC) && _MSC_VER >= 1700) \|\| (__cplusplus >= 201402L)
189	return iterator_const_cast(m_impl.add(value));	189	return iterator_const_cast(m_impl.add(value));
190	#else	190	#else
191	return m_impl.add(value);	191	return m_impl.add(value);
Lines 198-204 Link Here
198	HashSet<Value, HashFunctions, Traits>::add(const T& value)	198	HashSet<Value, HashFunctions, Traits>::add(const T& value)
199	{	199	{
200	typedef HashSetTranslatorAdapter<ValueType, ValueTraits, T, HashTranslator> Adapter;	200	typedef HashSetTranslatorAdapter<ValueType, ValueTraits, T, HashTranslator> Adapter;
201	#if COMPILER(MSVC) && _MSC_VER >= 1700	201	#if (COMPILER(MSVC) && _MSC_VER >= 1700) \|\| (__cplusplus >= 201402L)
202	return iterator_const_cast(m_impl.template addPassingHashCode<T, T, Adapter>(value, value));	202	return iterator_const_cast(m_impl.template addPassingHashCode<T, T, Adapter>(value, value));
203	#else	203	#else
204	return m_impl.template addPassingHashCode<T, T, Adapter>(value, value);	204	return m_impl.template addPassingHashCode<T, T, Adapter>(value, value);