0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned up MSVC error suppression

Browse source 
The following have been enabled. They no longer cause any errors or warnings.
* C4819
* C4355
* C4351
* C4345

The following has been disabled globally and will be handled in individual cases:
* C4996

The following have been moved to the project files (meaning they become global in
their respective projects):
* C4250 (in wesnoth)
* C4244 (in wesnoth, wesnoth-lib, wesnothd, and campaignd)

The following has been left alone since I don't build the unit tests:
* C4702
This commit is contained in:
Charles Dang 2018-02-22 01:03:11 +11:00
parent bf8c1b90bf
commit 8707a13a2f
27 changed files with 14 additions and 237 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
projectfiles/VC12/campaignd.vcxproj
View file

@ -48,6 +48,7 @@
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\src;..\..\..\external\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=_WIN32_WINNT_WINXP;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4244</DisableSpecificWarnings>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -64,6 +65,7 @@
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>..\..\src;..\..\..\external\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=_WIN32_WINNT_WINXP;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4244</DisableSpecificWarnings>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>

10
projectfiles/VC12/wesnoth.vcxproj
View file

@ -127,7 +127,7 @@
<OpenMPSupport>true</OpenMPSupport>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DisableSpecificWarnings>4503;4351;4127;4512;4003;4068;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4503;4351;4250;4244;4127;4512;4003;4068;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<TreatSpecificWarningsAsErrors>4239</TreatSpecificWarningsAsErrors>
@ -166,7 +166,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DisableSpecificWarnings>4503;4351;</DisableSpecificWarnings>
<DisableSpecificWarnings>4503;4351;4250;4244;</DisableSpecificWarnings>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<TreatSpecificWarningsAsErrors>4239</TreatSpecificWarningsAsErrors>
</ClCompile>
@ -209,7 +209,7 @@
<OpenMPSupport>true</OpenMPSupport>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DisableSpecificWarnings>4503;4351;4127;4512;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4503;4351;4250;4244;4127;4512;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<TreatSpecificWarningsAsErrors>4239</TreatSpecificWarningsAsErrors>
@ -247,7 +247,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DisableSpecificWarnings>4503;4351;</DisableSpecificWarnings>
<DisableSpecificWarnings>4503;4351;4250;4244;</DisableSpecificWarnings>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<TreatSpecificWarningsAsErrors>4239</TreatSpecificWarningsAsErrors>
</ClCompile>
@ -294,7 +294,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DisableSpecificWarnings>4503;4351;</DisableSpecificWarnings>
<DisableSpecificWarnings>4503;4351;4250;4244;</DisableSpecificWarnings>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<TreatSpecificWarningsAsErrors>4239</TreatSpecificWarningsAsErrors>
</ClCompile>

6
projectfiles/VC12/wesnothd.vcxproj
View file

@ -91,7 +91,7 @@
<OpenMPSupport>true</OpenMPSupport>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DisableSpecificWarnings>4503;4127;4512;4003;4068;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4503;4244;4127;4512;4003;4068;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
@ -118,7 +118,7 @@
<OpenMPSupport>true</OpenMPSupport>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4503</DisableSpecificWarnings>
<DisableSpecificWarnings>4503;4244;</DisableSpecificWarnings>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
@ -146,7 +146,7 @@
<OpenMPSupport>true</OpenMPSupport>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4503</DisableSpecificWarnings>
<DisableSpecificWarnings>4503;4244;</DisableSpecificWarnings>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>

6
projectfiles/VC12/wesnothlib.vcxproj
View file

@ -77,7 +77,7 @@
<OpenMPSupport>true</OpenMPSupport>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DisableSpecificWarnings>4503;4351;4127;4512;4003;4068;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4503;4351;4244;4127;4512;4003;4068;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
@ -100,7 +100,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DisableSpecificWarnings>4503;4351;</DisableSpecificWarnings>
<DisableSpecificWarnings>4503;4351;4244;</DisableSpecificWarnings>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Lib>
@ -122,7 +122,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DisableSpecificWarnings>4503;4351;</DisableSpecificWarnings>
<DisableSpecificWarnings>4503;4351;4244;</DisableSpecificWarnings>
<ForcedIncludeFiles>boost-patched/bind/arg.hpp;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Lib>

10
src/ai/composite/ai.hpp
View file

@ -22,12 +22,6 @@
#include "ai/composite/contexts.hpp"
#include "ai/composite/component.hpp"
#ifdef _MSC_VER
#pragma warning(push)
//silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
//============================================================================
namespace ai {
@ -131,7 +125,3 @@ protected:
};
} //end of namespace ai
#ifdef _MSC_VER
#pragma warning(pop)
#endif

10
src/ai/composite/aspect.hpp
View file

@ -30,12 +30,6 @@
#include <boost/range/adaptor/reversed.hpp>
#ifdef _MSC_VER
#pragma warning(push)
//silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
namespace ai {
class aspect : public readonly_context_proxy, public events::observer, public component {
@ -560,7 +554,3 @@ public:
} //end of namespace ai
#ifdef _MSC_VER
#pragma warning(pop)
#endif

10
src/ai/composite/component.hpp
View file

@ -27,12 +27,6 @@ class config;
#include <string>
#include <vector>
#ifdef _MSC_VER
#pragma warning(push)
//silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
//============================================================================
namespace ai {
@ -92,7 +86,3 @@ public:
} //end of namespace ai
std::ostream &operator<<(std::ostream &o, const ai::path_element &e);
#ifdef _MSC_VER
#pragma warning(pop)
#endif

11
src/ai/composite/contexts.hpp
View file

@ -22,13 +22,6 @@
#include "ai/default/contexts.hpp"
#ifdef _MSC_VER
#pragma warning(push)
//silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
//============================================================================
namespace ai {
@ -156,7 +149,3 @@ private:
} //end of namespace ai
#ifdef _MSC_VER
#pragma warning(pop)
#endif

11
src/ai/composite/goal.hpp
View file

@ -18,12 +18,6 @@
#pragma once
#ifdef _MSC_VER
#pragma warning(push)
//silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
#include "ai/composite/component.hpp"
#include "ai/default/contexts.hpp"
@ -220,8 +214,3 @@ public:
} //end of namespace ai
#ifdef _MSC_VER
#pragma warning(pop)
#endif

10
src/ai/composite/rca.hpp
View file

@ -22,12 +22,6 @@
#include "ai/composite/component.hpp"
#include "ai/composite/contexts.hpp"
#ifdef _MSC_VER
#pragma warning(push)
//silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
//============================================================================
namespace ai {
@ -196,7 +190,3 @@ public:
std::ostream &operator<<(std::ostream &s, const ai::candidate_action& ca);
} //end of namespace ai
#ifdef _MSC_VER
#pragma warning(pop)
#endif

10
src/ai/composite/stage.hpp
View file

@ -22,12 +22,6 @@
#include "ai/composite/component.hpp"
#include "ai/composite/contexts.hpp"
#ifdef _MSC_VER
#pragma warning(push)
//silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
namespace ai {
class ai_composite;
@ -143,7 +137,3 @@ public:
};
} //end of namespace ai
#ifdef _MSC_VER
#pragma warning(pop)
#endif

10
src/ai/contexts.hpp
View file

@ -47,12 +47,6 @@ namespace boost { template <class T> class shared_ptr; }
namespace pathfind { struct paths; }
struct battle_context_unit_stats; // lines 39-39
#ifdef _MSC_VER
#pragma warning(push)
//silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
namespace ai {
typedef ai_context* ai_context_ptr;
@ -1679,7 +1673,3 @@ private:
} //end of namespace ai
#ifdef _MSC_VER
#pragma warning(pop)
#endif

10
src/ai/default/aspect_attacks.hpp
View file

@ -22,12 +22,6 @@
#include "ai/composite/aspect.hpp"
#include "units/filter.hpp"
#ifdef _MSC_VER
#pragma warning(push)
//silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
namespace ai {
@ -100,7 +94,3 @@ private:
};
} // end of namespace ai
#ifdef _MSC_VER
#pragma warning(pop)
#endif

11
src/ai/default/ca.hpp
View file

@ -24,13 +24,6 @@
#include "ai/composite/rca.hpp"
#ifdef _MSC_VER
#pragma warning(push)
//silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
namespace ai {
namespace ai_default_rca {
@ -271,7 +264,3 @@ public:
} // end of namespace testing_ai_default
} // end of namespace ai
#ifdef _MSC_VER
#pragma warning(pop)
#endif

10
src/ai/default/ca_move_to_targets.hpp
View file

@ -23,12 +23,6 @@
#include "units/map.hpp"
#ifdef _MSC_VER
#pragma warning(push)
//silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
namespace pathfind {
struct plain_route;
@ -81,7 +75,3 @@ protected:
} // of namespace testing_ai_default
} // of namespace ai
#ifdef _MSC_VER
#pragma warning(pop)
#endif

10
src/ai/default/contexts.hpp
View file

@ -23,12 +23,6 @@
#include "formula/callable.hpp"
#include "utils/make_enum.hpp"
#ifdef _MSC_VER
#pragma warning(push)
//silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
//============================================================================
namespace ai {
@ -298,7 +292,3 @@ private:
};
} //end of namespace ai
#ifdef _MSC_VER
#pragma warning(pop)
#endif

6
src/ai/default/recruitment.cpp
View file

@ -50,12 +50,6 @@ static lg::log_domain log_ai_recruitment("ai/recruitment");
#define LOG_AI_RECRUITMENT LOG_STREAM(info, log_ai_recruitment)
#define ERR_AI_RECRUITMENT LOG_STREAM(err, log_ai_recruitment)
#ifdef _MSC_VER
#pragma warning(push)
// silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
namespace ai {
namespace default_recruitment {

10
src/ai/default/recruitment.hpp
View file

@ -26,12 +26,6 @@
#include <iomanip>
#ifdef _MSC_VER
#pragma warning(push)
// silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
namespace pathfind {
struct full_cost_map;
@ -276,7 +270,3 @@ private:
} // of namespace default_recruitment
} // of namespace ai
#ifdef _MSC_VER
#pragma warning(pop)
#endif

10
src/ai/default/stage_rca.hpp
View file

@ -22,12 +22,6 @@
#include "ai/composite/rca.hpp"
#include "ai/composite/stage.hpp"
#ifdef _MSC_VER
#pragma warning(push)
//silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
namespace ai {
namespace ai_default_rca {
@ -58,7 +52,3 @@ private:
} // of namespace testing_ai_default
} // of namespace ai
#ifdef _MSC_VER
#pragma warning(pop)
#endif

10
src/ai/formula/ai.hpp
View file

@ -43,12 +43,6 @@ namespace wfl {
class variant;
}
#ifdef _MSC_VER
#pragma warning(push)
//silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
namespace wfl {
typedef std::pair< unit_map::unit_iterator, int> unit_formula_pair;
@ -177,7 +171,3 @@ private:
};
} //end of namespace ai
#ifdef _MSC_VER
#pragma warning(pop)
#endif

10
src/ai/formula/engine_fai.cpp
View file

@ -34,12 +34,6 @@ static lg::log_domain log_ai_engine_fai("ai/engine/fai");
#define LOG_AI_ENGINE_FAI LOG_STREAM(info, log_ai_engine_fai)
#define ERR_AI_ENGINE_FAI LOG_STREAM(err, log_ai_engine_fai)
#ifdef _MSC_VER
#pragma warning(push)
//silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
class fai_candidate_action_wrapper : public candidate_action {
public:
fai_candidate_action_wrapper( rca_context &context, const config &cfg, wfl::candidate_action_ptr fai_ca, formula_ai &_formula_ai )
@ -147,8 +141,4 @@ config engine_fai::to_config() const
return cfg;
}
#ifdef _MSC_VER
#pragma warning(pop)
#endif
} //end of namespace ai

10
src/ai/formula/stage_side_formulas.hpp
View file

@ -22,12 +22,6 @@
#include "ai/composite/stage.hpp"
#include "formula/formula_fwd.hpp"
#ifdef _MSC_VER
#pragma warning(push)
//silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
namespace ai {
class formula_ai;
@ -52,7 +46,3 @@ private:
};
} //end of namespace ai
#ifdef _MSC_VER
#pragma warning(pop)
#endif

11
src/ai/formula/stage_unit_formulas.hpp
View file

@ -21,13 +21,6 @@
#include "ai/composite/stage.hpp"
#ifdef _MSC_VER
#pragma warning(push)
//silence "inherits via dominance" warnings
#pragma warning(disable:4250)
#endif
namespace ai {
class formula_ai;
@ -50,7 +43,3 @@ private:
};
} //end of namespace ai
#ifdef _MSC_VER
#pragma warning(pop)
#endif

8
src/gettext_boost.cpp
View file

@ -11,9 +11,6 @@
See the COPYING file for more details.
*/
#if defined(_MSC_VER)
#pragma warning(disable: 4714)
#endif
#include "global.hpp"
#include "gettext.hpp"
@ -32,15 +29,10 @@
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#elif defined(_MSC_VER)
#pragma warning(push)
#pragma warning(disable: 4459)
#endif
#include "spirit_po/spirit_po.hpp"
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#elif defined(_MSC_VER)
#pragma warning(pop)
#endif
#define DBG_G LOG_STREAM(debug, lg::general())

13
src/global.hpp
View file

@ -21,19 +21,6 @@
#define STDC99
#endif
// Disable warning about source encoding not in current code page.
#pragma warning(disable: 4819)
// Disable warning about deprecated functions.
#pragma warning(disable: 4996)
// Disable some MSVC warnings which are useless according to mordante
#pragma warning(disable: 4244)
#pragma warning(disable: 4345)
#pragma warning(disable: 4250)
#pragma warning(disable: 4355)
#pragma warning(disable: 4351)
#endif //_MSC_VER
#ifdef NDEBUG

8
src/server/simple_wml.cpp
View file

@ -19,15 +19,7 @@
#include <boost/iostreams/filtering_stream.hpp>
#include <boost/iostreams/filter/bzip2.hpp>
#include <boost/iostreams/filter/counter.hpp>
#if defined(_MSC_VER)
#pragma warning(push)
#pragma warning(disable: 4456)
#pragma warning(disable: 4458)
#endif
#include <boost/iostreams/filter/gzip.hpp>
#if defined(_MSC_VER)
#pragma warning(pop)
#endif
#include "server/simple_wml.hpp"

8
src/terrain/translation.hpp
View file

@ -22,14 +22,8 @@
#include <boost/bimap.hpp>
#include <boost/bimap/set_of.hpp>
#include <boost/bimap/multiset_of.hpp>
#if defined(_MSC_VER)
#pragma warning(push)
#pragma warning(disable: 4459)
#endif
#include <boost/multi_array.hpp>
#if defined(_MSC_VER)
#pragma warning(pop)
#endif
#include "exceptions.hpp"
#include "map/location.hpp"