From 686e80db741ba06330daf2a6569ec847a3c9d997 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Thu, 1 Jun 2017 04:36:25 +0300
Subject: get rid of third-party warnings

---
 CMakeLists.txt         | 6 ------
 include/pdb/module.hpp | 2 ++
 include/pdb/symbol.hpp | 2 ++
 src/dbghelp.cpp        | 2 ++
 utils/addr2name.cpp    | 2 ++
 utils/command_line.hpp | 2 ++
 utils/enum_symbols.cpp | 2 ++
 utils/name2addr.cpp    | 2 ++
 utils/pdb_descr.hpp    | 2 ++
 9 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67194a1..02a92f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,10 +9,4 @@ target_compile_definitions(pdb_repo PRIVATE NOMINMAX PUBLIC _NO_CVCONST_H)
 target_include_directories(pdb_repo PUBLIC include/)
 target_link_libraries(pdb_repo PRIVATE DbgHelp)
 
-if(MSVC_VERSION EQUAL 1900)
-    # These annoying DbgHelp.h warnings:
-    # https://connect.microsoft.com/VisualStudio/feedback/details/888527/warnings-on-dbghelp-h
-    target_compile_options(pdb_repo PUBLIC /wd4091)
-endif()
-
 add_subdirectory(utils)
diff --git a/include/pdb/module.hpp b/include/pdb/module.hpp
index e539fde..926db2c 100644
--- a/include/pdb/module.hpp
+++ b/include/pdb/module.hpp
@@ -8,7 +8,9 @@
 #include "address.hpp"
 
 #include <Windows.h>
+#pragma warning(push, 0)
 #include <DbgHelp.h>
+#pragma warning(pop)
 
 #include <string>
 
diff --git a/include/pdb/symbol.hpp b/include/pdb/symbol.hpp
index 81a40e3..ec0f80c 100644
--- a/include/pdb/symbol.hpp
+++ b/include/pdb/symbol.hpp
@@ -11,7 +11,9 @@
 #include <safeint.h>
 
 #include <Windows.h>
+#pragma warning(push, 0)
 #include <DbgHelp.h>
+#pragma warning(pop)
 
 #include <cstddef>
 #include <cstring>
diff --git a/src/dbghelp.cpp b/src/dbghelp.cpp
index 0a78e4d..38cb6f5 100644
--- a/src/dbghelp.cpp
+++ b/src/dbghelp.cpp
@@ -8,7 +8,9 @@
 #include <safeint.h>
 
 #include <Windows.h>
+#pragma warning(push, 0)
 #include <DbgHelp.h>
+#pragma warning(pop, 0)
 
 #include <cstddef>
 #include <cstring>
diff --git a/utils/addr2name.cpp b/utils/addr2name.cpp
index b2f0a51..76e781d 100644
--- a/utils/addr2name.cpp
+++ b/utils/addr2name.cpp
@@ -8,7 +8,9 @@
 
 #include "pdb/all.hpp"
 
+#pragma warning(push, 0)
 #include <boost/program_options.hpp>
+#pragma warning(pop)
 
 #include <exception>
 #include <iostream>
diff --git a/utils/command_line.hpp b/utils/command_line.hpp
index 79fb673..83cf8d6 100644
--- a/utils/command_line.hpp
+++ b/utils/command_line.hpp
@@ -5,8 +5,10 @@
 
 #pragma once
 
+#pragma warning(push, 0)
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
+#pragma warning(pop)
 
 #include <exception>
 #include <iostream>
diff --git a/utils/enum_symbols.cpp b/utils/enum_symbols.cpp
index d7fd417..848c523 100644
--- a/utils/enum_symbols.cpp
+++ b/utils/enum_symbols.cpp
@@ -8,7 +8,9 @@
 
 #include "pdb/all.hpp"
 
+#pragma warning(push, 0)
 #include <boost/program_options.hpp>
+#pragma warning(pop)
 
 #include <exception>
 #include <iostream>
diff --git a/utils/name2addr.cpp b/utils/name2addr.cpp
index 543cd7b..f177c86 100644
--- a/utils/name2addr.cpp
+++ b/utils/name2addr.cpp
@@ -8,7 +8,9 @@
 
 #include "pdb/all.hpp"
 
+#pragma warning(push, 0)
 #include <boost/program_options.hpp>
+#pragma warning(pop)
 
 #include <exception>
 #include <iostream>
diff --git a/utils/pdb_descr.hpp b/utils/pdb_descr.hpp
index c8a6112..58261a0 100644
--- a/utils/pdb_descr.hpp
+++ b/utils/pdb_descr.hpp
@@ -7,7 +7,9 @@
 
 #include "pdb/all.hpp"
 
+#pragma warning(push, 0)
 #include <boost/program_options.hpp>
+#pragma warning(pop)
 
 #include <sstream>
 #include <string>
-- 
cgit v1.2.3