diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-08-16 10:01:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-16 10:01:32 +0800 |
| commit | adb84c2658b9774ff535eb88f377ee818dd429be (patch) | |
| tree | fcfcf4a93057037152a14aa2885598b45c5b03bd /toolsrc/include/pch.h | |
| parent | 2865da8f4a6d911617cdd9b147816c4cd02bbf7e (diff) | |
| parent | 22e787f9448a25dae734ca06c80e7e5af5fb6537 (diff) | |
| download | vcpkg-adb84c2658b9774ff535eb88f377ee818dd429be.tar.gz vcpkg-adb84c2658b9774ff535eb88f377ee818dd429be.zip | |
Merge branch 'master' into dev/jack/4167
Diffstat (limited to 'toolsrc/include/pch.h')
| -rw-r--r-- | toolsrc/include/pch.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/toolsrc/include/pch.h b/toolsrc/include/pch.h index 15ec25e76..ce2a7c9c5 100644 --- a/toolsrc/include/pch.h +++ b/toolsrc/include/pch.h @@ -1,14 +1,6 @@ #pragma once -#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/pragmas.h> #if defined(_WIN32) #define NOMINMAX @@ -38,8 +30,8 @@ #include <cstddef> #include <cstdint> #define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING -#include <experimental/filesystem> #include <cstring> +#include <experimental/filesystem> #include <fstream> #include <functional> #include <iomanip> |