Attachment 183686 Details for Bug 220188 – Use unique_ptr instead of auto_ptr

[patch] Use unique_ptr instead of auto_ptr

use-unique_ptr.diff (text/plain), 8.17 KB, created by Tobias C. Berner on 2017-06-21 18:49:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias C. Berner

Created: 2017-06-21 18:49:03 UTC

Size: 8.17 KB

patch

obsolete

>Index: devel/qt5-script/files/patch-fix_unsupported_auto_ptr
>===================================================================
>--- devel/qt5-script/files/patch-fix_unsupported_auto_ptr	(nonexistent)
>+++ devel/qt5-script/files/patch-fix_unsupported_auto_ptr	(working copy)
>@@ -0,0 +1,109 @@
>+--- src/3rdparty/javascriptcore/JavaScriptCore/parser/Nodes.h.orig	2016-09-17 20:55:14 UTC
>++++ src/3rdparty/javascriptcore/JavaScriptCore/parser/Nodes.h
>+@@ -1385,11 +1385,11 @@ namespace JSC {
>+ 
>+         using ParserArenaRefCounted::operator new;
>+ 
>+-        void adoptData(std::auto_ptr<ScopeNodeData> data)
>++        void adoptData(std::unique_ptr<ScopeNodeData> data)
>+         {
>+             ASSERT(!data->m_arena.contains(this));
>+             ASSERT(!m_data);
>+-            m_data.adopt(data);
>++            m_data.adopt(std::move(data));
>+         }
>+         ScopeNodeData* data() const { return m_data.get(); }
>+         void destroyData() { m_data.clear(); }
>+--- src/3rdparty/javascriptcore/JavaScriptCore/parser/Parser.cpp.orig	2016-09-17 20:55:14 UTC
>++++ src/3rdparty/javascriptcore/JavaScriptCore/parser/Parser.cpp
>+@@ -29,7 +29,7 @@
>+ #include <wtf/Vector.h>
>+ #include <memory>
>+ 
>+-using std::auto_ptr;
>++using std::unique_ptr;
>+ 
>+ #ifndef yyparse
>+ extern int jscyyparse(void*);
>+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/OwnPtr.h.orig	2016-09-17 20:55:14 UTC
>++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/OwnPtr.h
>+@@ -40,7 +40,7 @@ namespace WTF {
>+         typedef ValueType* PtrType;
>+ 
>+         explicit OwnPtr(PtrType ptr = 0) : m_ptr(ptr) { }
>+-        OwnPtr(std::auto_ptr<ValueType> autoPtr) : m_ptr(autoPtr.release()) { }
>++        OwnPtr(std::unique_ptr<ValueType> autoPtr) : m_ptr(autoPtr.release()) { }
>+         // See comment in PassOwnPtr.h for why this takes a const reference.
>+         template <typename U> OwnPtr(const PassOwnPtr<U>& o);
>+ 
>+@@ -58,7 +58,7 @@ namespace WTF {
>+         // FIXME: This should be renamed to adopt. 
>+         void set(PtrType ptr) { ASSERT(!ptr || m_ptr != ptr); deleteOwnedPtr(m_ptr); m_ptr = ptr; }
>+ 
>+-        void adopt(std::auto_ptr<ValueType> autoPtr) { ASSERT(!autoPtr.get() || m_ptr != autoPtr.get()); deleteOwnedPtr(m_ptr); m_ptr = autoPtr.release(); }
>++        void adopt(std::unique_ptr<ValueType> autoPtr) { ASSERT(!autoPtr.get() || m_ptr != autoPtr.get()); deleteOwnedPtr(m_ptr); m_ptr = autoPtr.release(); }
>+ 
>+         void clear() { deleteOwnedPtr(m_ptr); m_ptr = 0; }
>+ 
>+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/VectorTraits.h.orig	2016-09-17 20:55:14 UTC
>++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/VectorTraits.h
>+@@ -81,7 +81,7 @@ namespace WTF {
>+     struct VectorTraits<OwnPtr<P> > : SimpleClassVectorTraits { };
>+ 
>+     template<typename P>
>+-    struct VectorTraits<std::auto_ptr<P> > : SimpleClassVectorTraits { };
>++    struct VectorTraits<std::unique_ptr<P> > : SimpleClassVectorTraits { };
>+ 
>+     template<typename First, typename Second>
>+     struct VectorTraits<pair<First, Second> >
>+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/Collator.h.orig	2016-09-17 20:55:14 UTC
>++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/Collator.h
>+@@ -47,7 +47,7 @@ namespace WTF {
>+         ~Collator();
>+         void setOrderLowerFirst(bool);
>+ 
>+-        static std::auto_ptr<Collator> userDefault();
>++        static std::unique_ptr<Collator> userDefault();
>+ 
>+         Result collate(const ::UChar*, size_t, const ::UChar*, size_t) const;
>+ 
>+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/CollatorDefault.cpp.orig	2016-09-17 20:55:14 UTC
>++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/CollatorDefault.cpp
>+@@ -45,9 +45,9 @@ void Collator::setOrderLowerFirst(bool)
>+ {
>+ }
>+ 
>+-std::auto_ptr<Collator> Collator::userDefault()
>++std::unique_ptr<Collator> Collator::userDefault()
>+ {
>+-    return std::auto_ptr<Collator>(new Collator(0));
>++    return std::unique_ptr<Collator>(new Collator(0));
>+ }
>+ 
>+ // A default implementation for platforms that lack Unicode-aware collation.
>+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp.orig	2016-09-17 20:55:14 UTC
>++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp
>+@@ -57,7 +57,7 @@ Collator::Collator(const char* locale)
>+ {
>+ }
>+ 
>+-std::auto_ptr<Collator> Collator::userDefault()
>++std::unique_ptr<Collator> Collator::userDefault()
>+ {
>+ #if OS(DARWIN) && PLATFORM(CF)
>+     // Mac OS X doesn't set UNIX locale to match user-selected one, so ICU default doesn't work.
>+@@ -71,11 +71,11 @@ std::auto_ptr<Collator> Collator::userDefault()
>+     char buf[256];
>+     if (collationOrder) {
>+         CFStringGetCString(collationOrder, buf, sizeof(buf), kCFStringEncodingASCII);
>+-        return std::auto_ptr<Collator>(new Collator(buf));
>++        return std::unique_ptr<Collator>(new Collator(buf));
>+     } else
>+-        return std::auto_ptr<Collator>(new Collator(""));
>++        return std::unique_ptr<Collator>(new Collator(""));
>+ #else
>+-    return std::auto_ptr<Collator>(new Collator(0));
>++    return std::unique_ptr<Collator>(new Collator(0));
>+ #endif
>+ }
>+ 
>
>Property changes on: devel/qt5-script/files/patch-fix_unsupported_auto_ptr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/qt5-script/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h
>===================================================================
>--- devel/qt5-script/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h	(revision 444047)
>+++ devel/qt5-script/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h	(working copy)
>@@ -6,7 +6,7 @@
> 
> [1] https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html
> 
>---- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig	2017-02-02 14:03:08 UTC
>+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig	2016-09-17 20:55:14 UTC
> +++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
> @@ -296,6 +296,7 @@
>  #elif defined(__ARM_ARCH_6__) \
>Index: devel/qt5-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__jit__JITStubs.cpp
>===================================================================
>--- devel/qt5-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__jit__JITStubs.cpp	(revision 444047)
>+++ devel/qt5-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__jit__JITStubs.cpp	(working copy)
>@@ -1,6 +1,6 @@
>---- ./src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp.orig	2012-12-12 20:18:37.000000000 +0100
>-+++ ./src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp	2012-12-17 02:10:50.513375070 +0100
>-@@ -80,7 +80,7 @@
>+--- src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp.orig	2016-09-17 20:55:14 UTC
>++++ src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp
>+@@ -80,7 +80,7 @@ namespace JSC {
>  #define THUMB_FUNC_PARAM(name)
>  #endif
>  
>Index: devel/qt5-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__runtime__JSValue.h
>===================================================================
>--- devel/qt5-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__runtime__JSValue.h	(revision 444047)
>+++ devel/qt5-script/files/patch-src__3rdparty__javascriptcore__JavaScriptCore__runtime__JSValue.h	(working copy)
>@@ -1,6 +1,6 @@
>---- ./src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h.orig	2012-12-12 20:18:36.000000000 +0100
>-+++ ./src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h	2012-12-17 02:13:05.073285539 +0100
>-@@ -491,7 +491,11 @@
>+--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h.orig	2016-09-17 20:55:14 UTC
>++++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h
>+@@ -490,7 +490,11 @@ namespace JSC {
>              u.asBits.tag = CellTag;
>          else
>              u.asBits.tag = EmptyValueTag;
>@@ -12,7 +12,7 @@
>  #if ENABLE(JSC_ZOMBIES)
>          ASSERT(!isZombie());
>  #endif
>-@@ -503,7 +507,11 @@
>+@@ -502,7 +506,11 @@ namespace JSC {
>              u.asBits.tag = CellTag;
>          else
>              u.asBits.tag = EmptyValueTag;

Actions: View | Diff

Attachments on bug 220188: 183678 | 183686 | 183690