?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Stop leaking all ScPostIt instances.
[LibreOffice.git] / external / boost / boost_1_44_0-gcc4.8.patch
blob700e2ff98bc58e14c918a4cdb9dd1f8e056118c9
1
2
3 --- a/b/boost/boost/math/special_functions/beta.hpp 2013-05-31 18:12:02.036007347 +0200
4 +++ a/b/boost/boost/math/special_functions/beta.hpp 2013-05-31 18:11:56.260996218 +0200
5 @@ -1331,7 +1331,6 @@
6 BOOST_FPU_EXCEPTION_GUARD
7 typedef typename tools::promote_args<RT1, RT2, RT3>::type result_type;
8 typedef typename policies::evaluation<result_type, Policy>::type value_type;
9 - typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
10 typedef typename policies::normalise<
11 Policy,
12 policies::promote_float<false>,
13 @@ -1349,7 +1348,6 @@
14 BOOST_FPU_EXCEPTION_GUARD
15 typedef typename tools::promote_args<RT1, RT2, RT3>::type result_type;
16 typedef typename policies::evaluation<result_type, Policy>::type value_type;
17 - typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
18 typedef typename policies::normalise<
19 Policy,
20 policies::promote_float<false>,
21 --- a/b/boost/boost/random/generate_canonical.hpp 2013-05-31 18:13:09.804149686 +0200
22 +++ a/b/boost/boost/random/generate_canonical.hpp 2013-05-31 18:13:30.020195845 +0200
23 @@ -55,7 +55,6 @@
24 using std::floor;
25 BOOST_ASSERT((g.min)() == 0);
26 BOOST_ASSERT((g.max)() == 1);
27 - typedef typename URNG::result_type base_result;
28 std::size_t digits = std::numeric_limits<RealType>::digits;
29 std::size_t engine_bits = detail::generator_bits<URNG>::value();
30 std::size_t b = (std::min)(bits, digits);
31 --- a/b/boost/boost/random/uniform_real_distribution.hpp 2013-05-31 18:15:04.571429634 +0200
32 +++ a/b/boost/boost/random/uniform_real_distribution.hpp 2013-05-31 18:14:28.452337186 +0200
33 @@ -36,7 +36,6 @@
34 {
35 for(;;) {
36 typedef T result_type;
37 - typedef typename Engine::result_type base_result;
38 result_type numerator = static_cast<T>(eng() - (eng.min)());
39 result_type divisor = static_cast<T>((eng.max)() - (eng.min)());
40 BOOST_ASSERT(divisor > 0);
41 --- a/b/boost/boost/math/special_functions/fpclassify.hpp 2013-05-31 14:02:13.660436127 +0200
42 +++ a/b/boost/boost/math/special_functions/fpclassify.hpp 2013-05-31 14:01:17.372246240 +0200
43 @@ -339,7 +338,6 @@
44 { //!< \brief return true if floating-point type t is finite.
45 typedef detail::fp_traits<long double>::type traits;
46 typedef traits::method method;
47 - typedef boost::is_floating_point<long double>::type fp_tag;
48 typedef long double value_type;
49 return detail::isfinite_impl(static_cast<value_type>(x), method());
50 }
51 @@ -410,7 +407,6 @@
52 {
53 typedef detail::fp_traits<long double>::type traits;
54 typedef traits::method method;
55 - typedef boost::is_floating_point<long double>::type fp_tag;
56 typedef long double value_type;
57 return detail::isnormal_impl(static_cast<value_type>(x), method());
58 }
59 @@ -499,7 +494,6 @@
60 {
61 typedef detail::fp_traits<long double>::type traits;
62 typedef traits::method method;
63 - typedef boost::is_floating_point<long double>::type fp_tag;
64 typedef long double value_type;
65 return detail::isinf_impl(static_cast<value_type>(x), method());
66 }
67 @@ -585,7 +578,6 @@
68 { //!< \brief return true if floating-point type t is NaN (Not A Number).
69 typedef detail::fp_traits<long double>::type traits;
70 typedef traits::method method;
71 - typedef boost::is_floating_point<long double>::type fp_tag;
72 return detail::isnan_impl(x, method());
73 }
74 #endif
75 --- a/b/boost/boost/date_time/gregorian/greg_facet.hpp 2013-05-31 14:03:30.476695310 +0200
76 +++ a/b/boost/boost/date_time/gregorian/greg_facet.hpp 2013-05-31 14:03:22.894669713 +0200
77 @@ -215,7 +215,6 @@
78 {
79 std::istream_iterator<std::basic_string<charT>, charT> beg(is), eos;
80
81 - typedef boost::date_time::all_date_names_put<greg_facet_config, charT> facet_def;
82 d = from_stream(beg, eos);
83 return is;
84 }
85 --- a/b/boost/boost/unordered/detail/unique.hpp 2013-05-31 13:32:51.122254361 +0200
86 +++ a/b/boost/boost/unordered/detail/unique.hpp 2013-05-31 13:32:57.578278121 +0200
87 @@ -334,8 +334,6 @@
88
89 value_type& operator[](key_type const& k)
90 {
91 - typedef typename value_type::second_type mapped_type;
92 -
93 std::size_t key_hash = this->hash(k);
94 iterator pos = this->find_node(key_hash, k);
95
96 --- a/b/boost/boost/tuple/detail/tuple_basic.hpp 2013-05-31 13:31:21.682966336 +0200
97 +++ a/b/boost/boost/tuple/detail/tuple_basic.hpp 2013-05-31 13:32:44.067231648 +0200
98 @@ -225,7 +225,6 @@
99 get(const cons<HT, TT>& c BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int, N)) {
100 typedef BOOST_DEDUCED_TYPENAME detail::drop_front<N>::BOOST_NESTED_TEMPLATE
101 apply<cons<HT, TT> > impl;
102 - typedef BOOST_DEDUCED_TYPENAME impl::type cons_element;
103 return impl::call(c).head;
104 }
105
106 --- misc/boost_1_44_0/boost/algorithm/string/detail/finder.hpp
107 +++ misc/build/boost_1_44_0/boost/algorithm/string/detail/finder.hpp
108 @@ -142,7 +142,6 @@
109 ForwardIteratorT End,
110 std::forward_iterator_tag ) const
111 {
112 - typedef ForwardIteratorT input_iterator_type;
113 typedef iterator_range<ForwardIteratorT> result_type;
114
115 first_finder_type first_finder(
116 @@ -263,7 +262,6 @@
117 ForwardIteratorT End,
118 unsigned int N) const
119 {
120 - typedef ForwardIteratorT input_iterator_type;
121 typedef iterator_range<ForwardIteratorT> result_type;
122
123 // Sanity check
124 @@ -298,7 +296,6 @@
125 ForwardIteratorT End,
126 unsigned int N) const
127 {
128 - typedef ForwardIteratorT input_iterator_type;
129 typedef iterator_range<ForwardIteratorT> result_type;
130
131 // Sanity check
132 @@ -362,7 +359,6 @@
133 unsigned int N,
134 std::random_access_iterator_tag )
135 {
136 - typedef ForwardIteratorT input_iterator_type;
137 typedef iterator_range<ForwardIteratorT> result_type;
138
139 if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) )
140 @@ -436,7 +432,6 @@
141 unsigned int N,
142 std::random_access_iterator_tag )
143 {
144 - typedef ForwardIteratorT input_iterator_type;
145 typedef iterator_range<ForwardIteratorT> result_type;
146
147 if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) )
148 --- misc/boost_1_44_0/boost/bind/arg.hpp
149 +++ misc/build/boost_1_44_0/boost/bind/arg.hpp
150 @@ -35,6 +35,8 @@
151 {
152 // static assert I == is_placeholder<T>::value
153 typedef char T_must_be_placeholder[ I == is_placeholder<T>::value? 1: -1 ];
154 + T_must_be_placeholder dummy; (void) dummy;
155 + // silence -Werror=unused-local-typedefs (GCC 4.8)
156 }
157 };
158
159 --- misc/boost_1_44_0/boost/concept/detail/general.hpp
160 +++ misc/build/boost_1_44_0/boost/concept/detail/general.hpp
161 @@ -68,7 +68,9 @@
162 # define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr ) \
163 typedef ::boost::concepts::detail::instantiate< \
164 &::boost::concepts::requirement_<ModelFnPtr>::failed> \
165 - BOOST_PP_CAT(boost_concept_check,__LINE__)
166 + BOOST_PP_CAT(boost_concept_check,__LINE__); \
167 + void BOOST_PP_CAT(boost_concept_check_dummy,__LINE__)(BOOST_PP_CAT(boost_concept_check,__LINE__) *)
168 + // silence -Werror=unused-local-typedefs (GCC 4.8)
169
170 }}
171
172 --- misc/boost_1_44_0/boost/date_time/date_parsing.hpp
173 +++ misc/build/boost_1_44_0/boost/date_time/date_parsing.hpp
174 @@ -113,7 +113,6 @@
175 spec_str = "mdy";
176 }
177
178 - typedef typename date_type::year_type year_type;
179 typedef typename date_type::month_type month_type;
180 unsigned pos = 0;
181 unsigned short year(0), month(0), day(0);
182 @@ -159,7 +158,7 @@
183 parse_undelimited_date(const std::string& s) {
184 int offsets[] = {4,2,2};
185 int pos = 0;
186 - typedef typename date_type::year_type year_type;
187 + //typedef typename date_type::year_type year_type;
188 //typename date_type::ymd_type ymd((year_type::min)(),1,1);
189 unsigned short y = 0, m = 0, d = 0;
190
191 --- misc/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp
192 +++ misc/build/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp
193 @@ -36,7 +36,6 @@
194 boost::io::ios_flags_saver iflags(os);
195 typedef local_date_time time_type;//::utc_time_type typename
196 typedef date_time::time_facet<time_type, CharT> custom_time_facet;
197 - typedef std::time_put<CharT> std_time_facet;
198 std::ostreambuf_iterator<CharT> oitr(os);
199
200 if(std::has_facet<custom_time_facet>(os.getloc())) {
201 @@ -123,7 +122,6 @@
202 const boost::local_time::local_time_period& p) {
203 boost::io::ios_flags_saver iflags(os);
204 typedef boost::date_time::time_facet<local_date_time, CharT> custom_facet;
205 - typedef std::time_put<CharT> std_time_facet;
206 std::ostreambuf_iterator<CharT> oitr(os);
207 if (std::has_facet<custom_facet>(os.getloc())) {
208 std::use_facet<custom_facet>(os.getloc()).put(oitr, os, os.fill(), p);
209 --- misc/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp
210 +++ misc/build/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp
211 @@ -47,7 +47,6 @@
212 const ptime& p) {
213 boost::io::ios_flags_saver iflags(os);
214 typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet;
215 - typedef std::time_put<CharT> std_ptime_facet;
216 std::ostreambuf_iterator<CharT> oitr(os);
217 if (std::has_facet<custom_ptime_facet>(os.getloc()))
218 std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p);
219 @@ -114,7 +113,6 @@
220 const boost::posix_time::time_period& p) {
221 boost::io::ios_flags_saver iflags(os);
222 typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet;
223 - typedef std::time_put<CharT> std_time_facet;
224 std::ostreambuf_iterator<CharT> oitr(os);
225 if (std::has_facet<custom_ptime_facet>(os.getloc())) {
226 std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p);
227 @@ -180,7 +178,6 @@
228 {
229 boost::io::ios_flags_saver iflags(os);
230 typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet;
231 - typedef std::time_put<CharT> std_ptime_facet;
232 std::ostreambuf_iterator<CharT> oitr(os);
233 if (std::has_facet<custom_ptime_facet>(os.getloc()))
234 std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), td);
235 --- misc/boost_1_44_0/boost/date_time/string_convert.hpp
236 +++ misc/build/boost_1_44_0/boost/date_time/string_convert.hpp
237 @@ -21,7 +21,6 @@
238 inline
239 std::basic_string<OutputT> convert_string_type(const std::basic_string<InputT>& inp_str)
240 {
241 - typedef std::basic_string<InputT> input_type;
242 typedef std::basic_string<OutputT> output_type;
243 output_type result;
244 result.insert(result.begin(), inp_str.begin(), inp_str.end());
245 --- misc/boost_1_44_0/boost/date_time/strings_from_facet.hpp
246 +++ misc/build/boost_1_44_0/boost/date_time/strings_from_facet.hpp
247 @@ -35,7 +35,6 @@
248 {
249 typedef std::basic_string<charT> string_type;
250 typedef std::vector<string_type> collection_type;
251 - typedef std::basic_ostringstream<charT> ostream_type;
252 typedef std::ostreambuf_iterator<charT> ostream_iter_type;
253 typedef std::basic_ostringstream<charT> stringstream_type;
254 typedef std::time_put<charT> time_put_facet_type;
255 @@ -85,7 +84,6 @@
256 {
257 typedef std::basic_string<charT> string_type;
258 typedef std::vector<string_type> collection_type;
259 - typedef std::basic_ostringstream<charT> ostream_type;
260 typedef std::ostreambuf_iterator<charT> ostream_iter_type;
261 typedef std::basic_ostringstream<charT> stringstream_type;
262 typedef std::time_put<charT> time_put_facet_type;
263 --- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp
264 +++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp
265 @@ -39,8 +39,6 @@
266
267 template <typename Array, typename IdxGen, typename Call_Type>
268 static void call(Array& a, const IdxGen& idgen, Call_Type c) {
269 - typedef typename Array::index_range index_range_;
270 - typedef typename Array::index index_;
271 idgen_helper<N-1>::call(a,idgen[c],c);
272 }
273 };
274 @@ -50,8 +48,6 @@
275
276 template <typename Array, typename IdxGen, typename Call_Type>
277 static void call(Array& a, const IdxGen& idgen, Call_Type) {
278 - typedef typename Array::index_range index_range_;
279 - typedef typename Array::index index_;
280 a[ idgen ];
281 }
282 };
283 --- misc/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
284 +++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
285 @@ -307,7 +307,6 @@
286 #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
287 typedef impl::grammar_helper_base<GrammarT> helper_base_t;
288 typedef grammar_helper_list<GrammarT> helper_list_t;
289 - typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
290
291 helper_list_t& helpers =
292 # if !defined(__GNUC__) || (__GNUC__ > 2)
293 @@ -318,6 +317,7 @@
294
295 # if (defined(BOOST_MSVC) && (BOOST_MSVC < 1300)) \
296 || defined(BOOST_INTEL_CXX_VERSION)
297 + typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
298 for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i)
299 (*i)->undefine(self);
300 # else
301 --- misc/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp
302 +++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp
303 @@ -47,7 +47,6 @@
304 typename parser_result<self_t, ScannerT>::type
305 parse(ScannerT const& scan) const
306 {
307 - typedef typename parser_result<self_t, ScannerT>::type result_t;
308 typedef typename ScannerT::value_t value_t;
309 typedef typename ScannerT::iterator_t iterator_t;
310
311 --- misc/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp
312 +++ misc/build/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp
313 @@ -140,7 +140,6 @@
314 parse(ScannerT const& scan) const
315 {
316 typedef typename parser_result<ParserT, ScannerT>::type result_t;
317 - typedef typename ScannerT::iterator_t iterator_t;
318
319 result_t hit = this->subject().parse(scan);
320 if (!hit)
321 --- misc/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp
322 +++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp
323 @@ -49,8 +49,6 @@
324 typename parser_result<self_t, ScannerT>::type
325 parse(ScannerT const& scan) const
326 {
327 - typedef typename parser_result<self_t, ScannerT>::type result_t;
328 - typedef typename ScannerT::value_t value_t;
329 typedef typename ScannerT::iterator_t iterator_t;
330
331 iterator_t const s(scan.first);
332 --- misc/boost_1_44_0/boost/date_time/time_facet.hpp
333 +++ misc/build/boost_1_44_0/boost/date_time/time_facet.hpp
334 @@ -439,31 +439,31 @@
335 time_dur_arg.get_rep().as_special());
336 }
337
338 - string_type format(m_time_duration_format);
339 + string_type lcl_format(m_time_duration_format);
340 if (time_dur_arg.is_negative()) {
341 // replace %- with minus sign. Should we use the numpunct facet?
342 - boost::algorithm::replace_all(format,
343 + boost::algorithm::replace_all(lcl_format,
344 duration_sign_negative_only,
345 negative_sign);
346 // remove all the %+ in the string with '-'
347 - boost::algorithm::replace_all(format,
348 + boost::algorithm::replace_all(lcl_format,
349 duration_sign_always,
350 negative_sign);
351 }
352 else { //duration is positive
353 // remove all the %- combos from the string
354 - boost::algorithm::erase_all(format, duration_sign_negative_only);
355 + boost::algorithm::erase_all(lcl_format, duration_sign_negative_only);
356 // remove all the %+ in the string with '+'
357 - boost::algorithm::replace_all(format,
358 + boost::algorithm::replace_all(lcl_format,
359 duration_sign_always,
360 positive_sign);
361 }
362
363 // %T and %R have to be replaced here since they are not standard
364 - boost::algorithm::replace_all(format,
365 + boost::algorithm::replace_all(lcl_format,
366 boost::as_literal(formats_type::full_24_hour_time_format),
367 boost::as_literal(formats_type::full_24_hour_time_expanded_format));
368 - boost::algorithm::replace_all(format,
369 + boost::algorithm::replace_all(lcl_format,
370 boost::as_literal(formats_type::short_24_hour_time_format),
371 boost::as_literal(formats_type::short_24_hour_time_expanded_format));
372
373 @@ -476,22 +476,22 @@
374 * here ourself.
375 */
376 string_type hours_str;
377 - if (format.find(unrestricted_hours_format) != string_type::npos) {
378 + if (lcl_format.find(unrestricted_hours_format) != string_type::npos) {
379 hours_str = hours_as_string(time_dur_arg);
380 - boost::algorithm::replace_all(format, unrestricted_hours_format, hours_str);
381 + boost::algorithm::replace_all(lcl_format, unrestricted_hours_format, hours_str);
382 }
383 // We still have to process restricted hours format specifier. In order to
384 // support parseability of durations in ISO format (%H%M%S), we'll have to
385 // restrict the stringified hours length to 2 characters.
386 - if (format.find(hours_format) != string_type::npos) {
387 + if (lcl_format.find(hours_format) != string_type::npos) {
388 if (hours_str.empty())
389 hours_str = hours_as_string(time_dur_arg);
390 BOOST_ASSERT(hours_str.length() <= 2);
391 - boost::algorithm::replace_all(format, hours_format, hours_str);
392 + boost::algorithm::replace_all(lcl_format, hours_format, hours_str);
393 }
394
395 string_type frac_str;
396 - if (format.find(seconds_with_fractional_seconds_format) != string_type::npos) {
397 + if (lcl_format.find(seconds_with_fractional_seconds_format) != string_type::npos) {
398 // replace %s with %S.nnn
399 frac_str =
400 fractional_seconds_as_string(time_dur_arg, false);
401 @@ -500,21 +500,21 @@
402 string_type replace_string(seconds_format);
403 replace_string += sep;
404 replace_string += frac_str;
405 - boost::algorithm::replace_all(format,
406 + boost::algorithm::replace_all(lcl_format,
407 seconds_with_fractional_seconds_format,
408 replace_string);
409 }
410 - if (format.find(fractional_seconds_format) != string_type::npos) {
411 + if (lcl_format.find(fractional_seconds_format) != string_type::npos) {
412 // replace %f with nnnnnnn
413 if (!frac_str.size()) {
414 frac_str = fractional_seconds_as_string(time_dur_arg, false);
415 }
416 - boost::algorithm::replace_all(format,
417 + boost::algorithm::replace_all(lcl_format,
418 fractional_seconds_format,
419 frac_str);
420 }
421
422 - if (format.find(fractional_seconds_or_none_format) != string_type::npos) {
423 + if (lcl_format.find(fractional_seconds_or_none_format) != string_type::npos) {
424 // replace %F with nnnnnnn or nothing if fs == 0
425 frac_str =
426 fractional_seconds_as_string(time_dur_arg, true);
427 @@ -523,18 +523,18 @@
428 string_type replace_string;
429 replace_string += sep;
430 replace_string += frac_str;
431 - boost::algorithm::replace_all(format,
432 + boost::algorithm::replace_all(lcl_format,
433 fractional_seconds_or_none_format,
434 replace_string);
435 }
436 else {
437 - boost::algorithm::erase_all(format,
438 + boost::algorithm::erase_all(lcl_format,
439 fractional_seconds_or_none_format);
440 }
441 }
442
443 return this->do_put_tm(next_arg, ios_arg, fill_arg,
444 - to_tm(time_dur_arg), format);
445 + to_tm(time_dur_arg), lcl_format);
446 }
447
448 OutItrT put(OutItrT next, std::ios_base& ios_arg,
FREE OFFICE SUITE