Ticket #775: boost-1.34.1-warningfixes.patch

File boost-1.34.1-warningfixes.patch, 6.4 KB (added by ryan.gallagher@…, 15 years ago)

patch for several msvc 4103 warnings

Line 
1==== boost/config/abi/msvc_prefix.hpp ==M== boost/config/abi/msvc_prefix.hpp ====
2*** boost/config/abi/msvc_prefix.hpp Fri Aug 24 16:44:15 2007
3--- boost/config/abi/msvc_prefix.hpp Fri Aug 24 16:44:16 2007
4***************
5*** 3,8 ****
6--- 3,20 ----
7 // Boost Software License, Version 1.0. (See accompanying file
8 // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
9
10+ // Disable warning concerning alignment change by an include file due to
11+ // #pragma pack.
12+ //
13+ // Need to disable this to compile without warnings on MSVC 7.1.
14+ // However, can't re-enable in the msvc_suffix.hpp due to the way
15+ // in which the compiler implements this check.
16+ //
17+ // Must re-enable warning after including boost/config/abi_suffix.hpp
18+ // in file that includes boost/config/abi_prefix.hpp
19+ //
20+ #pragma warning(disable : 4103)
21+
22 #pragma pack(push,8)
23
24
25*** boost/config/pop_warning_stack.hpp Fri Aug 24 16:44:15 2007
26--- boost/config/pop_warning_stack.hpp Fri Aug 24 16:44:16 2007
27***************
28*** 0 ****
29--- 1,9 ----
30+ // (C) Copyright Ryan Gallagher 2007.
31+ // Use, modification and distribution are subject to the
32+ // Boost Software License, Version 1.0. (See accompanying file
33+ // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
34+
35+ #if defined(BOOST_MSVC)
36+ # pragma warning(pop)
37+ #endif
38+
39*** boost/config/push_warning_stack.hpp Fri Aug 24 16:44:16 2007
40--- boost/config/push_warning_stack.hpp Fri Aug 24 16:44:17 2007
41***************
42*** 0 ****
43--- 1,9 ----
44+ // (C) Copyright Ryan Gallagher 2007.
45+ // Use, modification and distribution are subject to the
46+ // Boost Software License, Version 1.0. (See accompanying file
47+ // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
48+
49+ #if defined(BOOST_MSVC)
50+ # pragma warning(push)
51+ #endif
52+
53==== boost/filesystem/convenience.hpp ==M== boost/filesystem/convenience.hpp ====
54*** boost/filesystem/convenience.hpp Fri Aug 24 16:44:17 2007
55--- boost/filesystem/convenience.hpp Fri Aug 24 16:44:17 2007
56***************
57*** 17,22 ****
58--- 17,23 ----
59 #include <vector>
60 #include <stack>
61
62+ #include <boost/config/push_warning_stack.hpp>
63 #include <boost/config/abi_prefix.hpp> // must be the last #include
64
65 # ifndef BOOST_FILESYSTEM_NARROW_ONLY
66***************
67*** 328,331 ****
68--- 329,334 ----
69 #undef BOOST_FS_FUNC
70
71 #include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas
72+ #include <boost/config/pop_warning_stack.hpp>
73+
74 #endif // BOOST_FILESYSTEM_CONVENIENCE_HPP
75==== boost/filesystem/fstream.hpp ==M== boost/filesystem/fstream.hpp ====
76*** boost/filesystem/fstream.hpp Fri Aug 24 16:44:18 2007
77--- boost/filesystem/fstream.hpp Fri Aug 24 16:44:18 2007
78***************
79*** 19,24 ****
80--- 19,25 ----
81 #include <iosfwd>
82 #include <fstream>
83
84+ #include <boost/config/push_warning_stack.hpp>
85 #include <boost/config/abi_prefix.hpp> // must be the last #include
86
87 // NOTE: fstream.hpp for Boost 1.32.0 and earlier supplied workarounds for
88***************
89*** 581,584 ****
90--- 582,587 ----
91 } // namespace boost
92
93 #include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas
94+ #include <boost/config/pop_warning_stack.hpp>
95+
96 #endif // BOOST_FILESYSTEM_FSTREAM_HPP
97==== boost/filesystem/operations.hpp ==M== boost/filesystem/operations.hpp ====
98*** boost/filesystem/operations.hpp Fri Aug 24 16:44:18 2007
99--- boost/filesystem/operations.hpp Fri Aug 24 16:44:18 2007
100***************
101*** 35,40 ****
102--- 35,41 ----
103 # endif
104 #endif
105
106+ #include <boost/config/push_warning_stack.hpp>
107 #include <boost/config/abi_prefix.hpp> // must be the last #include
108
109 # ifdef BOOST_NO_STDC_NAMESPACE
110***************
111*** 1096,1099 ****
112--- 1097,1102 ----
113
114
115 #include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas
116+ #include <boost/config/pop_warning_stack.hpp>
117+
118 #endif // BOOST_FILESYSTEM_OPERATIONS_HPP
119==== boost/filesystem/path.hpp ==M== boost/filesystem/path.hpp ====
120*** boost/filesystem/path.hpp Fri Aug 24 16:44:19 2007
121--- boost/filesystem/path.hpp Fri Aug 24 16:44:19 2007
122***************
123*** 29,34 ****
124--- 29,35 ----
125 # include <locale>
126 # endif
127
128+ #include <boost/config/push_warning_stack.hpp>
129 #include <boost/config/abi_prefix.hpp> // must be the last #include
130
131 //----------------------------------------------------------------------------//
132***************
133*** 1419,1423 ****
134--- 1420,1425 ----
135 } // namespace boost
136
137 #include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas
138+ #include <boost/config/pop_warning_stack.hpp>
139
140 #endif // BOOST_FILESYSTEM_PATH_HPP
141==== boost/iostreams/device/file_descriptor.hpp ==M== boost/iostreams/device/file_descriptor.hpp ====
142*** boost/iostreams/device/file_descriptor.hpp Fri Aug 24 16:44:19 2007
143--- boost/iostreams/device/file_descriptor.hpp Fri Aug 24 16:44:20 2007
144***************
145*** 24,31 ****
146 #include <boost/iostreams/positioning.hpp>
147 #include <boost/shared_ptr.hpp>
148
149! // Must come last.
150! #include <boost/config/abi_prefix.hpp>
151
152 namespace boost { namespace iostreams {
153
154--- 24,31 ----
155 #include <boost/iostreams/positioning.hpp>
156 #include <boost/shared_ptr.hpp>
157
158! #include <boost/config/push_warning_stack.hpp>
159! #include <boost/config/abi_prefix.hpp> // must come last.
160
161 namespace boost { namespace iostreams {
162
163***************
164*** 152,156 ****
165--- 152,157 ----
166 } } // End namespaces iostreams, boost.
167
168 #include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
169+ #include <boost/config/pop_warning_stack.hpp>
170
171 #endif // #ifndef BOOST_IOSTREAMS_FILE_DESCRIPTOR_HPP_INCLUDED
172==== boost/serialization/void_cast.hpp ==M== boost/serialization/void_cast.hpp ====
173*** boost/serialization/void_cast.hpp Fri Aug 24 16:44:20 2007
174--- boost/serialization/void_cast.hpp Fri Aug 24 16:44:20 2007
175***************
176*** 25,30 ****
177--- 25,31 ----
178 #include <boost/serialization/force_include.hpp>
179 #include <boost/serialization/type_info_implementation.hpp>
180
181+ #include <boost/config/push_warning_stack.hpp>
182 #include <boost/config/abi_prefix.hpp> // must be the last header
183
184 #ifdef BOOST_MSVC
185***************
186*** 196,200 ****
187--- 197,202 ----
188 } // namespace boost
189
190 #include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
191+ #include <boost/config/pop_warning_stack.hpp>
192
193 #endif // BOOST_SERIALIZATION_VOID_CAST_HPP