svn commit: r501509 - in head/devel/rttr: . files

[Adriaan de Groot]

Author: adridg
Date: Sun May 12 22:48:18 2019
New Revision: 501509
URL: https://svnweb.freebsd.org/changeset/ports/501509

Log:
  Fix devel/rttr on GCC-based architectures.
  
   - Use C++11-capable compiler
   - Import fix from upstream's upstream,
  	https://github.com/Tencent/rapidjson/commit/fa5963a2f5b231ee2babff771f169ccca22870ed
  
  No PORTREVISION bump since it didn't compile before, and the
  patch doesn't change any functionality.
  
  PR:		237697
  Submitted by:	pkubaj
  Reported by:	pkubaj

Added:
  head/devel/rttr/files/patch-3rd__party_rapidjson-1.1.0_rapidjson_document.h   (contents, props changed)
Modified:
  head/devel/rttr/Makefile

Modified: head/devel/rttr/Makefile
==============================================================================
--- head/devel/rttr/Makefile	Sun May 12 21:21:39 2019	(r501508)
+++ head/devel/rttr/Makefile	Sun May 12 22:48:18 2019	(r501509)
@@ -11,7 +11,7 @@ COMMENT=	Run Time Type Reflection
 
 LICENSE=	MIT
 
-USES=		cmake
+USES=		cmake compiler:c++11-lang
 USE_GITHUB=	yes
 GH_ACCOUNT=	rttrorg
 

Added: head/devel/rttr/files/patch-3rd__party_rapidjson-1.1.0_rapidjson_document.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/rttr/files/patch-3rd__party_rapidjson-1.1.0_rapidjson_document.h	Sun May 12 22:48:18 2019	(r501509)
@@ -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);