Fix -Wdefaulted-function-deleted warning (#244)

microsoft · Aug 27, 2024 · 2087943 · 2087943
1 parent 33a957e
commit 2087943
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 12 deletions.
diff --git a/Src/BasicPostProcess.cpp b/Src/BasicPostProcess.cpp
@@ -138,8 +138,8 @@ namespace
         DeviceResources(const DeviceResources&) = delete;
         DeviceResources& operator=(const DeviceResources&) = delete;
 
-        DeviceResources(DeviceResources&&) = default;
-        DeviceResources& operator=(DeviceResources&&) = default;
+        DeviceResources(DeviceResources&&) = delete;
+        DeviceResources& operator=(DeviceResources&&) = delete;
 
         ID3D12RootSignature* GetRootSignature(int slot, const D3D12_ROOT_SIGNATURE_DESC& desc)
         {
@@ -172,6 +172,12 @@ class BasicPostProcess::Impl : public AlignedNew<PostProcessConstants>
 public:
     Impl(_In_ ID3D12Device* device, const RenderTargetState& rtState, Effect ifx);
 
+    Impl(const Impl&) = delete;
+    Impl& operator=(const Impl&) = delete;
+
+    Impl(Impl&&) = default;
+    Impl& operator=(Impl&&) = default;
+
     void Process(_In_ ID3D12GraphicsCommandList* commandList);
 
     void SetDirtyFlag() noexcept { mDirtyFlags = INT_MAX; }

diff --git a/Src/DualPostProcess.cpp b/Src/DualPostProcess.cpp
@@ -92,8 +92,8 @@ namespace
         DeviceResources(const DeviceResources&) = delete;
         DeviceResources& operator=(const DeviceResources&) = delete;
 
-        DeviceResources(DeviceResources&&) = default;
-        DeviceResources& operator=(DeviceResources&&) = default;
+        DeviceResources(DeviceResources&&) = delete;
+        DeviceResources& operator=(DeviceResources&&) = delete;
 
         ID3D12RootSignature* GetRootSignature(const D3D12_ROOT_SIGNATURE_DESC& desc)
         {
@@ -123,6 +123,12 @@ class DualPostProcess::Impl : public AlignedNew<PostProcessConstants>
 public:
     Impl(_In_ ID3D12Device* device, const RenderTargetState& rtState, Effect ifx);
 
+    Impl(const Impl&) = delete;
+    Impl& operator=(const Impl&) = delete;
+
+    Impl(Impl&&) = default;
+    Impl& operator=(Impl&&) = default;
+
     void Process(_In_ ID3D12GraphicsCommandList* commandList);
 
     void SetDirtyFlag() noexcept { mDirtyFlags = INT_MAX; }

diff --git a/Src/EffectFactory.cpp b/Src/EffectFactory.cpp
@@ -78,8 +78,8 @@ class EffectFactory::Impl
     Impl(const Impl&) = delete;
     Impl& operator=(const Impl&) = delete;
 
-    Impl(Impl&&) = default;
-    Impl& operator=(Impl&&) = default;
+    Impl(Impl&&) = delete;
+    Impl& operator=(Impl&&) = delete;
 
     std::shared_ptr<IEffect> CreateEffect(
         const EffectInfo& info,

diff --git a/Src/EffectTextureFactory.cpp b/Src/EffectTextureFactory.cpp
@@ -72,8 +72,8 @@ class EffectTextureFactory::Impl
     Impl(const Impl&) = delete;
     Impl& operator=(const Impl&) = delete;
 
-    Impl(Impl&&) = default;
-    Impl& operator=(Impl&&) = default;
+    Impl(Impl&&) = delete;
+    Impl& operator=(Impl&&) = delete;
 
     size_t CreateTexture(_In_z_ const wchar_t* name, int descriptorSlot);
 

diff --git a/Src/PBREffectFactory.cpp b/Src/PBREffectFactory.cpp
@@ -97,8 +97,8 @@ class PBREffectFactory::Impl
     Impl(const Impl&) = delete;
     Impl& operator=(const Impl&) = delete;
 
-    Impl(Impl&&) = default;
-    Impl& operator=(Impl&&) = default;
+    Impl(Impl&&) = delete;
+    Impl& operator=(Impl&&) = delete;
 
     std::shared_ptr<IEffect> CreateEffect(
         const EffectInfo& info,

diff --git a/Src/ToneMapPostProcess.cpp b/Src/ToneMapPostProcess.cpp
@@ -230,8 +230,8 @@ namespace
         DeviceResources(const DeviceResources&) = delete;
         DeviceResources& operator=(const DeviceResources&) = delete;
 
-        DeviceResources(DeviceResources&&) = default;
-        DeviceResources& operator=(DeviceResources&&) = default;
+        DeviceResources(DeviceResources&&) = delete;
+        DeviceResources& operator=(DeviceResources&&) = delete;
 
         ID3D12RootSignature* GetRootSignature(const D3D12_ROOT_SIGNATURE_DESC& desc)
         {
@@ -261,6 +261,12 @@ class ToneMapPostProcess::Impl : public AlignedNew<ToneMapConstants>
 public:
     Impl(_In_ ID3D12Device* device, const RenderTargetState& rtState, Operator op, TransferFunction func, bool mrt = false);
 
+    Impl(const Impl&) = delete;
+    Impl& operator=(const Impl&) = delete;
+
+    Impl(Impl&&) = default;
+    Impl& operator=(Impl&&) = default;
+
     void Process(_In_ ID3D12GraphicsCommandList* commandList);
 
     void SetDirtyFlag() noexcept { mDirtyFlags = INT_MAX; }