mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-26 09:46:09 +00:00
Code Issues Releases Activity

Fix devel/rttr on GCC-based architectures.

Browse Source 
- Use C++11-capable compiler
 - Import fix from upstream's upstream,
	fa5963a2f5

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
This commit is contained in:
Adriaan de Groot 2019-05-12 22:48:18 +00:00
parent 94bbc2ab37
commit 7265c74bbd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=501509
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/rttr/Makefile
View File

@ -11,7 +11,7 @@ COMMENT= Run Time Type Reflection
LICENSE= MIT LICENSE= MIT
USES= cmake USES= cmake compiler:c++11-lang
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= rttrorg GH_ACCOUNT= rttrorg

40
devel/rttr/files/patch-3rd__party_rapidjson-1.1.0_rapidjson_document.h Normal file
View File

@ -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);