?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
sync master with lastest vba changes
[ooovba.git] / boost / spirit-1.6.1.patch
blob66adf6ba1ab53917c619f330566e9fa95ee9a511
1 *** misc/spirit-1.6.1/boost/spirit/core/composite/actions.hpp Tue Jul 8 04:19:06 2003
2 --- misc/build/spirit-1.6.1/boost/spirit/core/composite/actions.hpp Wed Dec 5 10:08:58 2007
3 ***************
4 *** 11,16 ****
5 --- 11,21 ----
6 #ifndef BOOST_SPIRIT_ACTIONS_HPP
7 #define BOOST_SPIRIT_ACTIONS_HPP
8
9 + #if defined _MSC_VER
10 + #pragma warning(push)
11 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
12 + #endif
13 +
14 ///////////////////////////////////////////////////////////////////////////////
15 #include <algorithm>
16
17 ***************
18 *** 345,349 ****
19 --- 350,358 ----
20 }
21
22 }} // namespace boost::spirit
23 +
24 + #if defined _MSC_VER
25 + #pragma warning(pop)
26 + #endif
27
28 #endif
29 *** misc/spirit-1.6.1/boost/spirit/core/composite/composite.hpp Tue Jul 8 04:19:06 2003
30 --- misc/build/spirit-1.6.1/boost/spirit/core/composite/composite.hpp Wed Dec 5 10:08:58 2007
31 ***************
32 *** 65,75 ****
33 unary(BaseT const& base)
34 : base_t(base) {}
35
36 ! unary(param_t s)
37 ! : base_t(s) {}
38
39 ! unary(BaseT const& base, param_t s)
40 ! : base_t(base, s) {}
41
42 return_t
43 subject() const
44 --- 65,75 ----
45 unary(BaseT const& base)
46 : base_t(base) {}
47
48 ! unary(param_t _s)
49 ! : base_t(_s) {}
50
51 ! unary(BaseT const& _base, param_t _s)
52 ! : base_t(_base, _s) {}
53
54 return_t
55 subject() const
56 *** misc/spirit-1.6.1/boost/spirit/core/composite/epsilon.hpp Tue Jul 8 04:19:06 2003
57 --- misc/build/spirit-1.6.1/boost/spirit/core/composite/epsilon.hpp Wed Dec 5 10:08:58 2007
58 ***************
59 *** 12,17 ****
60 --- 12,22 ----
61 #ifndef BOOST_SPIRIT_EPSILON_HPP
62 #define BOOST_SPIRIT_EPSILON_HPP
63
64 + #if defined _MSC_VER
65 + #pragma warning(push)
66 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
67 + #endif
68 +
69 ////////////////////////////////////////////////////////////////////////////////
70 #if !defined(BOOST_SPIRIT_PARSER_HPP)
71 #include "boost/spirit/core/parser.hpp"
72 ***************
73 *** 70,76 ****
74 private:
75 };
76
77 ! #if BOOST_WORKAROUND(BOOST_MSVC, == 1310) // VC 7.1
78 template <typename CondT>
79 inline condition_parser<CondT, false>
80 operator~(condition_parser<CondT, true> const& p)
81 --- 75,81 ----
82 private:
83 };
84
85 ! #if BOOST_WORKAROUND(BOOST_MSVC, == 1310) || BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x550))
86 template <typename CondT>
87 inline condition_parser<CondT, false>
88 operator~(condition_parser<CondT, true> const& p)
89 ***************
90 *** 287,291 ****
91 --- 292,300 ----
92
93 ///////////////////////////////////////////////////////////////////////////////
94 }} // namespace boost::spirit
95 +
96 + #if defined _MSC_VER
97 + #pragma warning(pop)
98 + #endif
99
100 #endif
101 *** misc/spirit-1.6.1/boost/spirit/core/composite/impl/composite.ipp Tue Jul 8 04:19:06 2003
102 --- misc/build/spirit-1.6.1/boost/spirit/core/composite/impl/composite.ipp Wed Dec 5 10:08:58 2007
103 ***************
104 *** 112,120 ****
105 typedef typename base_t::return_t return_t;
106
107 subject() : base_t() {}
108 ! subject(BaseT const& base) : base_t(base) {}
109 ! subject(param_t s) : base_t(s) {}
110 ! subject(BaseT const& base, param_t s) : base_t(base, s) {}
111 };
112
113 //////////////////////////////////
114 --- 112,120 ----
115 typedef typename base_t::return_t return_t;
116
117 subject() : base_t() {}
118 ! subject(BaseT const& _base) : base_t(_base) {}
119 ! subject(param_t _s) : base_t(_s) {}
120 ! subject(BaseT const& _base, param_t _s) : base_t(_base, _s) {}
121 };
122
123 //////////////////////////////////
124 ***************
125 *** 126,134 ****
126 typedef typename base_t::return_t return_t;
127
128 left_subject() : base_t() {}
129 ! left_subject(BaseT const& base) : base_t(base) {}
130 ! left_subject(param_t s) : base_t(s) {}
131 ! left_subject(BaseT const& base, param_t s) : base_t(base, s) {}
132
133 return_t
134 left() const { return base_t::get(); }
135 --- 126,134 ----
136 typedef typename base_t::return_t return_t;
137
138 left_subject() : base_t() {}
139 ! left_subject(BaseT const& _base) : base_t(_base) {}
140 ! left_subject(param_t _s) : base_t(_s) {}
141 ! left_subject(BaseT const& _base, param_t _s) : base_t(_base, _s) {}
142
143 return_t
144 left() const { return base_t::get(); }
145 ***************
146 *** 143,151 ****
147 typedef typename base_t::return_t return_t;
148
149 right_subject() : base_t() {}
150 ! right_subject(BaseT const& base) : base_t(base) {}
151 ! right_subject(param_t s) : base_t(s) {}
152 ! right_subject(BaseT const& base, param_t s) : base_t(base, s) {}
153
154 return_t
155 right() const { return base_t::get(); }
156 --- 143,151 ----
157 typedef typename base_t::return_t return_t;
158
159 right_subject() : base_t() {}
160 ! right_subject(BaseT const& _base) : base_t(_base) {}
161 ! right_subject(param_t _s) : base_t(_s) {}
162 ! right_subject(BaseT const& _base, param_t _s) : base_t(_base, _s) {}
163
164 return_t
165 right() const { return base_t::get(); }
166 *** misc/spirit-1.6.1/boost/spirit/core/composite/impl/operators.ipp Tue Jul 8 04:19:06 2003
167 --- misc/build/spirit-1.6.1/boost/spirit/core/composite/impl/operators.ipp Wed Dec 5 10:08:58 2007
168 ***************
169 *** 12,17 ****
170 --- 12,21 ----
171 #if !defined(BOOST_SPIRIT_OPERATORS_IPP)
172 #define BOOST_SPIRIT_OPERATORS_IPP
173
174 + #if defined __SUNPRO_CC
175 + #pragma disable_warn
176 + #endif
177 +
178 ///////////////////////////////////////////////////////////////////////////////
179 namespace boost { namespace spirit {
180
181 ***************
182 *** 664,668 ****
183 --- 668,676 ----
184
185 ///////////////////////////////////////////////////////////////////////////////
186 }} // namespace boost::spirit
187 +
188 + #if defined __SUNPRO_CC
189 + #pragma enable_warn
190 + #endif
191
192 #endif
193 *** misc/spirit-1.6.1/boost/spirit/core/impl/match.ipp Tue Jul 8 04:19:06 2003
194 --- misc/build/spirit-1.6.1/boost/spirit/core/impl/match.ipp Wed Dec 5 10:08:58 2007
195 ***************
196 *** 154,167 ****
197 { return nil_t(); }
198 };
199
200 ! #if !defined(__BORLANDC__)
201 struct dummy { void nonnull() {}; };
202 typedef void (dummy::*safe_bool)();
203 #else
204 typedef bool safe_bool;
205 #endif
206
207 ! #if !defined(__BORLANDC__)
208 #define BOOST_SPIRIT_SAFE_BOOL(cond) ((cond) ? &impl::dummy::nonnull : 0)
209 #else
210 #define BOOST_SPIRIT_SAFE_BOOL(cond) (cond)
211 --- 154,167 ----
212 { return nil_t(); }
213 };
214
215 ! #if !defined(__BORLANDC__) && !defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
216 struct dummy { void nonnull() {}; };
217 typedef void (dummy::*safe_bool)();
218 #else
219 typedef bool safe_bool;
220 #endif
221
222 ! #if !defined(__BORLANDC__) && !defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
223 #define BOOST_SPIRIT_SAFE_BOOL(cond) ((cond) ? &impl::dummy::nonnull : 0)
224 #else
225 #define BOOST_SPIRIT_SAFE_BOOL(cond) (cond)
226 *** misc/spirit-1.6.1/boost/spirit/core/impl/parser.ipp Tue Jul 8 04:19:06 2003
227 --- misc/build/spirit-1.6.1/boost/spirit/core/impl/parser.ipp Wed Dec 5 10:08:58 2007
228 ***************
229 *** 11,16 ****
230 --- 11,20 ----
231 #if !defined(BOOST_SPIRIT_PARSER_IPP)
232 #define BOOST_SPIRIT_PARSER_IPP
233
234 + #if defined __SUNPRO_CC
235 + #pragma disable_warn
236 + #endif
237 +
238 ///////////////////////////////////////////////////////////////////////////////
239 namespace boost { namespace spirit {
240
241 ***************
242 *** 51,56 ****
243 --- 55,64 ----
244 }
245
246 }} // namespace boost::spirit
247 +
248 + #if defined __SUNPRO_CC
249 + #pragma enable_warn
250 + #endif
251
252 #endif
253
254 *** misc/spirit-1.6.1/boost/spirit/core/match.hpp Tue Jul 8 04:19:06 2003
255 --- misc/build/spirit-1.6.1/boost/spirit/core/match.hpp Wed Dec 5 10:08:58 2007
256 ***************
257 *** 60,70 ****
258 : len(-1), val(impl::match_attr<T>::get_default()) {}
259
260 explicit
261 ! match(unsigned length)
262 ! : len(length), val((impl::match_attr<T>::get_default())) {}
263
264 ! match(unsigned length, param_type val_)
265 ! : len(length), val(val_) {}
266
267 operator impl::safe_bool() const
268 { return BOOST_SPIRIT_SAFE_BOOL(len >= 0); }
269 --- 60,70 ----
270 : len(-1), val(impl::match_attr<T>::get_default()) {}
271
272 explicit
273 ! match(unsigned _length)
274 ! : len(_length), val((impl::match_attr<T>::get_default())) {}
275
276 ! match(unsigned _length, param_type val_)
277 ! : len(_length), val(val_) {}
278
279 operator impl::safe_bool() const
280 { return BOOST_SPIRIT_SAFE_BOOL(len >= 0); }
281 ***************
282 *** 120,130 ****
283 : len(-1) {}
284
285 explicit
286 ! match(unsigned length)
287 ! : len(length) {}
288
289 ! match(unsigned length, nil_t)
290 ! : len(length) {}
291
292 operator impl::safe_bool() const
293 { return BOOST_SPIRIT_SAFE_BOOL(len >= 0); }
294 --- 120,130 ----
295 : len(-1) {}
296
297 explicit
298 ! match(unsigned _length)
299 ! : len(_length) {}
300
301 ! match(unsigned _length, nil_t)
302 ! : len(_length) {}
303
304 operator impl::safe_bool() const
305 { return BOOST_SPIRIT_SAFE_BOOL(len >= 0); }
306 *** misc/spirit-1.6.1/boost/spirit/core/meta/impl/fundamental.ipp Tue Jul 8 04:19:06 2003
307 --- misc/build/spirit-1.6.1/boost/spirit/core/meta/impl/fundamental.ipp Wed Dec 5 10:08:58 2007
308 ***************
309 *** 11,16 ****
310 --- 11,20 ----
311 #if !defined(BOOST_SPIRIT_FUNDAMENTAL_IPP)
312 #define BOOST_SPIRIT_FUNDAMENTAL_IPP
313
314 + #if defined __SUNPRO_CC
315 + #pragma disable_warn
316 + #endif
317 +
318 ///////////////////////////////////////////////////////////////////////////////
319 namespace boost { namespace spirit {
320
321 ***************
322 *** 302,306 ****
323 --- 306,314 ----
324
325 ///////////////////////////////////////////////////////////////////////////////
326 }} // namespace boost::spirit
327 +
328 + #if defined __SUNPRO_CC
329 + #pragma enable_warn
330 + #endif
331
332 #endif // !defined(BOOST_SPIRIT_FUNDAMENTAL_IPP)
333 *** misc/spirit-1.6.1/boost/spirit/core/non_terminal/impl/grammar.ipp Tue Jul 8 04:19:06 2003
334 --- misc/build/spirit-1.6.1/boost/spirit/core/non_terminal/impl/grammar.ipp Wed Dec 5 10:08:58 2007
335 ***************
336 *** 243,249 ****
337 //////////////////////////////////
338 template<typename GrammarT>
339 inline void
340 ! grammar_destruct(GrammarT* self)
341 {
342 #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
343 typedef impl::grammar_helper_base<GrammarT> helper_base_t;
344 --- 243,255 ----
345 //////////////////////////////////
346 template<typename GrammarT>
347 inline void
348 ! grammar_destruct(GrammarT*
349 ! #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
350 ! # if !defined(__GNUC__) || (__GNUC__ > 2)
351 ! self
352 ! #endif
353 ! #endif
354 ! )
355 {
356 #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
357 typedef impl::grammar_helper_base<GrammarT> helper_base_t;
358 *** misc/spirit-1.6.1/boost/spirit/core/non_terminal/subrule.hpp Tue Jul 8 04:19:06 2003
359 --- misc/build/spirit-1.6.1/boost/spirit/core/non_terminal/subrule.hpp Wed Dec 5 10:08:58 2007
360 ***************
361 *** 228,234 ****
362 subrule_list<
363 subrule_parser<ID2, DefT2, ContextT2>,
364 nil_t> >
365 ! operator,(subrule_parser<ID2, DefT2, ContextT2> const& rhs) const
366 {
367 return subrule_list<
368 self_t,
369 --- 228,234 ----
370 subrule_list<
371 subrule_parser<ID2, DefT2, ContextT2>,
372 nil_t> >
373 ! operator,(subrule_parser<ID2, DefT2, ContextT2> const& _rhs) const
374 {
375 return subrule_list<
376 self_t,
377 ***************
378 *** 238,244 ****
379 *this,
380 subrule_list<
381 subrule_parser<ID2, DefT2, ContextT2>, nil_t>(
382 ! rhs, nil_t()));
383 }
384
385 typename DefT::embed_t rhs;
386 --- 238,244 ----
387 *this,
388 subrule_list<
389 subrule_parser<ID2, DefT2, ContextT2>, nil_t>(
390 ! _rhs, nil_t()));
391 }
392
393 typename DefT::embed_t rhs;
394 ***************
395 *** 276,285 ****
396 parse_main(ScannerT const& scan) const
397 {
398 typedef typename parser_result<self_t, ScannerT>::type result_t;
399 ! result_t result;
400 impl::parse_subrule<result_t, ScannerT, ID>::
401 ! do_(result, scan);
402 ! return result;
403 }
404
405 template <typename ScannerT>
406 --- 276,285 ----
407 parse_main(ScannerT const& scan) const
408 {
409 typedef typename parser_result<self_t, ScannerT>::type result_t;
410 ! result_t _result;
411 impl::parse_subrule<result_t, ScannerT, ID>::
412 ! do_(_result, scan);
413 ! return _result;
414 }
415
416 template <typename ScannerT>
417 *** misc/spirit-1.6.1/boost/spirit/core/scanner/impl/skipper.ipp Tue Jul 8 04:19:06 2003
418 --- misc/build/spirit-1.6.1/boost/spirit/core/scanner/impl/skipper.ipp Wed Dec 5 10:08:58 2007
419 ***************
420 *** 11,16 ****
421 --- 11,20 ----
422 #if !defined(BOOST_SPIRIT_SKIPPER_IPP)
423 #define BOOST_SPIRIT_SKIPPER_IPP
424
425 + #if defined __SUNPRO_CC
426 + #pragma disable_warn
427 + #endif
428 +
429 ///////////////////////////////////////////////////////////////////////////////
430 namespace boost { namespace spirit {
431
432 ***************
433 *** 175,180 ****
434 --- 179,188 ----
435
436 ///////////////////////////////////////////////////////////////////////////////
437 }} // namespace boost::spirit
438 +
439 + #if defined __SUNPRO_CC
440 + #pragma enable_warn
441 + #endif
442
443 #endif
444
445 *** misc/spirit-1.6.1/boost/spirit/core/scanner/scanner.hpp Tue Jul 8 04:19:06 2003
446 --- misc/build/spirit-1.6.1/boost/spirit/core/scanner/scanner.hpp Wed Dec 5 10:08:58 2007
447 ***************
448 *** 18,23 ****
449 --- 18,26 ----
450 #include <iterator>
451
452 #include "boost/config.hpp"
453 + #ifdef BOOST_NO_STD_ITERATOR_TRAITS
454 + #include "boost/iterator_adaptors.hpp"
455 + #endif
456 #include "boost/spirit/core/match.hpp"
457 #include "boost/spirit/core/non_terminal/parser_id.hpp"
458
459 ***************
460 *** 236,245 ****
461 --- 239,255 ----
462 typedef IteratorT iterator_t;
463 typedef PoliciesT policies_t;
464
465 + #ifdef BOOST_NO_STD_ITERATOR_TRAITS
466 + typedef typename boost::detail::iterator_traits<IteratorT>::value_type
467 + value_t;
468 + typedef typename boost::detail::iterator_traits<IteratorT>::reference
469 + ref_t;
470 + #else
471 typedef typename BOOST_SPIRIT_IT_NS::iterator_traits<IteratorT>::value_type
472 value_t;
473 typedef typename BOOST_SPIRIT_IT_NS::iterator_traits<IteratorT>::reference
474 ref_t;
475 + #endif
476 typedef typename boost::call_traits<IteratorT>::param_type
477 iter_param_t;
478
479 ***************
480 *** 260,281 ****
481 bool
482 at_end() const
483 {
484 ! typedef typename PoliciesT::iteration_policy_t iteration_policy_t;
485 ! return iteration_policy_t::at_end(*this);
486 }
487
488 value_t
489 operator*() const
490 {
491 ! typedef typename PoliciesT::iteration_policy_t iteration_policy_t;
492 ! return iteration_policy_t::filter(iteration_policy_t::get(*this));
493 }
494
495 scanner const&
496 operator++() const
497 {
498 ! typedef typename PoliciesT::iteration_policy_t iteration_policy_t;
499 ! iteration_policy_t::advance(*this);
500 return *this;
501 }
502
503 --- 270,291 ----
504 bool
505 at_end() const
506 {
507 ! typedef typename PoliciesT::iteration_policy_t _iteration_policy_t;
508 ! return _iteration_policy_t::at_end(*this);
509 }
510
511 value_t
512 operator*() const
513 {
514 ! typedef typename PoliciesT::iteration_policy_t _iteration_policy_t;
515 ! return _iteration_policy_t::filter(_iteration_policy_t::get(*this));
516 }
517
518 scanner const&
519 operator++() const
520 {
521 ! typedef typename PoliciesT::iteration_policy_t _iteration_policy_t;
522 ! _iteration_policy_t::advance(*this);
523 return *this;
524 }
525
526 *** misc/spirit-1.6.1/boost/spirit/error_handling/exceptions.hpp Tue Jul 8 04:19:06 2003
527 --- misc/build/spirit-1.6.1/boost/spirit/error_handling/exceptions.hpp Wed Dec 5 10:08:58 2007
528 ***************
529 *** 38,44 ****
530
531 parser_error_base() {}
532 virtual ~parser_error_base() throw() {}
533 ! parser_error_base(parser_error_base const&) {}
534 parser_error_base& operator=(parser_error_base const&)
535 { return *this; }
536 };
537 --- 38,44 ----
538
539 parser_error_base() {}
540 virtual ~parser_error_base() throw() {}
541 ! parser_error_base(parser_error_base const&) : std::exception() {}
542 parser_error_base& operator=(parser_error_base const&)
543 { return *this; }
544 };
545 ***************
546 *** 104,111 ****
547 typedef unary<ParserT, parser<self_t> > base_t;
548 typedef unary_parser_category parser_category_t;
549
550 ! assertive_parser(ParserT const& parser, ErrorDescrT descriptor)
551 ! : base_t(parser), descriptor(descriptor) {}
552
553 template <typename ScannerT>
554 struct result
555 --- 104,111 ----
556 typedef unary<ParserT, parser<self_t> > base_t;
557 typedef unary_parser_category parser_category_t;
558
559 ! assertive_parser(ParserT const& parser, ErrorDescrT desc)
560 ! : base_t(parser), descriptor(desc) {}
561
562 template <typename ScannerT>
563 struct result
564 ***************
565 *** 200,208 ****
566
567 error_status(
568 result_t result_ = fail,
569 ! int length = -1,
570 T const& value_ = T())
571 ! : result(result_), length(length), value(value_) {}
572
573 result_t result;
574 int length;
575 --- 200,208 ----
576
577 error_status(
578 result_t result_ = fail,
579 ! int length_ = -1,
580 T const& value_ = T())
581 ! : result(result_), length(length_), value(value_) {}
582
583 result_t result;
584 int length;
585 *** misc/spirit-1.6.1/boost/spirit/iterator/impl/file_iterator.ipp Tue Jul 8 04:19:06 2003
586 --- misc/build/spirit-1.6.1/boost/spirit/iterator/impl/file_iterator.ipp Wed Dec 5 10:08:58 2007
587 ***************
588 *** 24,29 ****
589 --- 24,33 ----
590 #if !defined FILE_ITERATOR_IPP
591 #define FILE_ITERATOR_IPP
592
593 + #if defined __SUNPRO_CC
594 + #pragma disable_warn
595 + #endif
596 +
597 ///////////////////////////////////////////////////////////////////////////////
598 #include <cassert>
599 #include <fcntl.h>
600 ***************
601 *** 489,493 ****
602 --- 493,501 ----
603
604 ///////////////////////////////////////////////////////////////////////////////
605 }} // namespace boost::spirit
606 +
607 + #if defined __SUNPRO_CC
608 + #pragma enable_warn
609 + #endif
610
611 #endif // #if !defined FILE_ITERATOR_IPP
612 *** misc/spirit-1.6.1/boost/spirit/iterator/multi_pass.hpp Tue Jul 8 04:19:06 2003
613 --- misc/build/spirit-1.6.1/boost/spirit/iterator/multi_pass.hpp Wed Dec 5 10:08:58 2007
614 ***************
615 *** 11,16 ****
616 --- 11,21 ----
617 #ifndef BOOST_SPIRIT_ITERATOR_MULTI_PASS_HPP
618 #define BOOST_SPIRIT_ITERATOR_MULTI_PASS_HPP
619
620 + #if defined _MSC_VER
621 + #pragma warning(push)
622 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
623 + #endif
624 +
625 #include <boost/config.hpp>
626 #include <boost/throw_exception.hpp>
627 #include <boost/detail/workaround.hpp>
628 ***************
629 *** 1313,1317 ****
630 --- 1318,1327 ----
631
632 #undef BOOST_SPIRIT_IT_NS
633 #endif // defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)
634 +
635 + #if defined _MSC_VER
636 + #pragma warning(pop)
637 + #endif
638 +
639 #endif // BOOST_SPIRIT_ITERATOR_MULTI_PASS_HPP
640
641 *** misc/spirit-1.6.1/boost/spirit/utility/chset.hpp Tue Jul 8 04:19:06 2003
642 --- misc/build/spirit-1.6.1/boost/spirit/utility/chset.hpp Wed Dec 5 10:08:58 2007
643 ***************
644 *** 12,17 ****
645 --- 12,22 ----
646 #ifndef BOOST_SPIRIT_CHSET_HPP
647 #define BOOST_SPIRIT_CHSET_HPP
648
649 + #if defined _MSC_VER
650 + #pragma warning(push)
651 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
652 + #endif
653 +
654 ///////////////////////////////////////////////////////////////////////////////
655 #include <boost/shared_ptr.hpp>
656 #include <boost/spirit/core/primitives/primitives.hpp>
657 ***************
658 *** 229,234 ****
659 --- 234,243 ----
660
661 ///////////////////////////////////////////////////////////////////////////////
662 }} // namespace boost::spirit
663 +
664 + #if defined _MSC_VER
665 + #pragma warning(pop)
666 + #endif
667
668 #endif
669
670 *** misc/spirit-1.6.1/boost/spirit/utility/chset_operators.hpp Tue Jul 8 04:19:06 2003
671 --- misc/build/spirit-1.6.1/boost/spirit/utility/chset_operators.hpp Wed Dec 5 10:08:58 2007
672 ***************
673 *** 12,17 ****
674 --- 12,22 ----
675 #ifndef BOOST_SPIRIT_CHSET_OPERATORS_HPP
676 #define BOOST_SPIRIT_CHSET_OPERATORS_HPP
677
678 + #if defined _MSC_VER
679 + #pragma warning(push)
680 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
681 + #endif
682 +
683 ///////////////////////////////////////////////////////////////////////////////
684 #include <boost/spirit/utility/chset.hpp>
685
686 *** misc/spirit-1.6.1/boost/spirit/utility/confix.hpp Tue Jul 8 04:19:06 2003
687 --- misc/build/spirit-1.6.1/boost/spirit/utility/confix.hpp Wed Dec 5 10:08:58 2007
688 ***************
689 *** 389,395 ****
690 as_parser<OpenT>::convert(open),
691 as_parser<CloseT>::convert(close)
692 );
693 ! };
694
695 ///////////////////////////////////////////////////////////////////////////////
696 }} // namespace boost::spirit
697 --- 389,395 ----
698 as_parser<OpenT>::convert(open),
699 as_parser<CloseT>::convert(close)
700 );
701 ! }
702
703 ///////////////////////////////////////////////////////////////////////////////
704 }} // namespace boost::spirit
705 *** misc/spirit-1.6.1/boost/spirit/utility/functor_parser.hpp Tue Jul 8 04:19:06 2003
706 --- misc/build/spirit-1.6.1/boost/spirit/utility/functor_parser.hpp Wed Dec 5 10:08:58 2007
707 ***************
708 *** 54,66 ****
709 typedef typename ScannerT::iterator_t iterator_t;
710
711 iterator_t const s(scan.first);
712 ! functor_result_t result;
713 ! int const len = functor(scan, result);
714
715 if (len < 0)
716 return scan.no_match();
717 else
718 ! return scan.create_match(len, result, s, scan.first);
719 }
720 };
721
722 --- 54,66 ----
723 typedef typename ScannerT::iterator_t iterator_t;
724
725 iterator_t const s(scan.first);
726 ! functor_result_t res;
727 ! int const len = functor(scan, res);
728
729 if (len < 0)
730 return scan.no_match();
731 else
732 ! return scan.create_match(len, res, s, scan.first);
733 }
734 };
735
736 *** misc/spirit-1.6.1/boost/spirit/utility/impl/chset.ipp Tue Jul 8 04:19:06 2003
737 --- misc/build/spirit-1.6.1/boost/spirit/utility/impl/chset.ipp Wed Dec 5 10:08:58 2007
738 ***************
739 *** 12,17 ****
740 --- 12,22 ----
741 #ifndef BOOST_SPIRIT_CHSET_IPP
742 #define BOOST_SPIRIT_CHSET_IPP
743
744 + #if defined _MSC_VER
745 + #pragma warning(push)
746 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
747 + #endif
748 +
749 ///////////////////////////////////////////////////////////////////////////////
750 #include <boost/limits.hpp>
751 #include <boost/spirit/utility/chset.hpp>
752 ***************
753 *** 359,364 ****
754 --- 364,373 ----
755
756 ///////////////////////////////////////////////////////////////////////////////
757 }} // namespace boost::spirit
758 +
759 + #if defined _MSC_VER
760 + #pragma warning(pop)
761 + #endif
762
763 #endif
764
765 *** misc/spirit-1.6.1/boost/spirit/utility/impl/chset_operators.ipp Tue Jul 8 04:19:06 2003
766 --- misc/build/spirit-1.6.1/boost/spirit/utility/impl/chset_operators.ipp Wed Dec 5 10:08:58 2007
767 ***************
768 *** 11,16 ****
769 --- 11,21 ----
770 #ifndef BOOST_SPIRIT_CHSET_OPERATORS_IPP
771 #define BOOST_SPIRIT_CHSET_OPERATORS_IPP
772
773 + #if defined _MSC_VER
774 + #pragma warning(push)
775 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
776 + #endif
777 +
778 ///////////////////////////////////////////////////////////////////////////////
779 #include <boost/limits.hpp>
780
781 ***************
782 *** 659,664 ****
783 --- 664,673 ----
784
785 ///////////////////////////////////////////////////////////////////////////////
786 }} // namespace boost::spirit
787 +
788 + #if defined _MSC_VER
789 + #pragma warning(pop)
790 + #endif
791
792 #endif
793
794 *** misc/spirit-1.6.1/boost/spirit/utility/loops.hpp Tue Jul 8 04:19:06 2003
795 --- misc/build/spirit-1.6.1/boost/spirit/utility/loops.hpp Wed Dec 5 10:08:58 2007
796 ***************
797 *** 47,54 ****
798 typedef fixed_loop<ParserT, ExactT> self_t;
799 typedef unary<ParserT, parser<self_t> > base_t;
800
801 ! fixed_loop (ParserT const & subject, ExactT const & exact)
802 ! : base_t(subject), m_exact(exact) {}
803
804 template <typename ScannerT>
805 typename parser_result <self_t, ScannerT>::type
806 --- 47,54 ----
807 typedef fixed_loop<ParserT, ExactT> self_t;
808 typedef unary<ParserT, parser<self_t> > base_t;
809
810 ! fixed_loop (ParserT const & subject_, ExactT const & exact_)
811 ! : base_t(subject_), m_exact(exact_) {}
812
813 template <typename ScannerT>
814 typename parser_result <self_t, ScannerT>::type
815 *** misc/spirit-1.6.1/miniboost/boost/concept_check.hpp Tue Jul 8 04:19:09 2003
816 --- misc/build/spirit-1.6.1/miniboost/boost/concept_check.hpp Wed Dec 5 10:08:58 2007
817 ***************
818 *** 708,719 ****
819 function_requires< AssignableConcept<Container> >();
820 const_constraints(c);
821 }
822 ! void const_constraints(const Container& c) {
823 ! i = c.begin();
824 ! i = c.end();
825 ! n = c.size();
826 ! n = c.max_size();
827 ! b = c.empty();
828 }
829 Container c;
830 bool b;
831 --- 708,719 ----
832 function_requires< AssignableConcept<Container> >();
833 const_constraints(c);
834 }
835 ! void const_constraints(const Container& cnr) {
836 ! i = cnr.begin();
837 ! i = cnr.end();
838 ! n = cnr.size();
839 ! n = cnr.max_size();
840 ! b = cnr.empty();
841 }
842 Container c;
843 bool b;
844 ***************
845 *** 777,785 ****
846 BidirectionalIteratorConcept<const_reverse_iterator> >();
847 const_constraints(c);
848 }
849 ! void const_constraints(const ReversibleContainer& c) {
850 ! const_reverse_iterator i = c.rbegin();
851 ! i = c.rend();
852 }
853 ReversibleContainer c;
854 };
855 --- 777,785 ----
856 BidirectionalIteratorConcept<const_reverse_iterator> >();
857 const_constraints(c);
858 }
859 ! void const_constraints(const ReversibleContainer& cnr) {
860 ! const_reverse_iterator i = cnr.rbegin();
861 ! i = cnr.rend();
862 }
863 ReversibleContainer c;
864 };
865 ***************
866 *** 821,828 ****
867
868 const_constraints(c);
869 }
870 ! void const_constraints(const RandomAccessContainer& c) {
871 ! const_reference r = c[n];
872 ignore_unused_variable_warning(r);
873 }
874 RandomAccessContainer c;
875 --- 821,828 ----
876
877 const_constraints(c);
878 }
879 ! void const_constraints(const RandomAccessContainer& cnr) {
880 ! const_reference r = cnr[n];
881 ignore_unused_variable_warning(r);
882 }
883 RandomAccessContainer c;
884 ***************
885 *** 925,932 ****
886 reference r = c.back();
887 ignore_unused_variable_warning(r);
888 }
889 ! void const_constraints(const BackInsertionSequence& c) {
890 ! const_reference r = c.back();
891 ignore_unused_variable_warning(r);
892 };
893 BackInsertionSequence c;
894 --- 925,932 ----
895 reference r = c.back();
896 ignore_unused_variable_warning(r);
897 }
898 ! void const_constraints(const BackInsertionSequence& cnr) {
899 ! const_reference r = cnr.back();
900 ignore_unused_variable_warning(r);
901 };
902 BackInsertionSequence c;
903 ***************
904 *** 947,956 ****
905 c.erase(r.first, r.second);
906 const_constraints(c);
907 }
908 ! void const_constraints(const AssociativeContainer& c) {
909 ! ci = c.find(k);
910 ! n = c.count(k);
911 ! cr = c.equal_range(k);
912 }
913 typedef typename AssociativeContainer::iterator iterator;
914 typedef typename AssociativeContainer::const_iterator const_iterator;
915 --- 947,956 ----
916 c.erase(r.first, r.second);
917 const_constraints(c);
918 }
919 ! void const_constraints(const AssociativeContainer& cnr) {
920 ! ci = cnr.find(k);
921 ! n = cnr.count(k);
922 ! cr = cnr.equal_range(k);
923 }
924 typedef typename AssociativeContainer::iterator iterator;
925 typedef typename AssociativeContainer::const_iterator const_iterator;
926 *** misc/spirit-1.6.1/miniboost/boost/config/compiler/gcc.hpp Tue Jul 8 04:19:08 2003
927 --- misc/build/spirit-1.6.1/miniboost/boost/config/compiler/gcc.hpp Wed Dec 5 10:08:58 2007
928 ***************
929 *** 59,65 ****
930 #endif
931 //
932 // last known and checked version is 3.2:
933 ! #if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 2))
934 # if defined(BOOST_ASSERT_CONFIG)
935 # error "Unknown compiler version - please run the configure tests and report the results"
936 # else
937 --- 59,66 ----
938 #endif
939 //
940 // last known and checked version is 3.2:
941 ! // although 3.4+x & 4.x are unchecked, we will give it a try
942 ! #if (__GNUC__ > 4)
943 # if defined(BOOST_ASSERT_CONFIG)
944 # error "Unknown compiler version - please run the configure tests and report the results"
945 # else
946 *** misc/spirit-1.6.1/miniboost/boost/config/compiler/sunpro_cc.hpp Tue Jul 8 04:19:08 2003
947 --- misc/build/spirit-1.6.1/miniboost/boost/config/compiler/sunpro_cc.hpp Wed Dec 5 10:08:58 2007
948 ***************
949 *** 45,52 ****
950 # define BOOST_NO_INTEGRAL_INT64_T
951 # endif
952
953 ! # if (__SUNPRO_CC <= 0x540) || !defined(BOOST_STRICT_CONFIG)
954 # define BOOST_NO_TEMPLATE_TEMPLATES
955 # endif
956
957 #define BOOST_COMPILER "Sun compiler version " BOOST_STRINGIZE(__SUNPRO_CC)
958 --- 45,57 ----
959 # define BOOST_NO_INTEGRAL_INT64_T
960 # endif
961
962 ! # if (__SUNPRO_CC <= 0x550) || !defined(BOOST_STRICT_CONFIG)
963 # define BOOST_NO_TEMPLATE_TEMPLATES
964 + // see http://lists.boost.org/MailArchives/boost/msg47184.php
965 + // and http://lists.boost.org/MailArchives/boost/msg47220.php
966 + # define BOOST_NO_INCLASS_MEMBER_INITIALIZATION
967 + # define BOOST_NO_SFINAE
968 + # define BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS
969 # endif
970
971 #define BOOST_COMPILER "Sun compiler version " BOOST_STRINGIZE(__SUNPRO_CC)
972 *** misc/spirit-1.6.1/miniboost/boost/config/compiler/visualc.hpp Tue Jul 8 04:19:08 2003
973 --- misc/build/spirit-1.6.1/miniboost/boost/config/compiler/visualc.hpp Wed Dec 5 10:12:34 2007
974 ***************
975 *** 65,75 ****
976 # define BOOST_NO_INTRINSIC_WCHAR_T
977 #endif
978
979 ! //
980 ! // check for exception handling support:
981 ! #ifndef _CPPUNWIND
982 ! # define BOOST_NO_EXCEPTIONS
983 ! #endif
984
985 //
986 // __int64 support:
987 --- 65,75 ----
988 # define BOOST_NO_INTRINSIC_WCHAR_T
989 #endif
990
991 ! //
992 ! // check for exception handling support:
993 ! #ifndef _CPPUNWIND
994 ! # define BOOST_NO_EXCEPTIONS
995 ! #endif
996
997 //
998 // __int64 support:
999 ***************
1000 *** 94,99 ****
1001 --- 94,101 ----
1002 # define BOOST_COMPILER_VERSION 7.0
1003 # elif _MSC_VER == 1310
1004 # define BOOST_COMPILER_VERSION 7.1
1005 + # elif _MSC_VER == 1400
1006 + # define BOOST_COMPILER_VERSION 8.0
1007 # else
1008 # define BOOST_COMPILER_VERSION _MSC_VER
1009 # endif
1010 ***************
1011 *** 108,121 ****
1012 #endif
1013 //
1014 // last known and checked version is 1310:
1015 ! #if (_MSC_VER > 1310)
1016 # if defined(BOOST_ASSERT_CONFIG)
1017 # error "Unknown compiler version - please run the configure tests and report the results"
1018 # else
1019 # pragma message("Unknown compiler version - please run the configure tests and report the results")
1020 # endif
1021 #endif
1022 -
1023
1024
1025
1026 --- 110,122 ----
1027 #endif
1028 //
1029 // last known and checked version is 1310:
1030 ! #if (_MSC_VER > 1500)
1031 # if defined(BOOST_ASSERT_CONFIG)
1032 # error "Unknown compiler version - please run the configure tests and report the results"
1033 # else
1034 # pragma message("Unknown compiler version - please run the configure tests and report the results")
1035 # endif
1036 #endif
1037
1038
1039
1040 *** misc/spirit-1.6.1/miniboost/boost/config/platform/macos.hpp Tue Jul 8 04:19:08 2003
1041 --- misc/build/spirit-1.6.1/miniboost/boost/config/platform/macos.hpp Wed Dec 5 10:08:58 2007
1042 ***************
1043 *** 19,27 ****
1044 # define BOOST_HAS_UNISTD_H
1045 # endif
1046 // boilerplate code:
1047 ! # ifndef TARGET_CARBON
1048 # include <boost/config/posix_features.hpp>
1049 ! # endif
1050 # ifndef BOOST_HAS_STDINT_H
1051 # define BOOST_HAS_STDINT_H
1052 # endif
1053 --- 19,28 ----
1054 # define BOOST_HAS_UNISTD_H
1055 # endif
1056 // boilerplate code:
1057 ! // See issue #i72248#
1058 ! //# ifndef TARGET_CARBON
1059 # include <boost/config/posix_features.hpp>
1060 ! //# endif
1061 # ifndef BOOST_HAS_STDINT_H
1062 # define BOOST_HAS_STDINT_H
1063 # endif
1064 *** misc/spirit-1.6.1/miniboost/boost/config/platform/win32.hpp Tue Jul 8 04:19:08 2003
1065 --- misc/build/spirit-1.6.1/miniboost/boost/config/platform/win32.hpp Wed Dec 5 10:08:58 2007
1066 ***************
1067 *** 40,45 ****
1068 --- 40,46 ----
1069 # define NOMINMAX
1070 #endif
1071
1072 + #if (_MSC_VER < 1400)
1073 #ifdef BOOST_MSVC
1074 namespace std{
1075 // Apparently, something in the Microsoft libraries requires the "long"
1076 ***************
1077 *** 65,67 ****
1078 --- 66,69 ----
1079 using std::min;
1080 using std::max;
1081 # endif
1082 + #endif
1083 *** misc/spirit-1.6.1/miniboost/boost/config/user.hpp Tue Jul 8 04:19:08 2003
1084 --- misc/build/spirit-1.6.1/miniboost/boost/config/user.hpp Wed Dec 5 10:08:58 2007
1085 ***************
1086 *** 66,68 ****
1087 --- 66,74 ----
1088 // #define BOOST_DISABLE_WIN32
1089
1090
1091 + // Switch off exception statements if file is compiled without
1092 + // exception support:
1093 + #if defined(EXCEPTIONS_OFF) && !defined(BOOST_NO_EXCEPTIONS)
1094 + #define BOOST_NO_EXCEPTIONS
1095 + #endif
1096 +
1097 *** misc/spirit-1.6.1/miniboost/boost/iterator_adaptors.hpp Tue Jul 8 04:19:09 2003
1098 --- misc/build/spirit-1.6.1/miniboost/boost/iterator_adaptors.hpp Wed Dec 5 10:08:58 2007
1099 ***************
1100 *** 119,124 ****
1101 --- 119,129 ----
1102 #ifndef BOOST_ITERATOR_ADAPTOR_DWA053000_HPP_
1103 # define BOOST_ITERATOR_ADAPTOR_DWA053000_HPP_
1104
1105 + # if defined _MSC_VER
1106 + # pragma warning(push)
1107 + # pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
1108 + # endif
1109 +
1110 # include <boost/iterator.hpp>
1111 # include <boost/utility.hpp>
1112 # include <boost/compressed_pair.hpp>
1113 ***************
1114 *** 873,879 ****
1115 return policies().dereference(*this);
1116 }
1117
1118 ! #if BOOST_WORKAROUND(BOOST_MSVC, > 0)
1119 # pragma warning(push)
1120 # pragma warning( disable : 4284 )
1121 #endif
1122 --- 878,884 ----
1123 return policies().dereference(*this);
1124 }
1125
1126 ! #if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
1127 # pragma warning(push)
1128 # pragma warning( disable : 4284 )
1129 #endif
1130 ***************
1131 *** 882,888 ****
1132 operator->() const
1133 { return detail::operator_arrow(*this, iterator_category()); }
1134
1135 ! #if BOOST_WORKAROUND(BOOST_MSVC, > 0)
1136 # pragma warning(pop)
1137 #endif
1138
1139 --- 887,893 ----
1140 operator->() const
1141 { return detail::operator_arrow(*this, iterator_category()); }
1142
1143 ! #if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
1144 # pragma warning(pop)
1145 #endif
1146
1147 ***************
1148 *** 1430,1435 ****
1149 --- 1435,1443 ----
1150 } // namespace boost
1151 # undef BOOST_ARG_DEPENDENT_TYPENAME
1152
1153 + # if defined _MSC_VER
1154 + # pragma warning(pop)
1155 + # endif
1156
1157 #endif
1158
1159 *** misc/spirit-1.6.1/miniboost/boost/mpl/aux_/ice_cast.hpp Tue Jul 8 04:19:08 2003
1160 --- misc/build/spirit-1.6.1/miniboost/boost/mpl/aux_/ice_cast.hpp Wed Dec 5 10:08:58 2007
1161 ***************
1162 *** 17,22 ****
1163 --- 17,27 ----
1164 #ifndef BOOST_MPL_AUX_ICE_CAST_HPP_INCLUDED
1165 #define BOOST_MPL_AUX_ICE_CAST_HPP_INCLUDED
1166
1167 + #if defined _MSC_VER
1168 + #pragma warning(push)
1169 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
1170 + #endif
1171 +
1172 #include "boost/mpl/aux_/config/workaround.hpp"
1173
1174 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) \
1175 ***************
1176 *** 26,31 ****
1177 --- 31,40 ----
1178 # define BOOST_MPL_AUX_ICE_CAST(T, expr) (T)(expr)
1179 #else
1180 # define BOOST_MPL_AUX_ICE_CAST(T, expr) static_cast<T>(expr)
1181 + #endif
1182 +
1183 + #if defined _MSC_VER
1184 + #pragma warning(pop)
1185 #endif
1186
1187 #endif // BOOST_MPL_AUX_ICE_CAST_HPP_INCLUDED
1188 *** misc/spirit-1.6.1/miniboost/boost/mpl/aux_/integral_wrapper.hpp Tue Jul 8 04:19:08 2003
1189 --- misc/build/spirit-1.6.1/miniboost/boost/mpl/aux_/integral_wrapper.hpp Wed Dec 5 10:08:58 2007
1190 ***************
1191 *** 17,22 ****
1192 --- 17,27 ----
1193
1194 // no include guards, the header is intended for multiple inclusion!
1195
1196 + #if defined _MSC_VER
1197 + #pragma warning(push)
1198 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
1199 + #endif
1200 +
1201 #include "boost/mpl/aux_/ice_cast.hpp"
1202 #include "boost/mpl/aux_/config/nttp.hpp"
1203 #include "boost/mpl/aux_/config/static_constant.hpp"
1204 ***************
1205 *** 84,86 ****
1206 --- 89,95 ----
1207 #undef AUX_WRAPPER_PARAMS
1208 #undef AUX_WRAPPER_INST
1209 #undef AUX_WRAPPER_VALUE_TYPE
1210 +
1211 + #if defined _MSC_VER
1212 + #pragma warning(pop)
1213 + #endif
1214 *** misc/spirit-1.6.1/miniboost/boost/mpl/aux_/lambda_support.hpp Tue Jul 8 04:19:08 2003
1215 --- misc/build/spirit-1.6.1/miniboost/boost/mpl/aux_/lambda_support.hpp Wed Dec 5 10:08:58 2007
1216 ***************
1217 *** 17,22 ****
1218 --- 17,27 ----
1219 #ifndef BOOST_MPL_AUX_LAMBDA_SUPPORT_HPP_INCLUDED
1220 #define BOOST_MPL_AUX_LAMBDA_SUPPORT_HPP_INCLUDED
1221
1222 + #if defined _MSC_VER
1223 + #pragma warning(push)
1224 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
1225 + #endif
1226 +
1227 #include "boost/mpl/aux_/config/lambda.hpp"
1228
1229 #if !defined(BOOST_MPL_NO_FULL_LAMBDA_SUPPORT)
1230 ***************
1231 *** 132,136 ****
1232 --- 137,145 ----
1233 #endif // __EDG_VERSION__
1234
1235 #endif // BOOST_MPL_NO_FULL_LAMBDA_SUPPORT
1236 +
1237 + #if defined _MSC_VER
1238 + #pragma warning(pop)
1239 + #endif
1240
1241 #endif // BOOST_MPL_AUX_LAMBDA_SUPPORT_HPP_INCLUDED
1242 *** misc/spirit-1.6.1/miniboost/boost/mpl/aux_/logical_op.hpp Tue Jul 8 04:19:08 2003
1243 --- misc/build/spirit-1.6.1/miniboost/boost/mpl/aux_/logical_op.hpp Wed Dec 5 10:08:58 2007
1244 ***************
1245 *** 17,22 ****
1246 --- 17,27 ----
1247
1248 // no include guards, the header is intended for multiple inclusion!
1249
1250 + #if defined _MSC_VER
1251 + #pragma warning(push)
1252 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
1253 + #endif
1254 +
1255 #if !defined(BOOST_MPL_PREPROCESSING_MODE)
1256 # include "boost/mpl/bool.hpp"
1257 # include "boost/mpl/aux_/nested_type_wknd.hpp"
1258 ***************
1259 *** 167,169 ****
1260 --- 172,178 ----
1261 #undef AUX_LOGICAL_OP_NAME
1262 #undef AUX_LOGICAL_OP_VALUE1
1263 #undef AUX_LOGICAL_OP_VALUE2
1264 +
1265 + #if defined _MSC_VER
1266 + #pragma warning(pop)
1267 + #endif
1268 *** misc/spirit-1.6.1/miniboost/boost/mpl/if.hpp Tue Jul 8 04:19:08 2003
1269 --- misc/build/spirit-1.6.1/miniboost/boost/mpl/if.hpp Wed Dec 5 10:08:58 2007
1270 ***************
1271 *** 17,22 ****
1272 --- 17,27 ----
1273 //
1274 // See http://www.boost.org/libs/mpl for documentation.
1275
1276 + #if defined _MSC_VER
1277 + #pragma warning(push)
1278 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
1279 + #endif
1280 +
1281 #include "boost/mpl/aux_/value_wknd.hpp"
1282 #include "boost/mpl/aux_/ice_cast.hpp"
1283 #include "boost/mpl/aux_/void_spec.hpp"
1284 ***************
1285 *** 173,177 ****
1286 --- 178,186 ----
1287
1288 } // namespace mpl
1289 } // namespace boost
1290 +
1291 + #if defined _MSC_VER
1292 + #pragma warning(pop)
1293 + #endif
1294
1295 #endif // BOOST_MPL_IF_HPP_INCLUDED
1296 *** misc/spirit-1.6.1/miniboost/boost/mpl/integral_c.hpp Tue Jul 8 04:19:08 2003
1297 --- misc/build/spirit-1.6.1/miniboost/boost/mpl/integral_c.hpp Wed Dec 5 10:08:58 2007
1298 ***************
1299 *** 18,23 ****
1300 --- 18,28 ----
1301 //
1302 // See http://www.boost.org/libs/mpl for documentation.
1303
1304 + #if defined _MSC_VER
1305 + #pragma warning(push)
1306 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
1307 + #endif
1308 +
1309 #include "boost/mpl/integral_c_fwd.hpp"
1310 #include "boost/mpl/aux_/ice_cast.hpp"
1311 #include "boost/mpl/aux_/config/ctps.hpp"
1312 ***************
1313 *** 48,53 ****
1314 --- 53,62 ----
1315 operator bool() const { return this->value; }
1316 };
1317 }}
1318 + #endif
1319 +
1320 + #if defined _MSC_VER
1321 + #pragma warning(pop)
1322 #endif
1323
1324 #endif // BOOST_MPL_INTEGRAL_C_HPP_INCLUDED
1325 *** misc/spirit-1.6.1/miniboost/boost/mpl/integral_c_fwd.hpp Tue Jul 8 04:19:08 2003
1326 --- misc/build/spirit-1.6.1/miniboost/boost/mpl/integral_c_fwd.hpp Wed Dec 5 10:08:58 2007
1327 ***************
1328 *** 18,23 ****
1329 --- 18,28 ----
1330 //
1331 // See http://www.boost.org/libs/mpl for documentation.
1332
1333 + #if defined _MSC_VER
1334 + #pragma warning(push)
1335 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
1336 + #endif
1337 +
1338 #include "boost/mpl/aux_/config/workaround.hpp"
1339
1340 namespace boost { namespace mpl {
1341 ***************
1342 *** 28,32 ****
1343 --- 33,41 ----
1344 template< typename T, T N > struct integral_c;
1345 #endif
1346 }}
1347 +
1348 + #if defined _MSC_VER
1349 + #pragma warning(pop)
1350 + #endif
1351
1352 #endif // BOOST_MPL_INTEGRAL_C_FWD_HPP_INCLUDED
1353 *** misc/spirit-1.6.1/miniboost/boost/mpl/is_sequence.hpp Tue Jul 8 04:19:08 2003
1354 --- misc/build/spirit-1.6.1/miniboost/boost/mpl/is_sequence.hpp Wed Dec 5 10:08:58 2007
1355 ***************
1356 *** 17,22 ****
1357 --- 17,27 ----
1358 #ifndef BOOST_MPL_IS_SEQUENCE_HPP_INCLUDED
1359 #define BOOST_MPL_IS_SEQUENCE_HPP_INCLUDED
1360
1361 + #if defined _MSC_VER
1362 + #pragma warning(push)
1363 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
1364 + #endif
1365 +
1366 #include "boost/mpl/not.hpp"
1367 #include "boost/mpl/or.hpp"
1368 #include "boost/mpl/begin_end.hpp"
1369 ***************
1370 *** 97,101 ****
1371 --- 102,110 ----
1372 BOOST_MPL_AUX_VOID_SPEC(1, is_sequence)
1373
1374 }} // namespace boost::mpl
1375 +
1376 + #if defined _MSC_VER
1377 + #pragma warning(pop)
1378 + #endif
1379
1380 #endif // BOOST_MPL_IS_SEQUENCE_HPP_INCLUDED
1381 *** misc/spirit-1.6.1/miniboost/boost/mpl/sequence_tag.hpp Tue Jul 8 04:19:08 2003
1382 --- misc/build/spirit-1.6.1/miniboost/boost/mpl/sequence_tag.hpp Wed Dec 5 10:08:58 2007
1383 ***************
1384 *** 17,22 ****
1385 --- 17,27 ----
1386 #ifndef BOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED
1387 #define BOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED
1388
1389 + #if defined _MSC_VER
1390 + #pragma warning(push)
1391 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
1392 + #endif
1393 +
1394 #include "boost/mpl/sequence_tag_fwd.hpp"
1395 #include "boost/mpl/aux_/has_tag.hpp"
1396 #include "boost/mpl/aux_/has_begin.hpp"
1397 ***************
1398 *** 129,133 ****
1399 --- 134,142 ----
1400 BOOST_MPL_AUX_VOID_SPEC(1, sequence_tag)
1401
1402 }} // namespace boost::mpl
1403 +
1404 + #if defined _MSC_VER
1405 + #pragma warning(pop)
1406 + #endif
1407
1408 #endif // BOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED
1409 *** misc/spirit-1.6.1/miniboost/boost/optional.hpp Tue Jul 8 04:19:09 2003
1410 --- misc/build/spirit-1.6.1/miniboost/boost/optional.hpp Wed Dec 5 10:08:58 2007
1411 ***************
1412 *** 17,22 ****
1413 --- 17,27 ----
1414 #ifndef BOOST_OPTIONAL_FLC_19NOV2002_HPP
1415 #define BOOST_OPTIONAL_FLC_19NOV2002_HPP
1416
1417 + #if defined _MSC_VER
1418 + #pragma warning(push)
1419 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
1420 + #endif
1421 +
1422 #include<new>
1423 #include<algorithm>
1424
1425 ***************
1426 *** 194,200 ****
1427 --- 199,209 ----
1428
1429 // implicit conversion to "bool"
1430 // No-throw
1431 + #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
1432 + operator bool() const { return m_initialized; }
1433 + #else
1434 operator unspecified_bool_type() const { return m_initialized ? &this_type::destroy : 0 ; }
1435 + #endif // defined(__SUNPRO_CC)
1436
1437 // This is provided for those compilers which don't like the conversion to bool
1438 // on some contexts.
1439 ***************
1440 *** 312,317 ****
1441 --- 321,330 ----
1442
1443
1444 } // namespace boost
1445 +
1446 + #if defined _MSC_VER
1447 + #pragma warning(pop)
1448 + #endif
1449
1450 #endif
1451
1452 *** misc/spirit-1.6.1/miniboost/boost/scoped_array.hpp Tue Jul 8 04:19:08 2003
1453 --- misc/build/spirit-1.6.1/miniboost/boost/scoped_array.hpp Wed Dec 5 10:08:58 2007
1454 ***************
1455 *** 83,94 ****
1456 --- 83,98 ----
1457
1458 // implicit conversion to "bool"
1459
1460 + #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
1461 + operator bool() const { return ptr != 0; }
1462 + #else
1463 typedef T * (this_type::*unspecified_bool_type)() const;
1464
1465 operator unspecified_bool_type() const // never throws
1466 {
1467 return ptr == 0? 0: &this_type::get;
1468 }
1469 + #endif // defined(__SUNPRO_CC)
1470
1471 bool operator! () const // never throws
1472 {
1473 *** misc/spirit-1.6.1/miniboost/boost/scoped_ptr.hpp Tue Jul 8 04:19:08 2003
1474 --- misc/build/spirit-1.6.1/miniboost/boost/scoped_ptr.hpp Wed Dec 5 10:08:58 2007
1475 ***************
1476 *** 102,113 ****
1477 --- 102,117 ----
1478
1479 // implicit conversion to "bool"
1480
1481 + #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
1482 + operator bool() const { return ptr != 0; }
1483 + #else
1484 typedef T * (this_type::*unspecified_bool_type)() const;
1485
1486 operator unspecified_bool_type() const // never throws
1487 {
1488 return ptr == 0? 0: &this_type::get;
1489 }
1490 + #endif // defined(__SUNPRO_CC)
1491
1492 bool operator! () const // never throws
1493 {
1494 *** misc/spirit-1.6.1/miniboost/boost/shared_array.hpp Tue Jul 8 04:19:08 2003
1495 --- misc/build/spirit-1.6.1/miniboost/boost/shared_array.hpp Wed Dec 5 10:08:58 2007
1496 ***************
1497 *** 94,105 ****
1498 --- 94,109 ----
1499
1500 // implicit conversion to "bool"
1501
1502 + #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
1503 + operator bool() const { return px != 0; }
1504 + #else
1505 typedef T * (this_type::*unspecified_bool_type)() const;
1506
1507 operator unspecified_bool_type() const // never throws
1508 {
1509 return px == 0? 0: &this_type::get;
1510 }
1511 + #endif // defined(__SUNPRO_CC)
1512
1513 bool operator! () const // never throws
1514 {
1515 *** misc/spirit-1.6.1/miniboost/boost/shared_ptr.hpp Tue Jul 8 04:19:08 2003
1516 --- misc/build/spirit-1.6.1/miniboost/boost/shared_ptr.hpp Wed Dec 5 10:08:58 2007
1517 ***************
1518 *** 35,41 ****
1519
1520 #ifdef BOOST_MSVC // moved here to work around VC++ compiler crash
1521 # pragma warning(push)
1522 ! # pragma warning(disable:4284) // odd return type for operator->
1523 #endif
1524
1525 namespace boost
1526 --- 35,41 ----
1527
1528 #ifdef BOOST_MSVC // moved here to work around VC++ compiler crash
1529 # pragma warning(push)
1530 ! # pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
1531 #endif
1532
1533 namespace boost
1534 ***************
1535 *** 246,257 ****
1536 --- 246,261 ----
1537
1538 // implicit conversion to "bool"
1539
1540 + #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
1541 + operator bool() const { return px != 0; }
1542 + #else
1543 typedef T * (this_type::*unspecified_bool_type)() const;
1544
1545 operator unspecified_bool_type() const // never throws
1546 {
1547 return px == 0? 0: &this_type::get;
1548 }
1549 + #endif // defined(__SUNPRO_CC)
1550
1551 // operator! is redundant, but some compilers need it
1552
1553 *** misc/spirit-1.6.1/miniboost/boost/throw_exception.hpp Tue Jul 8 04:19:08 2003
1554 --- misc/build/spirit-1.6.1/miniboost/boost/throw_exception.hpp Wed Dec 5 10:08:58 2007
1555 ***************
1556 *** 29,35 ****
1557
1558 #ifdef BOOST_NO_EXCEPTIONS
1559
1560 ! void throw_exception(std::exception const & e); // user defined
1561
1562 #else
1563
1564 --- 29,36 ----
1565
1566 #ifdef BOOST_NO_EXCEPTIONS
1567
1568 ! // void throw_exception(std::exception const & e); // user defined
1569 ! inline void throw_exception(std::exception const &) {}
1570
1571 #else
1572
1573 *** misc/spirit-1.6.1/miniboost/boost/type_traits/add_reference.hpp Tue Jul 8 04:19:09 2003
1574 --- misc/build/spirit-1.6.1/miniboost/boost/type_traits/add_reference.hpp Wed Dec 5 10:08:58 2007
1575 ***************
1576 *** 10,15 ****
1577 --- 10,20 ----
1578 #ifndef BOOST_TT_ADD_REFERENCE_HPP_INCLUDED
1579 #define BOOST_TT_ADD_REFERENCE_HPP_INCLUDED
1580
1581 + #if defined _MSC_VER
1582 + #pragma warning(push)
1583 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
1584 + #endif
1585 +
1586 #include "boost/type_traits/is_reference.hpp"
1587 #include "boost/detail/workaround.hpp"
1588 #include "boost/config.hpp"
1589 ***************
1590 *** 86,90 ****
1591 --- 91,99 ----
1592 } // namespace boost
1593
1594 #include "boost/type_traits/detail/type_trait_undef.hpp"
1595 +
1596 + #if defined _MSC_VER
1597 + #pragma warning(pop)
1598 + #endif
1599
1600 #endif // BOOST_TT_ADD_REFERENCE_HPP_INCLUDED
1601 *** misc/spirit-1.6.1/miniboost/boost/type_traits/is_base_and_derived.hpp Tue Jul 8 04:19:09 2003
1602 --- misc/build/spirit-1.6.1/miniboost/boost/type_traits/is_base_and_derived.hpp Wed Dec 5 10:08:58 2007
1603 ***************
1604 *** 10,15 ****
1605 --- 10,20 ----
1606 #ifndef BOOST_TT_IS_BASE_AND_DERIVED_HPP_INCLUDED
1607 #define BOOST_TT_IS_BASE_AND_DERIVED_HPP_INCLUDED
1608
1609 + #if defined _MSC_VER
1610 + #pragma warning(push)
1611 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
1612 + #endif
1613 +
1614 #include "boost/type_traits/is_class.hpp"
1615 #include "boost/type_traits/is_same.hpp"
1616 #include "boost/type_traits/is_convertible.hpp"
1617 ***************
1618 *** 203,207 ****
1619 --- 208,216 ----
1620 } // namespace boost
1621
1622 #include "boost/type_traits/detail/bool_trait_undef.hpp"
1623 +
1624 + #if defined _MSC_VER
1625 + #pragma warning(pop)
1626 + #endif
1627
1628 #endif // BOOST_TT_IS_BASE_AND_DERIVED_HPP_INCLUDED
1629 *** misc/spirit-1.6.1/miniboost/boost/type_traits/is_polymorphic.hpp Tue Jul 8 04:19:09 2003
1630 --- misc/build/spirit-1.6.1/miniboost/boost/type_traits/is_polymorphic.hpp Wed Dec 5 10:08:58 2007
1631 ***************
1632 *** 6,11 ****
1633 --- 6,16 ----
1634 #ifndef BOOST_TT_IS_POLYMORPHIC_HPP
1635 #define BOOST_TT_IS_POLYMORPHIC_HPP
1636
1637 + #if defined _MSC_VER
1638 + #pragma warning(push)
1639 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
1640 + #endif
1641 +
1642 #include <boost/type_traits/is_class.hpp>
1643 #include <boost/type_traits/remove_cv.hpp>
1644 // should be the last #include
1645 ***************
1646 *** 86,90 ****
1647 --- 91,99 ----
1648 } // namespace boost
1649
1650 #include "boost/type_traits/detail/bool_trait_undef.hpp"
1651 +
1652 + #if defined _MSC_VER
1653 + #pragma warning(pop)
1654 + #endif
1655
1656 #endif
1657 *** misc/spirit-1.6.1/miniboost/boost/type_traits/type_with_alignment.hpp Tue Jul 8 04:19:09 2003
1658 --- misc/build/spirit-1.6.1/miniboost/boost/type_traits/type_with_alignment.hpp Wed Dec 5 10:08:58 2007
1659 ***************
1660 *** 72,78 ****
1661 #undef BOOST_TT_CHOOSE_MIN_ALIGNMENT
1662 #undef BOOST_TT_CHOOSE_T
1663
1664 ! template<int TAlign, int Align>
1665 struct is_aligned
1666 {
1667 BOOST_STATIC_CONSTANT(bool,
1668 --- 72,78 ----
1669 #undef BOOST_TT_CHOOSE_MIN_ALIGNMENT
1670 #undef BOOST_TT_CHOOSE_T
1671
1672 ! template<std::size_t TAlign, std::size_t Align>
1673 struct is_aligned
1674 {
1675 BOOST_STATIC_CONSTANT(bool,
1676 ***************
1677 *** 93,99 ****
1678
1679 // This alignment method originally due to Brian Parker, implemented by David
1680 // Abrahams, and then ported here by Doug Gregor.
1681 ! template <int Align>
1682 class type_with_alignment
1683 {
1684 typedef detail::lower_alignment<Align> t1;
1685 --- 93,99 ----
1686
1687 // This alignment method originally due to Brian Parker, implemented by David
1688 // Abrahams, and then ported here by Doug Gregor.
1689 ! template <std::size_t Align>
1690 class type_with_alignment
1691 {
1692 typedef detail::lower_alignment<Align> t1;
1693 *** misc/spirit-1.6.1/miniboost/boost/utility/addressof.hpp Tue Jul 8 04:19:09 2003
1694 --- misc/build/spirit-1.6.1/miniboost/boost/utility/addressof.hpp Wed Dec 5 10:08:58 2007
1695 ***************
1696 *** 16,21 ****
1697 --- 16,26 ----
1698 #ifndef BOOST_UTILITY_ADDRESSOF_HPP
1699 # define BOOST_UTILITY_ADDRESSOF_HPP
1700
1701 + #if defined _MSC_VER
1702 + #pragma warning(push)
1703 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
1704 + #endif
1705 +
1706 # include <boost/config.hpp>
1707 # include <boost/detail/workaround.hpp>
1708 # if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
1709 ***************
1710 *** 39,43 ****
1711 --- 44,52 ----
1712 }
1713
1714 }
1715 +
1716 + #if defined _MSC_VER
1717 + #pragma warning(pop)
1718 + #endif
1719
1720 #endif // BOOST_UTILITY_ADDRESSOF_HPP
1721 *** misc/spirit-1.6.1/miniboost/boost/weak_ptr.hpp Tue Jul 8 04:19:08 2003
1722 --- misc/build/spirit-1.6.1/miniboost/boost/weak_ptr.hpp Wed Dec 5 10:08:58 2007
1723 ***************
1724 *** 16,26 ****
1725
1726 #include <boost/shared_ptr.hpp>
1727
1728 - #ifdef BOOST_MSVC // moved here to work around VC++ compiler crash
1729 - # pragma warning(push)
1730 - # pragma warning(disable:4284) // odd return type for operator->
1731 - #endif
1732 -
1733 namespace boost
1734 {
1735
1736 --- 16,21 ----
1737 ***************
1738 *** 185,193 ****
1739 }
1740
1741 } // namespace boost
1742 -
1743 - #ifdef BOOST_MSVC
1744 - # pragma warning(pop)
1745 - #endif
1746
1747 #endif // #ifndef BOOST_WEAK_PTR_HPP_INCLUDED
1748 --- 180,184 ----
vba interoperability for OOo