From c629af631907b06c193137043fa86eb5ce739b95 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Fri, 21 Aug 2020 18:08:16 -0700 Subject: [PATCH] replace is_pod with is_standard_layout && is_trivially_copyable --- Source/Core/Core/HW/WiimoteCommon/WiimoteHid.h | 2 +- Source/Core/Core/HW/WiimoteEmu/I2CBus.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/HW/WiimoteCommon/WiimoteHid.h b/Source/Core/Core/HW/WiimoteCommon/WiimoteHid.h index fbcbd8b9e2..6afa1fc38c 100644 --- a/Source/Core/Core/HW/WiimoteCommon/WiimoteHid.h +++ b/Source/Core/Core/HW/WiimoteCommon/WiimoteHid.h @@ -54,7 +54,7 @@ struct TypedHIDInputData T data; - static_assert(std::is_pod()); + static_assert(std::is_standard_layout_v && std::is_trivially_copyable_v); u8* GetData() { return reinterpret_cast(this); } const u8* GetData() const { return reinterpret_cast(this); } diff --git a/Source/Core/Core/HW/WiimoteEmu/I2CBus.h b/Source/Core/Core/HW/WiimoteEmu/I2CBus.h index f20719af32..256f386cd9 100644 --- a/Source/Core/Core/HW/WiimoteEmu/I2CBus.h +++ b/Source/Core/Core/HW/WiimoteEmu/I2CBus.h @@ -26,7 +26,7 @@ protected: template static int RawRead(T* reg_data, u8 addr, int count, u8* data_out) { - static_assert(std::is_pod::value); + static_assert(std::is_standard_layout_v && std::is_trivially_copyable_v); static_assert(0x100 == sizeof(T)); // TODO: addr wraps around after 0xff @@ -42,7 +42,7 @@ protected: template static int RawWrite(T* reg_data, u8 addr, int count, const u8* data_in) { - static_assert(std::is_pod::value); + static_assert(std::is_standard_layout_v && std::is_trivially_copyable_v); static_assert(0x100 == sizeof(T)); // TODO: addr wraps around after 0xff