diff --git a/source/graphics/TerrainTextureManager.cpp b/source/graphics/TerrainTextureManager.cpp index e7e3391e8a..f9e96962ca 100644 --- a/source/graphics/TerrainTextureManager.cpp +++ b/source/graphics/TerrainTextureManager.cpp @@ -31,13 +31,6 @@ #include "ps/CLogger.h" #include "ps/Filesystem.h" -// Disable "'boost::algorithm::detail::is_classifiedF' : assignment operator could not be generated" -// and "find_format_store.hpp(74) : warning C4100: 'Input' : unreferenced formal parameter" -#if MSC_VERSION -#pragma warning(disable:4512) -#pragma warning(disable:4100) -#endif - #include diff --git a/source/lib/external_libraries/icu.h b/source/lib/external_libraries/icu.h index 13074175ef..07b8ba2196 100644 --- a/source/lib/external_libraries/icu.h +++ b/source/lib/external_libraries/icu.h @@ -23,15 +23,6 @@ #ifndef INCLUDED_ICU #define INCLUDED_ICU -#if MSC_VERSION -# pragma warning(push) -# pragma warning(disable:4512) // "assignment operator could not be generated" -#endif - #include -#if MSC_VERSION -# pragma warning(pop) -#endif - #endif // #ifndef INCLUDED_ICU diff --git a/source/lib/pch/pch_warnings.h b/source/lib/pch/pch_warnings.h index 6f61c43913..8a00d4b4ba 100644 --- a/source/lib/pch/pch_warnings.h +++ b/source/lib/pch/pch_warnings.h @@ -13,6 +13,7 @@ # pragma warning(disable:4324) // structure was padded due to __declspec(align()) # pragma warning(disable:4351) // yes, default init of array entries is desired # pragma warning(disable:4355) // 'this' used in base member initializer list +# pragma warning(disable:4512) // assignment operator could not be generated # pragma warning(disable:4718) // recursive call has no side effects, deleting # pragma warning(disable:4786) // identifier truncated to 255 chars # pragma warning(disable:4996) // function is deprecated diff --git a/source/ps/ArchiveBuilder.cpp b/source/ps/ArchiveBuilder.cpp index f9525d8124..4adb3070ff 100644 --- a/source/ps/ArchiveBuilder.cpp +++ b/source/ps/ArchiveBuilder.cpp @@ -26,11 +26,6 @@ #include "lib/file/vfs/vfs_util.h" #include "ps/XML/Xeromyces.h" -// Disable "'boost::algorithm::detail::is_classifiedF' : assignment operator could not be generated" -#if MSC_VERSION -#pragma warning(disable:4512) -#endif - #include CArchiveBuilder::CArchiveBuilder(const OsPath& mod, const OsPath& tempdir) : diff --git a/source/ps/CLogger.cpp b/source/ps/CLogger.cpp index 58cf7c228e..a46fd544b3 100644 --- a/source/ps/CLogger.cpp +++ b/source/ps/CLogger.cpp @@ -31,13 +31,6 @@ #include #include -// Disable "'boost::algorithm::detail::is_classifiedF' : assignment operator could not be generated" -// and "find_format_store.hpp(74) : warning C4100: 'Input' : unreferenced formal parameter" -#if MSC_VERSION -#pragma warning(disable:4512) -#pragma warning(disable:4100) -#endif - #include static const double RENDER_TIMEOUT = 10.0; // seconds before messages are deleted diff --git a/source/renderer/MikktspaceWrap.h b/source/renderer/MikktspaceWrap.h index bbe40da773..b46ba1a67c 100644 --- a/source/renderer/MikktspaceWrap.h +++ b/source/renderer/MikktspaceWrap.h @@ -21,11 +21,6 @@ #include "third_party/mikktspace/mikktspace.h" -// Disable useless MSVC warning -#if MSC_VERSION -# pragma warning(disable:4512) // "assignment operator could not be generated" -#endif - class MikkTSpace { diff --git a/source/scriptinterface/ScriptTypes.h b/source/scriptinterface/ScriptTypes.h index 72d45471d5..4fedc678be 100644 --- a/source/scriptinterface/ScriptTypes.h +++ b/source/scriptinterface/ScriptTypes.h @@ -75,7 +75,6 @@ # pragma warning(push) # pragma warning(disable:4480) // "nonstandard extension used: specifying underlying type for enum" # pragma warning(disable:4100) // "unreferenced formal parameter" -# pragma warning(disable:4512) // "assignment operator could not be generated" # pragma warning(disable:4265) // "class has virtual functions, but destructor is not virtual" # pragma warning(disable:4251) // "class 'X' needs to have dll-interface to be used by clients of struct 'Y'" # pragma warning(disable:4005) // "macro redefinition" diff --git a/source/simulation2/system/ParamNode.cpp b/source/simulation2/system/ParamNode.cpp index 2e4b1720ea..e6a824faa3 100644 --- a/source/simulation2/system/ParamNode.cpp +++ b/source/simulation2/system/ParamNode.cpp @@ -27,11 +27,6 @@ #include -// Disable "'boost::algorithm::detail::is_classifiedF' : assignment operator could not be generated" -#if MSC_VERSION -#pragma warning(disable:4512) -#endif - #include #include // this isn't in string.hpp in old Boosts