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 |
|