diff --git a/cli/cli.vcxproj b/cli/cli.vcxproj index 93e5c1019..b2f888cc6 100644 --- a/cli/cli.vcxproj +++ b/cli/cli.vcxproj @@ -174,7 +174,7 @@ true ProgramDatabase Disabled - CPPCHECKLIB_IMPORT;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) + CPPCHECKLIB_IMPORT;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;TIXML_USE_STL;%(PreprocessorDefinitions) MultiThreadedDebugDLL true Level4 @@ -266,7 +266,7 @@ ..\lib;..\externals;..\externals\tinyxml;%(AdditionalIncludeDirectories) false MaxSpeed - CPPCHECKLIB_IMPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) + CPPCHECKLIB_IMPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;TIXML_USE_STL;%(PreprocessorDefinitions) MultiThreadedDLL true Level4 diff --git a/lib/cppcheck.vcxproj b/lib/cppcheck.vcxproj index 23923dca4..db1a20f6b 100644 --- a/lib/cppcheck.vcxproj +++ b/lib/cppcheck.vcxproj @@ -245,7 +245,7 @@ ProgramDatabase true Disabled - CPPCHECKLIB_EXPORT;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) + CPPCHECKLIB_EXPORT;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;TIXML_USE_STL;%(PreprocessorDefinitions) Level4 ..\externals;%(AdditionalIncludeDirectories) 4251;4512 @@ -331,7 +331,7 @@ true ..\externals;%(AdditionalIncludeDirectories) 4251;4512 - CPPCHECKLIB_EXPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) + CPPCHECKLIB_EXPORT;NDEBUG;WIN32;HAVE_RULES;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;TIXML_USE_STL;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/lib/settings.h b/lib/settings.h index b13147f1d..999f4d912 100644 --- a/lib/settings.h +++ b/lib/settings.h @@ -171,7 +171,6 @@ public: /** @brief --report-progress */ bool reportProgress; -#ifdef HAVE_RULES /** Rule */ class CPPCHECKLIB Rule { public: @@ -190,7 +189,6 @@ public: * @brief Extra rules */ std::list rules; -#endif /** Is the 'configuration checking' wanted? */ bool checkConfiguration;