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

(-)Makefile (-1 / +1 lines)
Lines 11-17 Link Here
11
11
12
LICENSE=	MIT
12
LICENSE=	MIT
13
13
14
USES=		cmake
14
USES=		cmake compiler:c++11-lang
15
USE_GITHUB=	yes
15
USE_GITHUB=	yes
16
GH_ACCOUNT=	rttrorg
16
GH_ACCOUNT=	rttrorg
17
17
(-)files/patch-3rd__party_rapidjson-1.1.0_rapidjson_document.h (+40 lines)
Line 0 Link Here
1
--- 3rd_party/rapidjson-1.1.0/rapidjson/document.h.orig	2019-01-18 18:25:46 UTC
2
+++ 3rd_party/rapidjson-1.1.0/rapidjson/document.h
3
@@ -1439,7 +1439,7 @@ class GenericValue { (public)
4
         MemberIterator pos = MemberBegin() + (first - MemberBegin());
5
         for (MemberIterator itr = pos; itr != last; ++itr)
6
             itr->~Member();
7
-        std::memmove(&*pos, &*last, static_cast<size_t>(MemberEnd() - last) * sizeof(Member));
8
+        std::memmove(static_cast<void*>(&*pos), &*last, static_cast<size_t>(MemberEnd() - last) * sizeof(Member));
9
         data_.o.size -= static_cast<SizeType>(last - first);
10
         return pos;
11
     }
12
@@ -1642,8 +1642,8 @@ class GenericValue { (public)
13
         RAPIDJSON_ASSERT(last <= End());
14
         ValueIterator pos = Begin() + (first - Begin());
15
         for (ValueIterator itr = pos; itr != last; ++itr)
16
-            itr->~GenericValue();
17
-        std::memmove(pos, last, static_cast<size_t>(End() - last) * sizeof(GenericValue));
18
+	    itr->~GenericValue();
19
+ 	 std::memmove(static_cast<void*>(pos), last, static_cast<size_t>(End() - last) * sizeof(GenericValue));
20
         data_.a.size -= static_cast<SizeType>(last - first);
21
         return pos;
22
     }
23
@@ -1950,7 +1950,7 @@ class GenericValue { (public)
24
         if (count) {
25
             GenericValue* e = static_cast<GenericValue*>(allocator.Malloc(count * sizeof(GenericValue)));
26
             SetElementsPointer(e);
27
-            std::memcpy(e, values, count * sizeof(GenericValue));
28
+	    std::memcpy(static_cast<void*>(e), values, count * sizeof(GenericValue));
29
         }
30
         else
31
             SetElementsPointer(0);
32
@@ -1963,7 +1963,7 @@ class GenericValue { (public)
33
         if (count) {
34
             Member* m = static_cast<Member*>(allocator.Malloc(count * sizeof(Member)));
35
             SetMembersPointer(m);
36
-            std::memcpy(m, members, count * sizeof(Member));
37
+ 	     std::memcpy(static_cast<void*>(m), members, count * sizeof(Member));
38
         }
39
         else
40
             SetMembersPointer(0);

Return to bug 237697