-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathboost_1_62_0_patch_ivs.patch
More file actions
51 lines (47 loc) · 1.36 KB
/
boost_1_62_0_patch_ivs.patch
File metadata and controls
51 lines (47 loc) · 1.36 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
diff -ur boost_1_62_0_orig/boost/exception/exception.hpp boost_1_62_0_patch_ivs/boost/exception/exception.hpp
--- boost_1_62_0_orig/boost/exception/exception.hpp 2016-09-21 16:33:27.000000000 +0200
+++ boost_1_62_0_patch_ivs/boost/exception/exception.hpp 2017-07-07 19:05:58.095330000 +0200
@@ -12,6 +12,12 @@
#pragma warning(push,1)
#endif
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4265) // class has virtual functions, but destructor is not virtual
+#endif
+
+
namespace
boost
{
@@ -514,3 +520,7 @@
#pragma warning(pop)
#endif
#endif
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
diff -ur boost_1_62_0_orig/boost/optional/optional.hpp boost_1_62_0_patch_ivs/boost/optional/optional.hpp
--- boost_1_62_0_orig/boost/optional/optional.hpp 2016-09-21 16:33:25.000000000 +0200
+++ boost_1_62_0_patch_ivs/boost/optional/optional.hpp 2017-07-07 19:05:33.091244900 +0200
@@ -17,6 +17,13 @@
#ifndef BOOST_OPTIONAL_OPTIONAL_FLC_19NOV2002_HPP
#define BOOST_OPTIONAL_OPTIONAL_FLC_19NOV2002_HPP
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4242)
+#pragma warning(disable: 4244)
+#endif
+
+
#include <new>
#include <iosfwd>
@@ -1143,4 +1150,9 @@
#include <boost/optional/detail/optional_relops.hpp>
#include <boost/optional/detail/optional_swap.hpp>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+
#endif // header guard