File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed
Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -1986,7 +1986,7 @@ class GenericValue {
19861986 if (count) {
19871987 GenericValue* e = static_cast <GenericValue*>(allocator.Malloc (count * sizeof (GenericValue)));
19881988 SetElementsPointer (e);
1989- std::memcpy (e , values, count * sizeof (GenericValue));
1989+ std::memcpy (static_cast < void *>(e) , values, count * sizeof (GenericValue));
19901990 }
19911991 else
19921992 SetElementsPointer (0 );
@@ -1999,7 +1999,7 @@ class GenericValue {
19991999 if (count) {
20002000 Member* m = static_cast <Member*>(allocator.Malloc (count * sizeof (Member)));
20012001 SetMembersPointer (m);
2002- std::memcpy (m , members, count * sizeof (Member));
2002+ std::memcpy (static_cast < void *>(m) , members, count * sizeof (Member));
20032003 }
20042004 else
20052005 SetMembersPointer (0 );
Original file line number Diff line number Diff line change @@ -25252,7 +25252,7 @@ if no parse error occurred.
2525225252@since version 1.0.0
2525325253*/
2525425254JSON_HEDLEY_NON_NULL(1)
25255- inline nlohmann::json operator "" _json(const char* s, std::size_t n)
25255+ inline nlohmann::json operator ""_json(const char* s, std::size_t n)
2525625256{
2525725257 return nlohmann::json::parse(s, s + n);
2525825258}
@@ -25271,7 +25271,7 @@ object if no parse error occurred.
2527125271@since version 2.0.0
2527225272*/
2527325273JSON_HEDLEY_NON_NULL(1)
25274- inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
25274+ inline nlohmann::json::json_pointer operator ""_json_pointer(const char* s, std::size_t n)
2527525275{
2527625276 return nlohmann::json::json_pointer(std::string(s, n));
2527725277}
You can’t perform that action at this time.
0 commit comments