View | Details | Raw Unified | Return to bug 220188 | Differences between
and this patch

Collapse All | Expand All

(-)devel/qt5-script/files/patch-fix_unsupported_auto_ptr (+109 lines)
Line 0 Link Here
1
--- src/3rdparty/javascriptcore/JavaScriptCore/parser/Nodes.h.orig	2016-09-17 20:55:14 UTC
2
+++ src/3rdparty/javascriptcore/JavaScriptCore/parser/Nodes.h
3
@@ -1385,11 +1385,11 @@ namespace JSC {
4
 
5
         using ParserArenaRefCounted::operator new;
6
 
7
-        void adoptData(std::auto_ptr<ScopeNodeData> data)
8
+        void adoptData(std::unique_ptr<ScopeNodeData> data)
9
         {
10
             ASSERT(!data->m_arena.contains(this));
11
             ASSERT(!m_data);
12
-            m_data.adopt(data);
13
+            m_data.adopt(std::move(data));
14
         }
15
         ScopeNodeData* data() const { return m_data.get(); }
16
         void destroyData() { m_data.clear(); }
17
--- src/3rdparty/javascriptcore/JavaScriptCore/parser/Parser.cpp.orig	2016-09-17 20:55:14 UTC
18
+++ src/3rdparty/javascriptcore/JavaScriptCore/parser/Parser.cpp
19
@@ -29,7 +29,7 @@
20
 #include <wtf/Vector.h>
21
 #include <memory>
22
 
23
-using std::auto_ptr;
24
+using std::unique_ptr;
25
 
26
 #ifndef yyparse
27
 extern int jscyyparse(void*);
28
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/OwnPtr.h.orig	2016-09-17 20:55:14 UTC
29
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/OwnPtr.h
30
@@ -40,7 +40,7 @@ namespace WTF {
31
         typedef ValueType* PtrType;
32
 
33
         explicit OwnPtr(PtrType ptr = 0) : m_ptr(ptr) { }
34
-        OwnPtr(std::auto_ptr<ValueType> autoPtr) : m_ptr(autoPtr.release()) { }
35
+        OwnPtr(std::unique_ptr<ValueType> autoPtr) : m_ptr(autoPtr.release()) { }
36
         // See comment in PassOwnPtr.h for why this takes a const reference.
37
         template <typename U> OwnPtr(const PassOwnPtr<U>& o);
38
 
39
@@ -58,7 +58,7 @@ namespace WTF {
40
         // FIXME: This should be renamed to adopt. 
41
         void set(PtrType ptr) { ASSERT(!ptr || m_ptr != ptr); deleteOwnedPtr(m_ptr); m_ptr = ptr; }
42
 
43
-        void adopt(std::auto_ptr<ValueType> autoPtr) { ASSERT(!autoPtr.get() || m_ptr != autoPtr.get()); deleteOwnedPtr(m_ptr); m_ptr = autoPtr.release(); }
44
+        void adopt(std::unique_ptr<ValueType> autoPtr) { ASSERT(!autoPtr.get() || m_ptr != autoPtr.get()); deleteOwnedPtr(m_ptr); m_ptr = autoPtr.release(); }
45
 
46
         void clear() { deleteOwnedPtr(m_ptr); m_ptr = 0; }
47
 
48
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/VectorTraits.h.orig	2016-09-17 20:55:14 UTC
49
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/VectorTraits.h
50
@@ -81,7 +81,7 @@ namespace WTF {
51
     struct VectorTraits<OwnPtr<P> > : SimpleClassVectorTraits { };
52
 
53
     template<typename P>
54
-    struct VectorTraits<std::auto_ptr<P> > : SimpleClassVectorTraits { };
55
+    struct VectorTraits<std::unique_ptr<P> > : SimpleClassVectorTraits { };
56
 
57
     template<typename First, typename Second>
58
     struct VectorTraits<pair<First, Second> >
59
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/Collator.h.orig	2016-09-17 20:55:14 UTC
60
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/Collator.h
61
@@ -47,7 +47,7 @@ namespace WTF {
62
         ~Collator();
63
         void setOrderLowerFirst(bool);
64
 
65
-        static std::auto_ptr<Collator> userDefault();
66
+        static std::unique_ptr<Collator> userDefault();
67
 
68
         Result collate(const ::UChar*, size_t, const ::UChar*, size_t) const;
69
 
70
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/CollatorDefault.cpp.orig	2016-09-17 20:55:14 UTC
71
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/CollatorDefault.cpp
72
@@ -45,9 +45,9 @@ void Collator::setOrderLowerFirst(bool)
73
 {
74
 }
75
 
76
-std::auto_ptr<Collator> Collator::userDefault()
77
+std::unique_ptr<Collator> Collator::userDefault()
78
 {
79
-    return std::auto_ptr<Collator>(new Collator(0));
80
+    return std::unique_ptr<Collator>(new Collator(0));
81
 }
82
 
83
 // A default implementation for platforms that lack Unicode-aware collation.
84
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp.orig	2016-09-17 20:55:14 UTC
85
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp
86
@@ -57,7 +57,7 @@ Collator::Collator(const char* locale)
87
 {
88
 }
89
 
90
-std::auto_ptr<Collator> Collator::userDefault()
91
+std::unique_ptr<Collator> Collator::userDefault()
92
 {
93
 #if OS(DARWIN) && PLATFORM(CF)
94
     // Mac OS X doesn't set UNIX locale to match user-selected one, so ICU default doesn't work.
95
@@ -71,11 +71,11 @@ std::auto_ptr<Collator> Collator::userDefault()
96
     char buf[256];
97
     if (collationOrder) {
98
         CFStringGetCString(collationOrder, buf, sizeof(buf), kCFStringEncodingASCII);
99
-        return std::auto_ptr<Collator>(new Collator(buf));
100
+        return std::unique_ptr<Collator>(new Collator(buf));
101
     } else
102
-        return std::auto_ptr<Collator>(new Collator(""));
103
+        return std::unique_ptr<Collator>(new Collator(""));
104
 #else
105
-    return std::auto_ptr<Collator>(new Collator(0));
106
+    return std::unique_ptr<Collator>(new Collator(0));
107
 #endif
108
 }
109
 
(-)devel/qt5-script/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h (-1 / +1 lines)
Lines 6-12 Link Here
6
6
7
[1] https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html
7
[1] https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html
8
8
9
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig	2017-02-02 14:03:08 UTC
9
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig	2016-09-17 20:55:14 UTC
10
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
10
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
11
@@ -296,6 +296,7 @@
11
@@ -296,6 +296,7 @@
12
 #elif defined(__ARM_ARCH_6__) \
12
 #elif defined(__ARM_ARCH_6__) \
(-)devel/qt5-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__jit__JITStubs.cpp (-3 / +3 lines)
Lines 1-6 Link Here
1
--- ./src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp.orig	2012-12-12 20:18:37.000000000 +0100
1
--- src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp.orig	2016-09-17 20:55:14 UTC
2
+++ ./src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp	2012-12-17 02:10:50.513375070 +0100
2
+++ src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
3
@@ -80,7 +80,7 @@
3
@@ -80,7 +80,7 @@ namespace JSC {
4
 #define THUMB_FUNC_PARAM(name)
4
 #define THUMB_FUNC_PARAM(name)
5
 #endif
5
 #endif
6
 
6
 
(-)devel/qt5-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__runtime__JSValue.h (-4 / +4 lines)
Lines 1-6 Link Here
1
--- ./src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h.orig	2012-12-12 20:18:36.000000000 +0100
1
--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h.orig	2016-09-17 20:55:14 UTC
2
+++ ./src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h	2012-12-17 02:13:05.073285539 +0100
2
+++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h
3
@@ -491,7 +491,11 @@
3
@@ -490,7 +490,11 @@ namespace JSC {
4
             u.asBits.tag = CellTag;
4
             u.asBits.tag = CellTag;
5
         else
5
         else
6
             u.asBits.tag = EmptyValueTag;
6
             u.asBits.tag = EmptyValueTag;
Lines 12-18 Link Here
12
 #if ENABLE(JSC_ZOMBIES)
12
 #if ENABLE(JSC_ZOMBIES)
13
         ASSERT(!isZombie());
13
         ASSERT(!isZombie());
14
 #endif
14
 #endif
15
@@ -503,7 +507,11 @@
15
@@ -502,7 +506,11 @@ namespace JSC {
16
             u.asBits.tag = CellTag;
16
             u.asBits.tag = CellTag;
17
         else
17
         else
18
             u.asBits.tag = EmptyValueTag;
18
             u.asBits.tag = EmptyValueTag;

Return to bug 220188