update dev300-m58
[ooovba.git] / boost / boost-1.30.2.patch
blobfe53de6ba2746d4266021bb0451eea3f06b2352f
1 *** misc/boost-1.30.2/boost/config/platform/macos.hpp Thu Feb 13 13:28:05 2003
2 --- misc/build/boost-1.30.2/boost/config/platform/macos.hpp Mon Jun 4 10:01:49 2007
3 ***************
4 *** 19,27 ****
5 # define BOOST_HAS_UNISTD_H
6 # endif
7 // boilerplate code:
8 ! # ifndef TARGET_CARBON
9 # include <boost/config/posix_features.hpp>
10 ! # endif
11 # ifndef BOOST_HAS_STDINT_H
12 # define BOOST_HAS_STDINT_H
13 # endif
14 --- 19,28 ----
15 # define BOOST_HAS_UNISTD_H
16 # endif
17 // boilerplate code:
18 ! // HDU: disabled the TARGET_CARBON check because of issue #i72248#
19 ! //# ifndef TARGET_CARBON
20 # include <boost/config/posix_features.hpp>
21 ! //# endif
22 # ifndef BOOST_HAS_STDINT_H
23 # define BOOST_HAS_STDINT_H
24 # endif
25 *** misc/boost-1.30.2/boost/bind.hpp Tue Oct 15 12:51:34 2002
26 --- misc/build/boost-1.30.2/boost/bind.hpp Tue Jul 25 14:47:06 2006
27 ***************
28 *** 5,10 ****
29 --- 5,17 ----
30 #pragma once
31 #endif
33 + #if defined(_MSC_VER) && !defined(BOOST_MEM_FN_ENABLE_CDECL)
34 + // enable support for __cdecl (SAL_CALL) C++-UNO interface methods;
35 + // makes sense to shift this to command line some day:
36 + // -DBOOST_MEM_FN_ENABLE_CDECL
37 + #define BOOST_MEM_FN_ENABLE_CDECL
38 + #endif
41 // bind.hpp - binds function objects to arguments
43 ***************
44 *** 1472,1477 ****
45 --- 1479,1496 ----
46 #undef BOOST_BIND_MF_NAME
47 #undef BOOST_BIND_MF_CC
49 + #ifdef BOOST_MEM_FN_ENABLE_CDECL
51 + #define BOOST_BIND_MF_NAME(X) X##_cdecl
52 + #define BOOST_BIND_MF_CC __cdecl
54 + #include <boost/bind/bind_mf_cc.hpp>
56 + #undef BOOST_BIND_MF_NAME
57 + #undef BOOST_BIND_MF_CC
59 + #endif
61 #ifdef BOOST_MEM_FN_ENABLE_STDCALL
63 #define BOOST_BIND_MF_NAME(X) X##_stdcall
64 *** misc/boost-1.30.2/boost/config/compiler/gcc.hpp 2003-08-02 18:20:49.000000000 +0200
65 --- misc/build/boost-1.30.2/boost/config/compiler/gcc.hpp 2006-11-07 11:28:26.000000000 +0100
66 ***************
67 *** 73,80 ****
68 # error "Compiler not configured - please reconfigure"
69 #endif
71 ! // last known and checked version is 3.3:
72 ! #if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3))
73 # if defined(BOOST_ASSERT_CONFIG)
74 # error "Unknown compiler version - please run the configure tests and report the results"
75 # else
76 --- 73,80 ----
77 # error "Compiler not configured - please reconfigure"
78 #endif
80 ! // last known and checked version is 4.2:
81 ! #if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 2))
82 # if defined(BOOST_ASSERT_CONFIG)
83 # error "Unknown compiler version - please run the configure tests and report the results"
84 # else
85 *** misc/boost-1.30.2/boost/function/function_template.hpp Fri Feb 7 15:03:36 2003
86 --- misc/build/boost-1.30.2/boost/function/function_template.hpp Wed Mar 8 20:10:22 2006
87 ***************
88 *** 15,20 ****
89 --- 15,23 ----
91 // Note: this header is a header template and must NOT have multiple-inclusion
92 // protection.
93 + #if defined __GNUC__
94 + #pragma GCC system_header
95 + #endif
96 #include <boost/function/detail/prologue.hpp>
98 #define BOOST_FUNCTION_TEMPLATE_PARMS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, typename T)
99 ***************
100 *** 395,401 ****
101 invoker = 0;
104 ! #if (defined __SUNPRO_CC) && (__SUNPRO_CC <= 0x530) && !(defined BOOST_NO_COMPILER_CONFIG)
105 // Sun C++ 5.3 can't handle the safe_bool idiom, so don't use it
106 operator bool () const { return !this->empty(); }
107 #else
108 --- 398,404 ----
109 invoker = 0;
112 ! #if (defined __SUNPRO_CC) // workaround opt bug when compiling with -xO3
113 // Sun C++ 5.3 can't handle the safe_bool idiom, so don't use it
114 operator bool () const { return !this->empty(); }
115 #else
116 ***************
117 *** 443,451 ****
118 R BOOST_FUNCTION_COMMA
119 BOOST_FUNCTION_TEMPLATE_ARGS
120 >::type
121 ! invoker_type;
123 ! invoker = &invoker_type::invoke;
124 function_base::manager =
125 &detail::function::functor_manager<FunctionPtr, Allocator>::manage;
126 function_base::functor =
127 --- 446,454 ----
128 R BOOST_FUNCTION_COMMA
129 BOOST_FUNCTION_TEMPLATE_ARGS
130 >::type
131 ! lcl_invoker_type;
133 ! invoker = &lcl_invoker_type::invoke;
134 function_base::manager =
135 &detail::function::functor_manager<FunctionPtr, Allocator>::manage;
136 function_base::functor =
137 ***************
138 *** 476,491 ****
139 R BOOST_FUNCTION_COMMA
140 BOOST_FUNCTION_TEMPLATE_ARGS
141 >::type
142 ! invoker_type;
144 ! invoker = &invoker_type::invoke;
145 function_base::manager = &detail::function::functor_manager<
146 FunctionObj, Allocator>::manage;
147 #ifndef BOOST_NO_STD_ALLOCATOR
148 typedef typename Allocator::template rebind<FunctionObj>::other
149 ! allocator_type;
150 ! typedef typename allocator_type::pointer pointer_type;
151 ! allocator_type allocator;
152 pointer_type copy = allocator.allocate(1);
153 allocator.construct(copy, f);
155 --- 479,494 ----
156 R BOOST_FUNCTION_COMMA
157 BOOST_FUNCTION_TEMPLATE_ARGS
158 >::type
159 ! lcl_invoker_type;
161 ! invoker = &lcl_invoker_type::invoke;
162 function_base::manager = &detail::function::functor_manager<
163 FunctionObj, Allocator>::manage;
164 #ifndef BOOST_NO_STD_ALLOCATOR
165 typedef typename Allocator::template rebind<FunctionObj>::other
166 ! lcl_allocator_type;
167 ! typedef typename lcl_allocator_type::pointer pointer_type;
168 ! lcl_allocator_type allocator;
169 pointer_type copy = allocator.allocate(1);
170 allocator.construct(copy, f);
172 ***************
173 *** 510,518 ****
174 R BOOST_FUNCTION_COMMA
175 BOOST_FUNCTION_TEMPLATE_ARGS
176 >::type
177 ! invoker_type;
179 ! invoker = &invoker_type::invoke;
180 function_base::manager = &detail::function::trivial_manager;
181 function_base::functor =
182 function_base::manager(
183 --- 513,521 ----
184 R BOOST_FUNCTION_COMMA
185 BOOST_FUNCTION_TEMPLATE_ARGS
186 >::type
187 ! lcl_invoker_type;
189 ! invoker = &lcl_invoker_type::invoke;
190 function_base::manager = &detail::function::trivial_manager;
191 function_base::functor =
192 function_base::manager(
193 ***************
194 *** 532,539 ****
195 R BOOST_FUNCTION_COMMA
196 BOOST_FUNCTION_TEMPLATE_ARGS
197 >::type
198 ! invoker_type;
199 ! invoker = &invoker_type::invoke;
200 function_base::manager = &detail::function::trivial_manager;
201 function_base::functor = detail::function::make_any_pointer(this);
203 --- 535,542 ----
204 R BOOST_FUNCTION_COMMA
205 BOOST_FUNCTION_TEMPLATE_ARGS
206 >::type
207 ! lcl_invoker_type;
208 ! invoker = &lcl_invoker_type::invoke;
209 function_base::manager = &detail::function::trivial_manager;
210 function_base::functor = detail::function::make_any_pointer(this);
212 *** misc/boost-1.30.2/boost/function.hpp Fri Feb 14 16:34:39 2003
213 --- misc/build/boost-1.30.2/boost/function.hpp Tue Jul 25 14:47:06 2006
214 ***************
215 *** 16,21 ****
216 --- 16,26 ----
217 // William Kempf, Jesse Jones and Karl Nelson were all very helpful in the
218 // design of this library.
220 + #if defined _MSC_VER
221 + #pragma warning(push)
222 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
223 + #endif
225 #include <boost/preprocessor/iterate.hpp>
226 #include <boost/detail/workaround.hpp>
228 ***************
229 *** 67,70 ****
230 --- 72,79 ----
231 # define BOOST_PP_ITERATION_PARAMS_1 (3,(0,BOOST_FUNCTION_MAX_ARGS,<boost/function/detail/function_iterate.hpp>))
232 # include BOOST_PP_ITERATE()
233 # undef BOOST_PP_ITERATION_PARAMS_1
234 + #endif
236 + #if defined _MSC_VER
237 + #pragma warning(pop)
238 #endif
239 *** misc/boost-1.30.2/boost/mem_fn.hpp Fri Dec 20 19:14:59 2002
240 --- misc/build/boost-1.30.2/boost/mem_fn.hpp Tue Jul 25 14:47:06 2006
241 ***************
242 *** 5,10 ****
243 --- 5,17 ----
244 #pragma once
245 #endif
247 + #if defined(_MSC_VER) && !defined(BOOST_MEM_FN_ENABLE_CDECL)
248 + // enable support for __cdecl (SAL_CALL) C++-UNO interface methods;
249 + // makes sense to shift this to command line some day:
250 + // -DBOOST_MEM_FN_ENABLE_CDECL
251 + #define BOOST_MEM_FN_ENABLE_CDECL
252 + #endif
255 // mem_fn.hpp - a generalization of std::mem_fun[_ref]
257 ***************
258 *** 46,51 ****
259 --- 53,70 ----
260 #undef BOOST_MEM_FN_CC
261 #undef BOOST_MEM_FN_NAME
263 + #ifdef BOOST_MEM_FN_ENABLE_CDECL
265 + #define BOOST_MEM_FN_NAME(X) inner_##X##_cdecl
266 + #define BOOST_MEM_FN_CC __cdecl
268 + #include <boost/bind/mem_fn_template.hpp>
270 + #undef BOOST_MEM_FN_CC
271 + #undef BOOST_MEM_FN_NAME
273 + #endif
275 #ifdef BOOST_MEM_FN_ENABLE_STDCALL
277 #define BOOST_MEM_FN_NAME(X) inner_##X##_stdcall
278 ***************
279 *** 87,92 ****
280 --- 106,123 ----
281 #undef BOOST_MEM_FN_CC
282 #undef BOOST_MEM_FN_NAME
284 + #ifdef BOOST_MEM_FN_ENABLE_CDECL
286 + #define BOOST_MEM_FN_NAME(X) inner_##X##_cdecl
287 + #define BOOST_MEM_FN_CC __cdecl
289 + #include <boost/bind/mem_fn_template.hpp>
291 + #undef BOOST_MEM_FN_CC
292 + #undef BOOST_MEM_FN_NAME
294 + #endif
296 #ifdef BOOST_MEM_FN_ENABLE_STDCALL
298 #define BOOST_MEM_FN_NAME(X) inner_##X##_stdcall
299 ***************
300 *** 128,133 ****
301 --- 159,178 ----
302 #undef BOOST_MEM_FN_NAME2
303 #undef BOOST_MEM_FN_CC
305 + #ifdef BOOST_MEM_FN_ENABLE_CDECL
307 + #define BOOST_MEM_FN_NAME(X) X##_cdecl
308 + #define BOOST_MEM_FN_NAME2(X) inner_##X##_cdecl
309 + #define BOOST_MEM_FN_CC __cdecl
311 + #include <boost/bind/mem_fn_vw.hpp>
313 + #undef BOOST_MEM_FN_NAME
314 + #undef BOOST_MEM_FN_NAME2
315 + #undef BOOST_MEM_FN_CC
317 + #endif
319 #ifdef BOOST_MEM_FN_ENABLE_STDCALL
321 #define BOOST_MEM_FN_NAME(X) X##_stdcall
322 ***************
323 *** 176,181 ****
324 --- 221,238 ----
325 #undef BOOST_MEM_FN_CC
326 #undef BOOST_MEM_FN_NAME
328 + #ifdef BOOST_MEM_FN_ENABLE_CDECL
330 + #define BOOST_MEM_FN_NAME(X) X##_cdecl
331 + #define BOOST_MEM_FN_CC __cdecl
333 + #include <boost/bind/mem_fn_template.hpp>
335 + #undef BOOST_MEM_FN_CC
336 + #undef BOOST_MEM_FN_NAME
338 + #endif
340 #ifdef BOOST_MEM_FN_ENABLE_STDCALL
342 #define BOOST_MEM_FN_NAME(X) X##_stdcall
343 ***************
344 *** 217,222 ****
345 --- 274,291 ----
346 #undef BOOST_MEM_FN_NAME
347 #undef BOOST_MEM_FN_CC
349 + #ifdef BOOST_MEM_FN_ENABLE_CDECL
351 + #define BOOST_MEM_FN_NAME(X) X##_cdecl
352 + #define BOOST_MEM_FN_CC __cdecl
354 + #include <boost/bind/mem_fn_cc.hpp>
356 + #undef BOOST_MEM_FN_NAME
357 + #undef BOOST_MEM_FN_CC
359 + #endif
361 #ifdef BOOST_MEM_FN_ENABLE_STDCALL
363 #define BOOST_MEM_FN_NAME(X) X##_stdcall
364 *** misc/build/boost-1.30.2/boost/function/function_base.hpp Fri Jul 18 06:04:54 2003
365 --- misc/modified/boost-1.30.2/boost/function/function_base.hpp Thu Aug 10 11:17:30 2006
366 ***************
367 *** 16,21 ****
368 --- 16,26 ----
369 #ifndef BOOST_FUNCTION_BASE_HEADER
370 #define BOOST_FUNCTION_BASE_HEADER
372 + #if defined _MSC_VER
373 + #pragma warning(push)
374 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
375 + #endif
377 #include <stdexcept>
378 #include <string>
379 #include <memory>
380 ***************
381 *** 413,416 ****
382 --- 418,425 ----
383 } // end namespace detail
384 } // end namespace boost
386 + #if defined _MSC_VER
387 + #pragma warning(pop)
388 + #endif
390 #endif // BOOST_FUNCTION_BASE_HEADER
391 *** misc/build/boost-1.30.2/boost/iterator_adaptors.hpp Fri Dec 27 17:51:52 2002
392 --- misc/modified/boost-1.30.2/boost/iterator_adaptors.hpp Thu Aug 10 11:33:04 2006
393 ***************
394 *** 119,124 ****
395 --- 119,129 ----
396 #ifndef BOOST_ITERATOR_ADAPTOR_DWA053000_HPP_
397 # define BOOST_ITERATOR_ADAPTOR_DWA053000_HPP_
399 + # if defined _MSC_VER
400 + # pragma warning(push)
401 + # pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
402 + # endif
404 # include <boost/iterator.hpp>
405 # include <boost/utility.hpp>
406 # include <boost/compressed_pair.hpp>
407 ***************
408 *** 873,879 ****
409 return policies().dereference(*this);
412 ! #if BOOST_WORKAROUND(BOOST_MSVC, > 0)
413 # pragma warning(push)
414 # pragma warning( disable : 4284 )
415 #endif
416 --- 878,884 ----
417 return policies().dereference(*this);
420 ! #if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
421 # pragma warning(push)
422 # pragma warning( disable : 4284 )
423 #endif
424 ***************
425 *** 882,888 ****
426 operator->() const
427 { return detail::operator_arrow(*this, iterator_category()); }
429 ! #if BOOST_WORKAROUND(BOOST_MSVC, > 0)
430 # pragma warning(pop)
431 #endif
433 --- 887,893 ----
434 operator->() const
435 { return detail::operator_arrow(*this, iterator_category()); }
437 ! #if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
438 # pragma warning(pop)
439 #endif
441 ***************
442 *** 1430,1435 ****
443 --- 1435,1443 ----
444 } // namespace boost
445 # undef BOOST_ARG_DEPENDENT_TYPENAME
447 + # if defined _MSC_VER
448 + # pragma warning(pop)
449 + # endif
451 #endif
453 *** misc/build/boost-1.30.2/boost/mpl/aux_/ice_cast.hpp Tue Feb 4 21:21:05 2003
454 --- misc/modified/boost-1.30.2/boost/mpl/aux_/ice_cast.hpp Thu Aug 10 11:17:20 2006
455 ***************
456 *** 17,22 ****
457 --- 17,27 ----
458 #ifndef BOOST_MPL_AUX_ICE_CAST_HPP_INCLUDED
459 #define BOOST_MPL_AUX_ICE_CAST_HPP_INCLUDED
461 + #if defined _MSC_VER
462 + #pragma warning(push)
463 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
464 + #endif
466 #include "boost/mpl/aux_/config/workaround.hpp"
468 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) \
469 ***************
470 *** 28,31 ****
471 --- 33,40 ----
472 # define BOOST_MPL_AUX_ICE_CAST(T, expr) static_cast<T>(expr)
473 #endif
475 + #if defined _MSC_VER
476 + #pragma warning(pop)
477 + #endif
479 #endif // BOOST_MPL_AUX_ICE_CAST_HPP_INCLUDED
480 *** misc/build/boost-1.30.2/boost/mpl/aux_/integral_wrapper.hpp Thu Mar 13 13:13:32 2003
481 --- misc/modified/boost-1.30.2/boost/mpl/aux_/integral_wrapper.hpp Thu Aug 10 11:17:06 2006
482 ***************
483 *** 17,22 ****
484 --- 17,27 ----
486 // no include guards, the header is intended for multiple inclusion!
488 + #if defined _MSC_VER
489 + #pragma warning(push)
490 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
491 + #endif
493 #include "boost/mpl/aux_/ice_cast.hpp"
494 #include "boost/mpl/aux_/config/nttp.hpp"
495 #include "boost/mpl/aux_/config/static_constant.hpp"
496 ***************
497 *** 84,86 ****
498 --- 89,95 ----
499 #undef AUX_WRAPPER_PARAMS
500 #undef AUX_WRAPPER_INST
501 #undef AUX_WRAPPER_VALUE_TYPE
503 + #if defined _MSC_VER
504 + #pragma warning(pop)
505 + #endif
506 *** misc/build/boost-1.30.2/boost/mpl/aux_/lambda_support.hpp Sat Mar 8 08:10:07 2003
507 --- misc/modified/boost-1.30.2/boost/mpl/aux_/lambda_support.hpp Thu Aug 10 11:16:54 2006
508 ***************
509 *** 17,22 ****
510 --- 17,27 ----
511 #ifndef BOOST_MPL_AUX_LAMBDA_SUPPORT_HPP_INCLUDED
512 #define BOOST_MPL_AUX_LAMBDA_SUPPORT_HPP_INCLUDED
514 + #if defined _MSC_VER
515 + #pragma warning(push)
516 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
517 + #endif
519 #include "boost/mpl/aux_/config/lambda.hpp"
521 #if !defined(BOOST_MPL_NO_FULL_LAMBDA_SUPPORT)
522 ***************
523 *** 133,136 ****
524 --- 138,145 ----
526 #endif // BOOST_MPL_NO_FULL_LAMBDA_SUPPORT
528 + #if defined _MSC_VER
529 + #pragma warning(pop)
530 + #endif
532 #endif // BOOST_MPL_AUX_LAMBDA_SUPPORT_HPP_INCLUDED
533 *** misc/build/boost-1.30.2/boost/mpl/aux_/logical_op.hpp Wed Feb 26 00:10:54 2003
534 --- misc/modified/boost-1.30.2/boost/mpl/aux_/logical_op.hpp Thu Aug 10 11:16:40 2006
535 ***************
536 *** 17,22 ****
537 --- 17,27 ----
539 // no include guards, the header is intended for multiple inclusion!
541 + #if defined _MSC_VER
542 + #pragma warning(push)
543 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
544 + #endif
546 #if !defined(BOOST_MPL_PREPROCESSING_MODE)
547 # include "boost/mpl/bool.hpp"
548 # include "boost/mpl/aux_/nested_type_wknd.hpp"
549 ***************
550 *** 167,169 ****
551 --- 172,178 ----
552 #undef AUX_LOGICAL_OP_NAME
553 #undef AUX_LOGICAL_OP_VALUE1
554 #undef AUX_LOGICAL_OP_VALUE2
556 + #if defined _MSC_VER
557 + #pragma warning(pop)
558 + #endif
559 *** misc/build/boost-1.30.2/boost/mpl/if.hpp Thu Mar 13 13:13:29 2003
560 --- misc/modified/boost-1.30.2/boost/mpl/if.hpp Thu Aug 10 11:16:06 2006
561 ***************
562 *** 17,22 ****
563 --- 17,27 ----
565 // See http://www.boost.org/libs/mpl for documentation.
567 + #if defined _MSC_VER
568 + #pragma warning(push)
569 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
570 + #endif
572 #include "boost/mpl/aux_/value_wknd.hpp"
573 #include "boost/mpl/aux_/ice_cast.hpp"
574 #include "boost/mpl/aux_/void_spec.hpp"
575 ***************
576 *** 174,177 ****
577 --- 179,186 ----
578 } // namespace mpl
579 } // namespace boost
581 + #if defined _MSC_VER
582 + #pragma warning(pop)
583 + #endif
585 #endif // BOOST_MPL_IF_HPP_INCLUDED
586 *** misc/build/boost-1.30.2/boost/mpl/integral_c.hpp Thu Mar 13 13:13:29 2003
587 --- misc/modified/boost-1.30.2/boost/mpl/integral_c.hpp Thu Aug 10 11:15:52 2006
588 ***************
589 *** 18,23 ****
590 --- 18,28 ----
592 // See http://www.boost.org/libs/mpl for documentation.
594 + #if defined _MSC_VER
595 + #pragma warning(push)
596 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
597 + #endif
599 #include "boost/mpl/integral_c_fwd.hpp"
600 #include "boost/mpl/aux_/ice_cast.hpp"
601 #include "boost/mpl/aux_/config/ctps.hpp"
602 ***************
603 *** 50,53 ****
604 --- 55,62 ----
606 #endif
608 + #if defined _MSC_VER
609 + #pragma warning(pop)
610 + #endif
612 #endif // BOOST_MPL_INTEGRAL_C_HPP_INCLUDED
613 *** misc/build/boost-1.30.2/boost/mpl/integral_c_fwd.hpp Thu Mar 13 13:13:30 2003
614 --- misc/modified/boost-1.30.2/boost/mpl/integral_c_fwd.hpp Thu Aug 10 11:15:36 2006
615 ***************
616 *** 18,23 ****
617 --- 18,28 ----
619 // See http://www.boost.org/libs/mpl for documentation.
621 + #if defined _MSC_VER
622 + #pragma warning(push)
623 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
624 + #endif
626 #include "boost/mpl/aux_/config/workaround.hpp"
628 namespace boost { namespace mpl {
629 ***************
630 *** 29,32 ****
631 --- 34,41 ----
632 #endif
635 + #if defined _MSC_VER
636 + #pragma warning(pop)
637 + #endif
639 #endif // BOOST_MPL_INTEGRAL_C_FWD_HPP_INCLUDED
640 *** misc/build/boost-1.30.2/boost/mpl/is_sequence.hpp Wed Feb 26 00:10:43 2003
641 --- misc/modified/boost-1.30.2/boost/mpl/is_sequence.hpp Thu Aug 10 11:15:14 2006
642 ***************
643 *** 17,22 ****
644 --- 17,27 ----
645 #ifndef BOOST_MPL_IS_SEQUENCE_HPP_INCLUDED
646 #define BOOST_MPL_IS_SEQUENCE_HPP_INCLUDED
648 + #if defined _MSC_VER
649 + #pragma warning(push)
650 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
651 + #endif
653 #include "boost/mpl/not.hpp"
654 #include "boost/mpl/or.hpp"
655 #include "boost/mpl/begin_end.hpp"
656 ***************
657 *** 98,101 ****
658 --- 103,110 ----
660 }} // namespace boost::mpl
662 + #if defined _MSC_VER
663 + #pragma warning(pop)
664 + #endif
666 #endif // BOOST_MPL_IS_SEQUENCE_HPP_INCLUDED
667 *** misc/build/boost-1.30.2/boost/mpl/sequence_tag.hpp Mon Feb 24 01:50:53 2003
668 --- misc/modified/boost-1.30.2/boost/mpl/sequence_tag.hpp Thu Aug 10 11:14:58 2006
669 ***************
670 *** 17,22 ****
671 --- 17,27 ----
672 #ifndef BOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED
673 #define BOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED
675 + #if defined _MSC_VER
676 + #pragma warning(push)
677 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
678 + #endif
680 #include "boost/mpl/sequence_tag_fwd.hpp"
681 #include "boost/mpl/aux_/has_tag.hpp"
682 #include "boost/mpl/aux_/has_begin.hpp"
683 ***************
684 *** 130,133 ****
685 --- 135,142 ----
687 }} // namespace boost::mpl
689 + #if defined _MSC_VER
690 + #pragma warning(pop)
691 + #endif
693 #endif // BOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED
695 *** misc/build/boost-1.30.2/boost/token_functions.hpp 2007-05-20 07:38:11.000000000 -0400
696 --- misc/modified/boost-1.30.2/boost/token_functions.hpp 2007-05-20 08:05:05.000000000 -0400
697 ***************
698 *** 64,70 ****
699 // character (backslash \), can be assigned to other characters.
701 struct escaped_list_error : public std::runtime_error{
702 ! escaped_list_error(const std::string& what):std::runtime_error(what) { }
706 --- 64,70 ----
707 // character (backslash \), can be assigned to other characters.
709 struct escaped_list_error : public std::runtime_error{
710 ! escaped_list_error(const std::string& s_what) : std::runtime_error(s_what) { }
714 *** misc/build/boost-1.30.2/boost/token_iterator.hpp 2007-05-20 07:38:10.000000000 -0400
715 --- misc/modified/boost-1.30.2/boost/token_iterator.hpp 2007-05-20 08:10:20.000000000 -0400
716 ***************
717 *** 64,72 ****
719 template<class Iterator>
720 typename Iterator::reference
721 ! dereference(const Iterator& a) const{
722 using namespace std;
723 ! assert(a.base().valid_);
724 return tok_;
726 template <class Iterator>
727 --- 64,72 ----
729 template<class Iterator>
730 typename Iterator::reference
731 ! dereference(const Iterator& iter ) const{
732 using namespace std;
733 ! (void)iter; assert(iter.base().valid_);
734 return tok_;
736 template <class Iterator>