diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-05-14 12:49:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-14 12:49:31 -0700 |
| commit | 5504dfa7da38a65981868fc7885744ac5d8f234e (patch) | |
| tree | 1d95de86ef1604d2393a05d5be16437d36fe6822 /toolsrc/src/vcpkg.cpp | |
| parent | 4727bc86a4d6fa2c009ae9932eef3a668a358e60 (diff) | |
| download | vcpkg-5504dfa7da38a65981868fc7885744ac5d8f234e.tar.gz vcpkg-5504dfa7da38a65981868fc7885744ac5d8f234e.zip | |
[vcpkg] Turn on tests and PREfast in CI, and fix tests to pass. (#11239)
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'toolsrc/src/vcpkg.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index 39f588915..a249a3d9d 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -1,14 +1,7 @@ -#if defined(_MSC_VER) && _MSC_VER < 1911 -// [[nodiscard]] is not recognized before VS 2017 version 15.3 -#pragma warning(disable : 5030) -#endif - -#if defined(__GNUC__) && __GNUC__ < 7 -// [[nodiscard]] is not recognized before GCC version 7 -#pragma GCC diagnostic ignored "-Wattributes" -#endif +#include <vcpkg/base/pragmas.h> #if defined(_WIN32) +#define NOMINMAX #define WIN32_LEAN_AND_MEAN #include <Windows.h> |