Ticket #1341: boost.diff1

File boost.diff1, 13.4 KB (added by Joel Falcou <joel.falcou@…>, 13 years ago)

Associated pacth

Line 
1Index: boost/circular_buffer/space_optimized.hpp
2===================================================================
3--- boost/circular_buffer/space_optimized.hpp (Revision 40164)
4+++ boost/circular_buffer/space_optimized.hpp (Arbeitskopie)
5@@ -1230,7 +1230,7 @@
6 if (new_size > new_capacity) {
7 if (new_capacity == 0)
8 new_capacity = 1;
9- for (; new_size > new_capacity; new_capacity *= 2);
10+ for (; new_size > new_capacity; new_capacity *= 2) {}
11 circular_buffer<T, Alloc>::set_capacity(
12 ensure_reserve(new_capacity, new_size));
13 }
14Index: boost/circular_buffer/debug.hpp
15===================================================================
16--- boost/circular_buffer/debug.hpp (Revision 40164)
17+++ boost/circular_buffer/debug.hpp (Arbeitskopie)
18@@ -121,7 +121,7 @@
19 */
20 void unregister_iterator(const debug_iterator_base* it) const {
21 const debug_iterator_base* previous = 0;
22- for (const debug_iterator_base* p = m_iterators; p != it; previous = p, p = p->next());
23+ for (const debug_iterator_base* p = m_iterators; p != it; previous = p, p = p->next()) {}
24 remove(it, previous);
25 }
26
27Index: boost/fusion/sequence/utility.hpp
28===================================================================
29--- boost/fusion/sequence/utility.hpp (Revision 40164)
30+++ boost/fusion/sequence/utility.hpp (Arbeitskopie)
31@@ -9,6 +9,6 @@
32 #if !defined(BOOST_FUSION_SEQUENCE_UTILITY_HPP_INCLUDED)
33 #define BOOST_FUSION_SEQUENCE_UTILITY_HPP_INCLUDED
34
35-# include <boost/fusion/sequence/utility/unpack_args.hpp>
36+//# include <boost/fusion/sequence/utility/unpack_args.hpp>
37
38 #endif // include guard
39Index: boost/token_functions.hpp
40===================================================================
41--- boost/token_functions.hpp (Revision 40164)
42+++ boost/token_functions.hpp (Arbeitskopie)
43@@ -335,11 +335,12 @@
44 if (next == end)
45 return false;
46
47- if (current_offset_ == offsets_.size())
48+ if (current_offset_ == offsets_.size()) {
49 if (wrap_offsets_)
50 current_offset_=0;
51 else
52 return false;
53+ }
54
55 int c = offsets_[current_offset_];
56 int i = 0;
57@@ -448,13 +449,14 @@
58 else { // m_empty_tokens == keep_empty_tokens
59
60 // Handle empty token at the end
61- if (next == end)
62+ if (next == end) {
63 if (m_output_done == false) {
64 m_output_done = true;
65 assigner::assign(start,next,tok);
66 return true;
67 } else
68 return false;
69+ }
70
71 if (is_kept(*next)) {
72 if (m_output_done == false)
73Index: boost/archive/basic_xml_archive.hpp
74===================================================================
75--- boost/archive/basic_xml_archive.hpp (Revision 40164)
76+++ boost/archive/basic_xml_archive.hpp (Arbeitskopie)
77@@ -36,7 +36,7 @@
78 xml_archive_tag_mismatch,
79 xml_archive_tag_name_error
80 } exception_code;
81- xml_archive_exception(exception_code c)
82+ xml_archive_exception(exception_code)
83 {}
84 virtual const char *what( ) const throw( )
85 {
86Index: boost/archive/detail/common_iarchive.hpp
87===================================================================
88--- boost/archive/detail/common_iarchive.hpp (Revision 40164)
89+++ boost/archive/detail/common_iarchive.hpp (Arbeitskopie)
90@@ -60,8 +60,8 @@
91 }
92 // default implementations of functions which emit start/end tags for
93 // archive types that require them.
94- void load_start(const char *name){}
95- void load_end(const char *name){}
96+ void load_start(const char * /*name*/){}
97+ void load_end(const char * /*name*/){}
98 // default archive initialization
99 common_iarchive(unsigned int flags = 0) :
100 basic_iarchive(flags),
101Index: boost/archive/iterators/dataflow.hpp
102===================================================================
103--- boost/archive/iterators/dataflow.hpp (Revision 40164)
104+++ boost/archive/iterators/dataflow.hpp (Arbeitskopie)
105@@ -43,7 +43,7 @@
106 enum state_enum {
107 is_false = false,
108 is_true = true,
109- is_indeterminant,
110+ is_indeterminant
111 } m_state;
112 // convert to bool
113 operator bool (){
114@@ -53,6 +53,7 @@
115 // assign from bool
116 tri_state & operator=(bool rhs) {
117 m_state = rhs ? is_true : is_false;
118+ return *this;
119 }
120 tri_state(bool rhs) :
121 m_state(rhs ? is_true : is_false)
122Index: boost/archive/iterators/head_iterator.hpp
123===================================================================
124--- boost/archive/iterators/head_iterator.hpp (Revision 40164)
125+++ boost/archive/iterators/head_iterator.hpp (Arbeitskopie)
126@@ -48,11 +48,11 @@
127
128 reference_type dereference_impl(){
129 if(! m_end){
130- while(! m_predicate(* base_reference()))
131- ++ base_reference();
132+ while(! m_predicate(* this->base_reference()))
133+ ++ this->base_reference();
134 m_end = true;
135 }
136- return * base_reference();
137+ return * this->base_reference();
138 }
139
140 reference_type dereference() const {
141@@ -60,7 +60,7 @@
142 }
143
144 void increment(){
145- ++base_reference();
146+ ++this->base_reference();
147 }
148 Predicate m_predicate;
149 bool m_end;
150Index: boost/archive/tmpdir.hpp
151===================================================================
152--- boost/archive/tmpdir.hpp (Revision 40164)
153+++ boost/archive/tmpdir.hpp (Arbeitskopie)
154@@ -29,8 +29,8 @@
155 namespace boost {
156 namespace archive {
157
158-inline char * tmpdir(){
159- char *dirname;
160+inline const char * tmpdir(){
161+ const char *dirname;
162 dirname = std::getenv("TMP");
163 if(NULL == dirname)
164 dirname = std::getenv("TMPDIR");
165Index: boost/archive/basic_binary_iprimitive.hpp
166===================================================================
167--- boost/archive/basic_binary_iprimitive.hpp (Revision 40164)
168+++ boost/archive/basic_binary_iprimitive.hpp (Arbeitskopie)
169@@ -160,7 +160,7 @@
170 static_cast<Elem *>(address),
171 s
172 );
173- if(scount != static_cast<std::size_t>(s))
174+ if(scount != s)
175 boost::throw_exception(
176 archive_exception(archive_exception::stream_error)
177 );
178Index: boost/date_time/dst_rules.hpp
179===================================================================
180--- boost/date_time/dst_rules.hpp (Revision 40164)
181+++ boost/date_time/dst_rules.hpp (Arbeitskopie)
182@@ -314,11 +314,11 @@
183 {
184 if (year >= year_type(2007)) {
185 //second sunday in march
186- nkday ssim(nkday::second, Sunday, gregorian::Mar);
187+ nkday ssim(nkday::second, Sunday, Mar);
188 return ssim.get_date(year);
189 } else {
190 //first sunday in april
191- fkday fsia(Sunday, gregorian::Apr);
192+ fkday fsia(Sunday, Apr);
193 return fsia.get_date(year);
194 }
195 }
196@@ -327,11 +327,11 @@
197 {
198 if (year >= year_type(2007)) {
199 //first sunday in november
200- fkday fsin(Sunday, gregorian::Nov);
201+ fkday fsin(Sunday, Nov);
202 return fsin.get_date(year);
203 } else {
204 //last sunday in october
205- lkday lsio(Sunday, gregorian::Oct);
206+ lkday lsio(Sunday, Oct);
207 return lsio.get_date(year);
208 }
209 }
210Index: boost/date_time/local_time_adjustor.hpp
211===================================================================
212--- boost/date_time/local_time_adjustor.hpp (Revision 40164)
213+++ boost/date_time/local_time_adjustor.hpp (Arbeitskopie)
214@@ -15,6 +15,7 @@
215
216 #include "boost/date_time/date_generators.hpp"
217 #include "boost/date_time/dst_rules.hpp"
218+#include "boost/date_time/time_defs.hpp" // boost::date_time::dst_flags
219 #include <stdexcept>
220
221 namespace boost {
222Index: boost/logic/tribool.hpp
223===================================================================
224--- boost/logic/tribool.hpp (Revision 40164)
225+++ boost/logic/tribool.hpp (Arbeitskopie)
226@@ -336,7 +336,7 @@
227 if (indeterminate(x) || indeterminate(y))
228 return indeterminate;
229 else
230- return x && y || !x && !y;
231+ return (x && y) || (!x && !y);
232 }
233
234 /**
235@@ -399,7 +399,7 @@
236 if (indeterminate(x) || indeterminate(y))
237 return indeterminate;
238 else
239- return !(x && y || !x && !y);
240+ return !((x && y) || (!x && !y));
241 }
242
243 /**
244Index: boost/numeric/interval/arith2.hpp
245===================================================================
246--- boost/numeric/interval/arith2.hpp (Revision 40164)
247+++ boost/numeric/interval/arith2.hpp (Arbeitskopie)
248@@ -275,7 +275,7 @@
249 if (k == 1) return x;
250 typename Policies::rounding rnd;
251 typedef typename interval_lib::unprotect<I>::type R;
252- if (!interval_lib::user::is_pos(x.upper()))
253+ if (!interval_lib::user::is_pos(x.upper())) {
254 if (interval_lib::user::is_zero(x.upper())) {
255 T zero(0);
256 if (!(k & 1) || interval_lib::user::is_zero(x.lower())) // [-1,0]^/2 or [0,0]
257@@ -288,6 +288,7 @@
258 return I(-interval_lib::detail::root_aux_up<R>(-x.lower(), k),
259 -interval_lib::detail::root_aux_dn<R>(-x.upper(), k), true);
260 }
261+ }
262 T u = interval_lib::detail::root_aux_up<R>(x.upper(), k);
263 if (!interval_lib::user::is_pos(x.lower()))
264 if (!(k & 1) || interval_lib::user::is_zero(x.lower())) // [-1,1]^/2 or [0,1]
265Index: boost/numeric/ublas/detail/vector_assign.hpp
266===================================================================
267--- boost/numeric/ublas/detail/vector_assign.hpp (Revision 40164)
268+++ boost/numeric/ublas/detail/vector_assign.hpp (Arbeitskopie)
269@@ -13,6 +13,7 @@
270 #ifndef _BOOST_UBLAS_VECTOR_ASSIGN_
271 #define _BOOST_UBLAS_VECTOR_ASSIGN_
272
273+#include <boost/numeric/ublas/functional.hpp> // scalar_assign
274 // Required for make_conformant storage
275 #include <vector>
276
277Index: boost/numeric/ublas/operation_blocked.hpp
278===================================================================
279--- boost/numeric/ublas/operation_blocked.hpp (Revision 40164)
280+++ boost/numeric/ublas/operation_blocked.hpp (Arbeitskopie)
281@@ -14,6 +14,8 @@
282 #define _BOOST_UBLAS_OPERATION_BLOCKED_
283
284 #include <boost/numeric/ublas/traits.hpp>
285+#include <boost/numeric/ublas/detail/vector_assign.hpp> // indexing_vector_assign
286+#include <boost/numeric/ublas/detail/matrix_assign.hpp> // indexing_matrix_assign
287
288
289 namespace boost { namespace numeric { namespace ublas {
290Index: boost/bimap/detail/set_view_iterator.hpp
291===================================================================
292--- boost/bimap/detail/set_view_iterator.hpp (Revision 40164)
293+++ boost/bimap/detail/set_view_iterator.hpp (Arbeitskopie)
294@@ -86,7 +86,7 @@
295
296 // Serialization support
297
298- BOOST_SERIALIZATION_SPLIT_MEMBER();
299+ BOOST_SERIALIZATION_SPLIT_MEMBER()
300
301 friend class ::boost::serialization::access;
302
303@@ -162,7 +162,7 @@
304
305 // Serialization support
306
307- BOOST_SERIALIZATION_SPLIT_MEMBER();
308+ BOOST_SERIALIZATION_SPLIT_MEMBER()
309
310 friend class ::boost::serialization::access;
311
312Index: boost/bimap/detail/map_view_iterator.hpp
313===================================================================
314--- boost/bimap/detail/map_view_iterator.hpp (Revision 40164)
315+++ boost/bimap/detail/map_view_iterator.hpp (Arbeitskopie)
316@@ -88,7 +88,7 @@
317
318 // Serialization support
319
320- BOOST_SERIALIZATION_SPLIT_MEMBER();
321+ BOOST_SERIALIZATION_SPLIT_MEMBER()
322
323 friend class ::boost::serialization::access;
324
325@@ -169,7 +169,7 @@
326
327 // Serialization support
328
329- BOOST_SERIALIZATION_SPLIT_MEMBER();
330+ BOOST_SERIALIZATION_SPLIT_MEMBER()
331
332 friend class ::boost::serialization::access;
333
334Index: boost/bimap/support/lambda.hpp
335===================================================================
336--- boost/bimap/support/lambda.hpp (Revision 40164)
337+++ boost/bimap/support/lambda.hpp (Arbeitskopie)
338@@ -31,11 +31,10 @@
339
340 boost::lambda::placeholder1_type & _left = boost::lambda::_1;
341 boost::lambda::placeholder2_type & _right = boost::lambda::_2;
342-*/
343
344 boost::lambda::placeholder1_type & _key = boost::lambda::_1;
345 boost::lambda::placeholder1_type & _data = boost::lambda::_1;
346-
347+*/
348 }
349
350 } // namespace bimaps
351Index: boost/bimap/relation/member_at.hpp
352===================================================================
353--- boost/bimap/relation/member_at.hpp (Revision 40164)
354+++ boost/bimap/relation/member_at.hpp (Arbeitskopie)
355@@ -63,7 +63,7 @@
356
357 struct info {};
358
359-};
360+}
361
362 } // namespace relation
363 } // namespace bimaps
364Index: boost/format/parsing.hpp
365===================================================================
366--- boost/format/parsing.hpp (Revision 40164)
367+++ boost/format/parsing.hpp (Arbeitskopie)
368@@ -16,6 +16,7 @@
369
370
371 #include <boost/format/format_class.hpp>
372+#include <boost/format/exceptions.hpp> // bad_format_string
373 #include <boost/throw_exception.hpp>
374 #include <boost/assert.hpp>
375
376Index: boost/asio/ssl/detail/openssl_init.hpp
377===================================================================
378--- boost/asio/ssl/detail/openssl_init.hpp (Revision 40164)
379+++ boost/asio/ssl/detail/openssl_init.hpp (Arbeitskopie)
380@@ -82,7 +82,7 @@
381
382 private:
383 static void openssl_locking_func(int mode, int n,
384- const char *file, int line)
385+ const char * /*file*/, int /*line*/)
386 {
387 if (mode & CRYPTO_LOCK)
388 instance()->mutexes_[n]->lock();
389@@ -99,7 +99,8 @@
390 openssl_init()
391 : ref_(do_init::instance())
392 {
393- while (&instance_ == 0); // Ensure openssl_init::instance_ is linked in.
394+ // warning: the address of 'boost::asio::ssl::detail::openssl_init<true>::instance_' will never be NULL
395+ while (&instance_ == 0) {} // Ensure openssl_init::instance_ is linked in.
396 }
397
398 // Destructor.
399