Resolved compiler warnings

cofenberg · Jun 10, 2019 · ef07b2c · ef07b2c
1 parent 1ef7328
commit ef07b2c
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 7 deletions.
diff --git a/Source/Renderer/Private/Direct3D10Renderer/Direct3D10Renderer.cpp b/Source/Renderer/Private/Direct3D10Renderer/Direct3D10Renderer.cpp
@@ -10980,7 +10980,7 @@ namespace Direct3D10Renderer
 		return numberOfShaderLanguages;
 	}
 
-	const char* Direct3D10Renderer::getShaderLanguageName(uint32_t index) const
+	const char* Direct3D10Renderer::getShaderLanguageName([[maybe_unused]] uint32_t index) const
 	{
 		RENDERER_ASSERT(mContext, index < getNumberOfShaderLanguages(), "Direct3D 10: Shader language index is out-of-bounds")
 		return ::detail::HLSL_NAME;

diff --git a/Source/Renderer/Private/Direct3D11Renderer/Direct3D11Renderer.cpp b/Source/Renderer/Private/Direct3D11Renderer/Direct3D11Renderer.cpp
@@ -13979,7 +13979,7 @@ namespace Direct3D11Renderer
 		return numberOfShaderLanguages;
 	}
 
-	const char* Direct3D11Renderer::getShaderLanguageName(uint32_t index) const
+	const char* Direct3D11Renderer::getShaderLanguageName([[maybe_unused]] uint32_t index) const
 	{
 		RENDERER_ASSERT(mContext, index < getNumberOfShaderLanguages(), "Direct3D 11: Shader language index is out-of-bounds")
 		return ::detail::HLSL_NAME;

diff --git a/Source/Renderer/Private/Direct3D12Renderer/Direct3D12Renderer.cpp b/Source/Renderer/Private/Direct3D12Renderer/Direct3D12Renderer.cpp
@@ -12112,7 +12112,7 @@ namespace Direct3D12Renderer
 		return numberOfShaderLanguages;
 	}
 
-	const char* Direct3D12Renderer::getShaderLanguageName(uint32_t index) const
+	const char* Direct3D12Renderer::getShaderLanguageName([[maybe_unused]] uint32_t index) const
 	{
 		RENDERER_ASSERT(mContext, index < getNumberOfShaderLanguages(), "Direct3D 12: Shader language index is out-of-bounds")
 		return ::detail::HLSL_NAME;

diff --git a/Source/Renderer/Private/Direct3D9Renderer/Direct3D9Renderer.cpp b/Source/Renderer/Private/Direct3D9Renderer/Direct3D9Renderer.cpp
@@ -8715,7 +8715,7 @@ namespace Direct3D9Renderer
 		return numberOfShaderLanguages;
 	}
 
-	const char* Direct3D9Renderer::getShaderLanguageName(uint32_t index) const
+	const char* Direct3D9Renderer::getShaderLanguageName([[maybe_unused]] uint32_t index) const
 	{
 		RENDERER_ASSERT(mContext, index < getNumberOfShaderLanguages(), "Direct3D 9: Shader language index is out-of-bounds")
 		return ::detail::HLSL_NAME;

diff --git a/Source/Renderer/Private/NullRenderer/NullRenderer.cpp b/Source/Renderer/Private/NullRenderer/NullRenderer.cpp
@@ -3907,7 +3907,7 @@ namespace NullRenderer
 		return 1;
 	}
 
-	const char* NullRenderer::getShaderLanguageName(uint32_t index) const
+	const char* NullRenderer::getShaderLanguageName([[maybe_unused]] uint32_t index) const
 	{
 		RENDERER_ASSERT(mContext, index < getNumberOfShaderLanguages(), "Null: Shader language index is out-of-bounds")
 		return ::detail::NULL_NAME;

diff --git a/Source/Renderer/Private/OpenGLES3Renderer/OpenGLES3Renderer.cpp b/Source/Renderer/Private/OpenGLES3Renderer/OpenGLES3Renderer.cpp
@@ -10359,7 +10359,7 @@ namespace OpenGLES3Renderer
 		return 1;
 	}
 
-	const char* OpenGLES3Renderer::getShaderLanguageName(uint32_t index) const
+	const char* OpenGLES3Renderer::getShaderLanguageName([[maybe_unused]] uint32_t index) const
 	{
 		RENDERER_ASSERT(mContext, index < getNumberOfShaderLanguages(), "OpenGL ES 3: Shader language index is out-of-bounds")
 		return ::detail::GLSLES_NAME;

diff --git a/Source/RendererToolkit/Private/AssetCompiler/TextureAssetCompiler.cpp b/Source/RendererToolkit/Private/AssetCompiler/TextureAssetCompiler.cpp
@@ -95,7 +95,14 @@ PRAGMA_WARNING_PUSH
 	#include <rapidjson/document.h>
 PRAGMA_WARNING_POP
 
-#include <atomic>
+// Disable warnings in external headers, we can't fix them
+PRAGMA_WARNING_PUSH
+	PRAGMA_WARNING_DISABLE_MSVC(4625)	// warning C4625: 'std::atomic_flag': copy constructor was implicitly defined as deleted
+	PRAGMA_WARNING_DISABLE_MSVC(4626)	// warning C4626: 'std::atomic_flag': assignment operator was implicitly defined as deleted
+	PRAGMA_WARNING_DISABLE_MSVC(5026)	// warning C5026: 'std::atomic_flag': move constructor was implicitly defined as deleted
+	PRAGMA_WARNING_DISABLE_MSVC(5027)	// warning C5027: 'std::atomic_flag': move assignment operator was implicitly defined as deleted
+	#include <atomic>
+PRAGMA_WARNING_POP
 
 
 //[-------------------------------------------------------]

diff --git a/Source/RendererToolkit/Private/Project/ProjectImpl.h b/Source/RendererToolkit/Private/Project/ProjectImpl.h
@@ -39,6 +39,8 @@ PRAGMA_WARNING_PUSH
 	PRAGMA_WARNING_DISABLE_MSVC(4625)	// warning C4625: 'std::_Ptr_base<_Ty>': copy constructor was implicitly defined as deleted
 	PRAGMA_WARNING_DISABLE_MSVC(4626)	// warning C4626: 'std::_Ptr_base<_Ty>': assignment operator was implicitly defined as deleted
 	PRAGMA_WARNING_DISABLE_MSVC(4668)	// warning C4668: '_M_HYBRID_X86_ARM64' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
+	PRAGMA_WARNING_DISABLE_MSVC(5026)	// warning C5026: 'std::atomic_flag': move constructor was implicitly defined as deleted
+	PRAGMA_WARNING_DISABLE_MSVC(5027)	// warning C5027: 'std::atomic_flag': move assignment operator was implicitly defined as deleted
 	PRAGMA_WARNING_DISABLE_MSVC(5039)	// warning C5039: '_Thrd_start': pointer or reference to potentially throwing function passed to extern C function under -EHc. Undefined behavior may occur if this function throws an exception.
 	#include <thread>
 	#include <atomic>	// For "std::atomic<>"