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 {
1986
1986
if (count) {
1987
1987
GenericValue* e = static_cast <GenericValue*>(allocator.Malloc (count * sizeof (GenericValue)));
1988
1988
SetElementsPointer (e);
1989
- std::memcpy (e , values, count * sizeof (GenericValue));
1989
+ std::memcpy (static_cast < void *>(e) , values, count * sizeof (GenericValue));
1990
1990
}
1991
1991
else
1992
1992
SetElementsPointer (0 );
@@ -1999,7 +1999,7 @@ class GenericValue {
1999
1999
if (count) {
2000
2000
Member* m = static_cast <Member*>(allocator.Malloc (count * sizeof (Member)));
2001
2001
SetMembersPointer (m);
2002
- std::memcpy (m , members, count * sizeof (Member));
2002
+ std::memcpy (static_cast < void *>(m) , members, count * sizeof (Member));
2003
2003
}
2004
2004
else
2005
2005
SetMembersPointer (0 );
Original file line number Diff line number Diff line change @@ -25252,7 +25252,7 @@ if no parse error occurred.
25252
25252
@since version 1.0.0
25253
25253
*/
25254
25254
JSON_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)
25256
25256
{
25257
25257
return nlohmann::json::parse(s, s + n);
25258
25258
}
@@ -25271,7 +25271,7 @@ object if no parse error occurred.
25271
25271
@since version 2.0.0
25272
25272
*/
25273
25273
JSON_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)
25275
25275
{
25276
25276
return nlohmann::json::json_pointer(std::string(s, n));
25277
25277
}
You can’t perform that action at this time.
0 commit comments