diff --git a/deps/discord-rpc/thirdparty/rapidjson-1.1.0/include/rapidjson/document.h b/deps/discord-rpc/thirdparty/rapidjson-1.1.0/include/rapidjson/document.h index e3e20dfbdc..7562214af9 100644 --- a/deps/discord-rpc/thirdparty/rapidjson-1.1.0/include/rapidjson/document.h +++ b/deps/discord-rpc/thirdparty/rapidjson-1.1.0/include/rapidjson/document.h @@ -1936,7 +1936,7 @@ private: if (count) { GenericValue* e = static_cast(allocator.Malloc(count * sizeof(GenericValue))); SetElementsPointer(e); - std::memcpy(e, values, count * sizeof(GenericValue)); + std::memcpy(static_cast(e), static_cast(values), count * sizeof(GenericValue)); } else SetElementsPointer(0); @@ -1949,7 +1949,7 @@ private: if (count) { Member* m = static_cast(allocator.Malloc(count * sizeof(Member))); SetMembersPointer(m); - std::memcpy(m, members, count * sizeof(Member)); + std::memcpy(static_cast(m), static_cast(members), count * sizeof(Member)); } else SetMembersPointer(0); diff --git a/deps/glslang/glslang/SPIRV/bitutils.h b/deps/glslang/glslang/SPIRV/bitutils.h index 31288ab69d..d5e61badd8 100644 --- a/deps/glslang/glslang/SPIRV/bitutils.h +++ b/deps/glslang/glslang/SPIRV/bitutils.h @@ -26,7 +26,7 @@ Dest BitwiseCast(Src source) { Dest dest; static_assert(sizeof(source) == sizeof(dest), "BitwiseCast: Source and destination must have the same size"); - std::memcpy(&dest, &source, sizeof(dest)); + std::memcpy(static_cast(&dest), static_cast(&source), sizeof(dest)); return dest; } diff --git a/libretro-common/cdrom/cdrom.c b/libretro-common/cdrom/cdrom.c index 55fa67368f..a7d3c6785b 100644 --- a/libretro-common/cdrom/cdrom.c +++ b/libretro-common/cdrom/cdrom.c @@ -175,7 +175,7 @@ static void cdrom_print_sense_data(const unsigned char *sense, size_t len) break; } - printf("[CDROM] Sense Key: %02X (%s)\n", key, sense_key_text); + printf("[CDROM] Sense Key: %02X (%s)\n", key, sense_key_text ? sense_key_text : "null"); printf("[CDROM] ASC: %02X\n", asc); printf("[CDROM] ASCQ: %02X\n", ascq);