From 3175e38a2eaa387de29c67d9198a234bc17e55fe Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 16 Jan 2022 22:34:39 -0800 Subject: [PATCH] GXPipelineUid: remove explicit shallow copy where it's the default --- Source/Core/VideoCommon/GXPipelineTypes.h | 35 ----------------------- 1 file changed, 35 deletions(-) diff --git a/Source/Core/VideoCommon/GXPipelineTypes.h b/Source/Core/VideoCommon/GXPipelineTypes.h index ca3fb89701..b448dc107f 100644 --- a/Source/Core/VideoCommon/GXPipelineTypes.h +++ b/Source/Core/VideoCommon/GXPipelineTypes.h @@ -35,24 +35,6 @@ struct GXPipelineUid // and this map lookup can happen every draw call. However, as using memcmp() will also compare // any padding bytes, we have to ensure these are zeroed out. GXPipelineUid() { std::memset(static_cast(this), 0, sizeof(*this)); } -#ifdef _MSC_VER -#pragma warning(push) -// Disable warning for uninitialized member variables, as MSVC doesn't recognise that memcpy -// performs this initialization. -#pragma warning(disable : 26495) -#endif - GXPipelineUid(const GXPipelineUid& rhs) - { - std::memcpy(static_cast(this), &rhs, sizeof(*this)); - } -#ifdef _MSC_VER -#pragma warning(pop) -#endif - GXPipelineUid& operator=(const GXPipelineUid& rhs) - { - std::memcpy(static_cast(this), &rhs, sizeof(*this)); - return *this; - } bool operator<(const GXPipelineUid& rhs) const { return std::memcmp(this, &rhs, sizeof(*this)) < 0; @@ -74,23 +56,6 @@ struct GXUberPipelineUid BlendingState blending_state; GXUberPipelineUid() { std::memset(static_cast(this), 0, sizeof(*this)); } -#ifdef _MSC_VER -#pragma warning(push) -// Disable warning for uninitialized member variables -#pragma warning(disable : 26495) -#endif - GXUberPipelineUid(const GXUberPipelineUid& rhs) - { - std::memcpy(static_cast(this), &rhs, sizeof(*this)); - } -#ifdef _MSC_VER -#pragma warning(pop) -#endif - GXUberPipelineUid& operator=(const GXUberPipelineUid& rhs) - { - std::memcpy(static_cast(this), &rhs, sizeof(*this)); - return *this; - } bool operator<(const GXUberPipelineUid& rhs) const { return std::memcmp(this, &rhs, sizeof(*this)) < 0;