aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-05-06 21:14:18 -0400
committerJack Lloyd <[email protected]>2016-05-06 21:14:18 -0400
commit5dd6fbc45b356fa34717e77bc252392016baf8a9 (patch)
treed7d35e4cb26ee12f8d42ac9d936f9abe0410be11
parent83f0bb5c411119edf5138f183f207f88613e5eaf (diff)
Turn MSVC warnings to /W4 and enable C4267
Move disabling C4250 and C4251 to cmd line instead of header pragma. This means these warnings will show up in application code. But disabling warnings inside a library header is probably not good form.
-rw-r--r--src/build-data/buildh.in6
-rw-r--r--src/build-data/cc/msvc.txt2
-rw-r--r--src/scripts/ci/appveyor.yml1
3 files changed, 1 insertions, 8 deletions
diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index 6412fdcdf..d6201be19 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -226,12 +226,6 @@ Each poll generates 32 bit entropy
%{target_compiler_defines}
-#if defined(_MSC_VER)
- // 4250: inherits via dominance (diamond inheritence issue)
- // 4251: needs DLL interface (STL DLL exports)
- #pragma warning(disable: 4250 4251)
-#endif
-
/*
* Compile-time deprecatation warnings
*/
diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt
index 02e33bfab..8231c0429 100644
--- a/src/build-data/cc/msvc.txt
+++ b/src/build-data/cc/msvc.txt
@@ -19,7 +19,7 @@ optimization_flags "/O2"
debug_info_flags "/Zi /FS"
lang_flags "/EHs /GR"
-warning_flags "/W3 /wd4275 /wd4267"
+warning_flags "/W4 /wd4250 /wd4251 /wd4275"
visibility_build_flags "/DBOTAN_DLL=__declspec(dllexport)"
visibility_attribute "__declspec(dllimport)"
diff --git a/src/scripts/ci/appveyor.yml b/src/scripts/ci/appveyor.yml
index 140fbe92d..58e04eea9 100644
--- a/src/scripts/ci/appveyor.yml
+++ b/src/scripts/ci/appveyor.yml
@@ -24,7 +24,6 @@ install:
)
- cl # check compiler version
-# always build via amalgamation due to build time constraints on appveyor
build_script:
- python configure.py --cc=msvc --cpu=%PLATFORM% %MODE%
- nmake