Attachment 204151 Details for Bug 237697 – patch

[patch] patch

rttr.patch (text/plain), 2.95 KB, created by Piotr Kubaj on 2019-05-01 19:12:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2019-05-01 19:12:02 UTC

Size: 2.95 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 500312)
>+++ Makefile	(working copy)
>@@ -11,7 +11,7 @@
> 
> LICENSE=	MIT
> 
>-USES=		cmake
>+USES=		cmake compiler:c++11-lang
> USE_GITHUB=	yes
> GH_ACCOUNT=	rttrorg
> 
>Index: files/patch-3rd__party_rapidjson-1.1.0_rapidjson_document.h
>===================================================================
>--- files/patch-3rd__party_rapidjson-1.1.0_rapidjson_document.h	(nonexistent)
>+++ files/patch-3rd__party_rapidjson-1.1.0_rapidjson_document.h	(working copy)
>@@ -0,0 +1,40 @@
>+--- 3rd_party/rapidjson-1.1.0/rapidjson/document.h.orig	2019-01-18 18:25:46 UTC
>++++ 3rd_party/rapidjson-1.1.0/rapidjson/document.h
>+@@ -1439,7 +1439,7 @@ class GenericValue { (public)
>+         MemberIterator pos = MemberBegin() + (first - MemberBegin());
>+         for (MemberIterator itr = pos; itr != last; ++itr)
>+             itr->~Member();
>+-        std::memmove(&*pos, &*last, static_cast<size_t>(MemberEnd() - last) * sizeof(Member));
>++        std::memmove(static_cast<void*>(&*pos), &*last, static_cast<size_t>(MemberEnd() - last) * sizeof(Member));
>+         data_.o.size -= static_cast<SizeType>(last - first);
>+         return pos;
>+     }
>+@@ -1642,8 +1642,8 @@ class GenericValue { (public)
>+         RAPIDJSON_ASSERT(last <= End());
>+         ValueIterator pos = Begin() + (first - Begin());
>+         for (ValueIterator itr = pos; itr != last; ++itr)
>+-            itr->~GenericValue();
>+-        std::memmove(pos, last, static_cast<size_t>(End() - last) * sizeof(GenericValue));
>++	    itr->~GenericValue();
>++ 	 std::memmove(static_cast<void*>(pos), last, static_cast<size_t>(End() - last) * sizeof(GenericValue));
>+         data_.a.size -= static_cast<SizeType>(last - first);
>+         return pos;
>+     }
>+@@ -1950,7 +1950,7 @@ class GenericValue { (public)
>+         if (count) {
>+             GenericValue* e = static_cast<GenericValue*>(allocator.Malloc(count * sizeof(GenericValue)));
>+             SetElementsPointer(e);
>+-            std::memcpy(e, values, count * sizeof(GenericValue));
>++	    std::memcpy(static_cast<void*>(e), values, count * sizeof(GenericValue));
>+         }
>+         else
>+             SetElementsPointer(0);
>+@@ -1963,7 +1963,7 @@ class GenericValue { (public)
>+         if (count) {
>+             Member* m = static_cast<Member*>(allocator.Malloc(count * sizeof(Member)));
>+             SetMembersPointer(m);
>+-            std::memcpy(m, members, count * sizeof(Member));
>++ 	     std::memcpy(static_cast<void*>(m), members, count * sizeof(Member));
>+         }
>+         else
>+             SetMembersPointer(0);
>
>Property changes on: files/patch-3rd__party_rapidjson-1.1.0_rapidjson_document.h
>___________________________________________________________________
>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

Flags:

pkubaj: maintainer-approval? (kde)

Actions: View | Diff

Attachments on bug 237697: 204151