INTEGRATION: CWS obo21 (1.11.10); FILE MERGED

2007/12/05 09:47:39 obo 1.11.10.1: #i84233# change for .Net 2008

1 files changed, 331 insertions, 301 deletions

diff --git a/boost/spirit-1.6.1.patch b/boost/spirit-1.6.1.patch
index 372e8f890edc..66adf6ba1ab5 100644
--- a/boost/spirit-1.6.1.patch
+++ b/boost/spirit-1.6.1.patch
@@ -1,5 +1,5 @@
 *** misc/spirit-1.6.1/boost/spirit/core/composite/actions.hpp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/core/composite/actions.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/core/composite/actions.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 11,16 ****
 --- 11,21 ----
@@ -15,18 +15,19 @@
   #include <algorithm>
   
 ***************
-*** 346,349 ****
---- 351,358 ----
+*** 345,349 ****
+--- 350,358 ----
+      }
   
   }} // namespace boost::spirit
-  
++ 
 + #if defined _MSC_VER
 + #pragma warning(pop)
 + #endif
-+ 
+  
   #endif
 *** misc/spirit-1.6.1/boost/spirit/core/composite/composite.hpp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/core/composite/composite.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/core/composite/composite.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 65,75 ****
           unary(BaseT const& base)
@@ -53,7 +54,7 @@
           return_t
           subject() const
 *** misc/spirit-1.6.1/boost/spirit/core/composite/epsilon.hpp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/core/composite/epsilon.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/core/composite/epsilon.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 12,17 ****
 --- 12,22 ----
@@ -86,18 +87,19 @@
   inline condition_parser<CondT, false>
   operator~(condition_parser<CondT, true> const& p)
 ***************
-*** 288,291 ****
---- 293,300 ----
+*** 287,291 ****
+--- 292,300 ----
+  
   ///////////////////////////////////////////////////////////////////////////////
   }} // namespace boost::spirit
-  
++ 
 + #if defined _MSC_VER
 + #pragma warning(pop)
 + #endif
-+ 
+  
   #endif
 *** misc/spirit-1.6.1/boost/spirit/core/composite/impl/composite.ipp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/core/composite/impl/composite.ipp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/core/composite/impl/composite.ipp	Wed Dec  5 10:08:58 2007
 ***************
 *** 112,120 ****
               typedef typename base_t::return_t                   return_t;
@@ -162,7 +164,7 @@
               return_t
               right() const { return base_t::get(); }
 *** misc/spirit-1.6.1/boost/spirit/core/composite/impl/operators.ipp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/core/composite/impl/operators.ipp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/core/composite/impl/operators.ipp	Wed Dec  5 10:08:58 2007
 ***************
 *** 12,17 ****
 --- 12,21 ----
@@ -177,18 +179,19 @@
   namespace boost { namespace spirit {
   
 ***************
-*** 665,668 ****
---- 669,676 ----
+*** 664,668 ****
+--- 668,676 ----
+  
   ///////////////////////////////////////////////////////////////////////////////
   }} // namespace boost::spirit
-  
++ 
 + #if defined __SUNPRO_CC
 + #pragma enable_warn
 + #endif
-+ 
+  
   #endif
 *** misc/spirit-1.6.1/boost/spirit/core/impl/match.ipp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/core/impl/match.ipp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/core/impl/match.ipp	Wed Dec  5 10:08:58 2007
 ***************
 *** 154,167 ****
               { return nil_t(); }
@@ -221,7 +224,7 @@
       #else
       #define BOOST_SPIRIT_SAFE_BOOL(cond)  (cond)
 *** misc/spirit-1.6.1/boost/spirit/core/impl/parser.ipp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/core/impl/parser.ipp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/core/impl/parser.ipp	Wed Dec  5 10:08:58 2007
 ***************
 *** 11,16 ****
 --- 11,20 ----
@@ -236,19 +239,20 @@
   namespace boost { namespace spirit {
   
 ***************
-*** 52,56 ****
---- 56,64 ----
+*** 51,56 ****
+--- 55,64 ----
+      }
   
   }} // namespace boost::spirit
-  
++ 
 + #if defined __SUNPRO_CC
 + #pragma enable_warn
 + #endif
-+ 
+  
   #endif
   
 *** misc/spirit-1.6.1/boost/spirit/core/match.hpp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/core/match.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/core/match.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 60,70 ****
           : len(-1), val(impl::match_attr<T>::get_default()) {}
@@ -300,7 +304,7 @@
           operator impl::safe_bool() const
           { return BOOST_SPIRIT_SAFE_BOOL(len >= 0); }
 *** misc/spirit-1.6.1/boost/spirit/core/meta/impl/fundamental.ipp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/core/meta/impl/fundamental.ipp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/core/meta/impl/fundamental.ipp	Wed Dec  5 10:08:58 2007
 ***************
 *** 11,16 ****
 --- 11,20 ----
@@ -315,18 +319,19 @@
   namespace boost { namespace spirit {
   
 ***************
-*** 303,306 ****
---- 307,314 ----
+*** 302,306 ****
+--- 306,314 ----
+  
   ///////////////////////////////////////////////////////////////////////////////
   }} // namespace boost::spirit
-  
++ 
 + #if defined __SUNPRO_CC
 + #pragma enable_warn
 + #endif
-+ 
+  
   #endif // !defined(BOOST_SPIRIT_FUNDAMENTAL_IPP)
 *** misc/spirit-1.6.1/boost/spirit/core/non_terminal/impl/grammar.ipp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/core/non_terminal/impl/grammar.ipp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/core/non_terminal/impl/grammar.ipp	Wed Dec  5 10:08:58 2007
 ***************
 *** 243,249 ****
       //////////////////////////////////
@@ -351,7 +356,7 @@
   #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
           typedef impl::grammar_helper_base<GrammarT> helper_base_t;
 *** misc/spirit-1.6.1/boost/spirit/core/non_terminal/subrule.hpp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/core/non_terminal/subrule.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/core/non_terminal/subrule.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 228,234 ****
               subrule_list<
@@ -410,7 +415,7 @@
   
           template <typename ScannerT>
 *** misc/spirit-1.6.1/boost/spirit/core/scanner/impl/skipper.ipp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/core/scanner/impl/skipper.ipp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/core/scanner/impl/skipper.ipp	Wed Dec  5 10:08:58 2007
 ***************
 *** 11,16 ****
 --- 11,20 ----
@@ -425,19 +430,20 @@
   namespace boost { namespace spirit {
   
 ***************
-*** 176,180 ****
---- 180,188 ----
+*** 175,180 ****
+--- 179,188 ----
+  
   ///////////////////////////////////////////////////////////////////////////////
   }} // namespace boost::spirit
-  
++ 
 + #if defined __SUNPRO_CC
 + #pragma enable_warn
 + #endif
-+ 
+  
   #endif
   
 *** misc/spirit-1.6.1/boost/spirit/core/scanner/scanner.hpp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/core/scanner/scanner.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/core/scanner/scanner.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 18,23 ****
 --- 18,26 ----
@@ -518,7 +524,7 @@
       }
   
 *** misc/spirit-1.6.1/boost/spirit/error_handling/exceptions.hpp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/error_handling/exceptions.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/error_handling/exceptions.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 38,44 ****
   
@@ -577,7 +583,7 @@
           result_t    result;
           int         length;
 *** misc/spirit-1.6.1/boost/spirit/iterator/impl/file_iterator.ipp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/iterator/impl/file_iterator.ipp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/iterator/impl/file_iterator.ipp	Wed Dec  5 10:08:58 2007
 ***************
 *** 24,29 ****
 --- 24,33 ----
@@ -592,18 +598,19 @@
   #include <cassert>
   #include <fcntl.h>
 ***************
-*** 490,493 ****
---- 494,501 ----
+*** 489,493 ****
+--- 493,501 ----
+  
   ///////////////////////////////////////////////////////////////////////////////
   }} // namespace boost::spirit
-  
++ 
 + #if defined __SUNPRO_CC
 + #pragma enable_warn
 + #endif
-+ 
+  
   #endif // #if !defined FILE_ITERATOR_IPP
 *** misc/spirit-1.6.1/boost/spirit/iterator/multi_pass.hpp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/iterator/multi_pass.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/iterator/multi_pass.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 11,16 ****
 --- 11,21 ----
@@ -632,7 +639,7 @@
   #endif  // BOOST_SPIRIT_ITERATOR_MULTI_PASS_HPP
   
 *** misc/spirit-1.6.1/boost/spirit/utility/chset.hpp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/utility/chset.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/utility/chset.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 12,17 ****
 --- 12,22 ----
@@ -648,20 +655,20 @@
   #include <boost/shared_ptr.hpp>
   #include <boost/spirit/core/primitives/primitives.hpp>
 ***************
-*** 230,235 ****
---- 235,244 ----
+*** 229,234 ****
+--- 234,243 ----
+  
   ///////////////////////////////////////////////////////////////////////////////
   }} // namespace boost::spirit
-  
++ 
 + #if defined _MSC_VER
 + #pragma warning(pop)
 + #endif
-+ 
+  
   #endif
   
-  #include <boost/spirit/utility/impl/chset.ipp>
 *** misc/spirit-1.6.1/boost/spirit/utility/chset_operators.hpp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/utility/chset_operators.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/utility/chset_operators.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 12,17 ****
 --- 12,22 ----
@@ -677,7 +684,7 @@
   #include <boost/spirit/utility/chset.hpp>
   
 *** misc/spirit-1.6.1/boost/spirit/utility/confix.hpp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/utility/confix.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/utility/confix.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 389,395 ****
               as_parser<OpenT>::convert(open),
@@ -696,7 +703,7 @@
   ///////////////////////////////////////////////////////////////////////////////
   }} // namespace boost::spirit
 *** misc/spirit-1.6.1/boost/spirit/utility/functor_parser.hpp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/utility/functor_parser.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/utility/functor_parser.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 54,66 ****
               typedef typename ScannerT::iterator_t   iterator_t;
@@ -727,7 +734,7 @@
       };
   
 *** misc/spirit-1.6.1/boost/spirit/utility/impl/chset.ipp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/utility/impl/chset.ipp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/utility/impl/chset.ipp	Wed Dec  5 10:08:58 2007
 ***************
 *** 12,17 ****
 --- 12,22 ----
@@ -743,19 +750,20 @@
   #include <boost/limits.hpp>
   #include <boost/spirit/utility/chset.hpp>
 ***************
-*** 360,364 ****
---- 365,373 ----
+*** 359,364 ****
+--- 364,373 ----
+  
   ///////////////////////////////////////////////////////////////////////////////
   }} // namespace boost::spirit
-  
++ 
 + #if defined _MSC_VER
 + #pragma warning(pop)
 + #endif
-+ 
+  
   #endif
   
 *** misc/spirit-1.6.1/boost/spirit/utility/impl/chset_operators.ipp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/utility/impl/chset_operators.ipp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/utility/impl/chset_operators.ipp	Wed Dec  5 10:08:58 2007
 ***************
 *** 11,16 ****
 --- 11,21 ----
@@ -771,19 +779,20 @@
   #include <boost/limits.hpp>
   
 ***************
-*** 660,664 ****
---- 665,673 ----
+*** 659,664 ****
+--- 664,673 ----
+  
   ///////////////////////////////////////////////////////////////////////////////
   }} // namespace boost::spirit
-  
++ 
 + #if defined _MSC_VER
 + #pragma warning(pop)
 + #endif
-+ 
+  
   #endif
   
 *** misc/spirit-1.6.1/boost/spirit/utility/loops.hpp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/utility/loops.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/boost/spirit/utility/loops.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 47,54 ****
           typedef fixed_loop<ParserT, ExactT>     self_t;
@@ -803,8 +812,119 @@
   
           template <typename ScannerT>
           typename parser_result <self_t, ScannerT>::type
+*** misc/spirit-1.6.1/miniboost/boost/concept_check.hpp	Tue Jul  8 04:19:09 2003
+--- misc/build/spirit-1.6.1/miniboost/boost/concept_check.hpp	Wed Dec  5 10:08:58 2007
+***************
+*** 708,719 ****
+        function_requires< AssignableConcept<Container> >();
+        const_constraints(c);
+      }
+!     void const_constraints(const Container& c) {
+!       i = c.begin();
+!       i = c.end();
+!       n = c.size();
+!       n = c.max_size();
+!       b = c.empty();
+      }
+      Container c;
+      bool b;
+--- 708,719 ----
+        function_requires< AssignableConcept<Container> >();
+        const_constraints(c);
+      }
+!     void const_constraints(const Container& cnr) {
+!       i = cnr.begin();
+!       i = cnr.end();
+!       n = cnr.size();
+!       n = cnr.max_size();
+!       b = cnr.empty();
+      }
+      Container c;
+      bool b;
+***************
+*** 777,785 ****
+          BidirectionalIteratorConcept<const_reverse_iterator> >();
+        const_constraints(c);
+      }
+!     void const_constraints(const ReversibleContainer& c) {
+!       const_reverse_iterator i = c.rbegin();
+!       i = c.rend();
+      }
+      ReversibleContainer c;
+    };
+--- 777,785 ----
+          BidirectionalIteratorConcept<const_reverse_iterator> >();
+        const_constraints(c);
+      }
+!     void const_constraints(const ReversibleContainer& cnr) {
+!       const_reverse_iterator i = cnr.rbegin();
+!       i = cnr.rend();
+      }
+      ReversibleContainer c;
+    };
+***************
+*** 821,828 ****
+  
+        const_constraints(c);
+      }
+!     void const_constraints(const RandomAccessContainer& c) {
+!       const_reference r = c[n];
+        ignore_unused_variable_warning(r);
+      }
+      RandomAccessContainer c;
+--- 821,828 ----
+  
+        const_constraints(c);
+      }
+!     void const_constraints(const RandomAccessContainer& cnr) {
+!       const_reference r = cnr[n];
+        ignore_unused_variable_warning(r);
+      }
+      RandomAccessContainer c;
+***************
+*** 925,932 ****
+        reference r = c.back();
+        ignore_unused_variable_warning(r);
+      }
+!     void const_constraints(const BackInsertionSequence& c) {
+!       const_reference r = c.back();
+        ignore_unused_variable_warning(r);
+      };
+      BackInsertionSequence c;
+--- 925,932 ----
+        reference r = c.back();
+        ignore_unused_variable_warning(r);
+      }
+!     void const_constraints(const BackInsertionSequence& cnr) {
+!       const_reference r = cnr.back();
+        ignore_unused_variable_warning(r);
+      };
+      BackInsertionSequence c;
+***************
+*** 947,956 ****
+        c.erase(r.first, r.second);
+        const_constraints(c);
+      }
+!     void const_constraints(const AssociativeContainer& c) {
+!       ci = c.find(k);
+!       n = c.count(k);
+!       cr = c.equal_range(k);
+      }
+      typedef typename AssociativeContainer::iterator iterator;
+      typedef typename AssociativeContainer::const_iterator const_iterator;
+--- 947,956 ----
+        c.erase(r.first, r.second);
+        const_constraints(c);
+      }
+!     void const_constraints(const AssociativeContainer& cnr) {
+!       ci = cnr.find(k);
+!       n = cnr.count(k);
+!       cr = cnr.equal_range(k);
+      }
+      typedef typename AssociativeContainer::iterator iterator;
+      typedef typename AssociativeContainer::const_iterator const_iterator;
 *** misc/spirit-1.6.1/miniboost/boost/config/compiler/gcc.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/config/compiler/gcc.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/config/compiler/gcc.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 59,65 ****
   #endif
@@ -824,7 +944,7 @@
   #     error "Unknown compiler version - please run the configure tests and report the results"
   #  else
 *** misc/spirit-1.6.1/miniboost/boost/config/compiler/sunpro_cc.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/config/compiler/sunpro_cc.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/config/compiler/sunpro_cc.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 45,52 ****
   #      define BOOST_NO_INTEGRAL_INT64_T
@@ -850,7 +970,7 @@
   
   #define BOOST_COMPILER "Sun compiler version " BOOST_STRINGIZE(__SUNPRO_CC)
 *** misc/spirit-1.6.1/miniboost/boost/config/compiler/visualc.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/config/compiler/visualc.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/config/compiler/visualc.hpp	Wed Dec  5 10:12:34 2007
 ***************
 *** 65,75 ****
   #  define BOOST_NO_INTRINSIC_WCHAR_T
@@ -888,7 +1008,7 @@
   #   define BOOST_COMPILER_VERSION _MSC_VER
   # endif
 ***************
-*** 108,114 ****
+*** 108,121 ****
   #endif
   //
   // last known and checked version is 1310:
@@ -896,23 +1016,29 @@
   #  if defined(BOOST_ASSERT_CONFIG)
   #     error "Unknown compiler version - please run the configure tests and report the results"
   #  else
---- 110,116 ----
+  #     pragma message("Unknown compiler version - please run the configure tests and report the results")
+  #  endif
+  #endif
+- 
+  
+  
+  
+--- 110,122 ----
   #endif
   //
   // last known and checked version is 1310:
-! #if (_MSC_VER > 1410)
+! #if (_MSC_VER > 1500)
   #  if defined(BOOST_ASSERT_CONFIG)
   #     error "Unknown compiler version - please run the configure tests and report the results"
   #  else
-***************
-*** 120,123 ****
+  #     pragma message("Unknown compiler version - please run the configure tests and report the results")
+  #  endif
+  #endif
   
   
   
-- 
---- 122,124 ----
 *** misc/spirit-1.6.1/miniboost/boost/config/platform/macos.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/config/platform/macos.hpp	Wed Jun  6 20:05:13 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/config/platform/macos.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 19,27 ****
   #    define BOOST_HAS_UNISTD_H
@@ -936,7 +1062,7 @@
   #     define BOOST_HAS_STDINT_H
   #  endif
 *** misc/spirit-1.6.1/miniboost/boost/config/platform/win32.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/config/platform/win32.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/config/platform/win32.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 40,45 ****
 --- 40,46 ----
@@ -955,7 +1081,7 @@
   #     endif
 + #endif
 *** misc/spirit-1.6.1/miniboost/boost/config/user.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/config/user.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/config/user.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 66,68 ****
 --- 66,74 ----
@@ -969,7 +1095,7 @@
 + #endif
 + 
 *** misc/spirit-1.6.1/miniboost/boost/iterator_adaptors.hpp	Tue Jul  8 04:19:09 2003
---- misc/build/spirit-1.6.1/miniboost/boost/iterator_adaptors.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/iterator_adaptors.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 119,124 ****
 --- 119,129 ----
@@ -1031,7 +1157,7 @@
   #endif
   
 *** misc/spirit-1.6.1/miniboost/boost/mpl/aux_/ice_cast.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/mpl/aux_/ice_cast.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/mpl/aux_/ice_cast.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 17,22 ****
 --- 17,27 ----
@@ -1047,18 +1173,20 @@
   
   #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) \
 ***************
-*** 28,31 ****
---- 33,40 ----
+*** 26,31 ****
+--- 31,40 ----
+  #   define BOOST_MPL_AUX_ICE_CAST(T, expr) (T)(expr)
+  #else
   #   define BOOST_MPL_AUX_ICE_CAST(T, expr) static_cast<T>(expr)
-  #endif
-  
-+ #if defined _MSC_VER
-+ #pragma warning(pop)
 + #endif
 + 
++ #if defined _MSC_VER
++ #pragma warning(pop)
+  #endif
+  
   #endif // BOOST_MPL_AUX_ICE_CAST_HPP_INCLUDED
 *** misc/spirit-1.6.1/miniboost/boost/mpl/aux_/integral_wrapper.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/mpl/aux_/integral_wrapper.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/mpl/aux_/integral_wrapper.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 17,22 ****
 --- 17,27 ----
@@ -1084,7 +1212,7 @@
 + #pragma warning(pop)
 + #endif
 *** misc/spirit-1.6.1/miniboost/boost/mpl/aux_/lambda_support.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/mpl/aux_/lambda_support.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/mpl/aux_/lambda_support.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 17,22 ****
 --- 17,27 ----
@@ -1100,18 +1228,19 @@
   
   #if !defined(BOOST_MPL_NO_FULL_LAMBDA_SUPPORT)
 ***************
-*** 133,136 ****
---- 138,145 ----
+*** 132,136 ****
+--- 137,145 ----
+  #endif // __EDG_VERSION__
   
   #endif // BOOST_MPL_NO_FULL_LAMBDA_SUPPORT
-  
++ 
 + #if defined _MSC_VER
 + #pragma warning(pop)
 + #endif
-+ 
+  
   #endif // BOOST_MPL_AUX_LAMBDA_SUPPORT_HPP_INCLUDED
 *** misc/spirit-1.6.1/miniboost/boost/mpl/aux_/logical_op.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/mpl/aux_/logical_op.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/mpl/aux_/logical_op.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 17,22 ****
 --- 17,27 ----
@@ -1137,7 +1266,7 @@
 + #pragma warning(pop)
 + #endif
 *** misc/spirit-1.6.1/miniboost/boost/mpl/if.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/mpl/if.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/mpl/if.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 17,22 ****
 --- 17,27 ----
@@ -1153,18 +1282,19 @@
   #include "boost/mpl/aux_/ice_cast.hpp"
   #include "boost/mpl/aux_/void_spec.hpp"
 ***************
-*** 174,177 ****
---- 179,186 ----
+*** 173,177 ****
+--- 178,186 ----
+  
   } // namespace mpl
   } // namespace boost
-  
++ 
 + #if defined _MSC_VER
 + #pragma warning(pop)
 + #endif
-+ 
+  
   #endif // BOOST_MPL_IF_HPP_INCLUDED
 *** misc/spirit-1.6.1/miniboost/boost/mpl/integral_c.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/mpl/integral_c.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/mpl/integral_c.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 18,23 ****
 --- 18,28 ----
@@ -1180,18 +1310,20 @@
   #include "boost/mpl/aux_/ice_cast.hpp"
   #include "boost/mpl/aux_/config/ctps.hpp"
 ***************
-*** 50,53 ****
---- 55,62 ----
+*** 48,53 ****
+--- 53,62 ----
+      operator bool() const { return this->value; }
+  };
   }}
-  #endif
-  
-+ #if defined _MSC_VER
-+ #pragma warning(pop)
 + #endif
 + 
++ #if defined _MSC_VER
++ #pragma warning(pop)
+  #endif
+  
   #endif // BOOST_MPL_INTEGRAL_C_HPP_INCLUDED
 *** misc/spirit-1.6.1/miniboost/boost/mpl/integral_c_fwd.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/mpl/integral_c_fwd.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/mpl/integral_c_fwd.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 18,23 ****
 --- 18,28 ----
@@ -1207,18 +1339,19 @@
   
   namespace boost { namespace mpl {
 ***************
-*** 29,32 ****
---- 34,41 ----
+*** 28,32 ****
+--- 33,41 ----
+  template< typename T, T N > struct integral_c;
   #endif
   }}
-  
++ 
 + #if defined _MSC_VER
 + #pragma warning(pop)
 + #endif
-+ 
+  
   #endif // BOOST_MPL_INTEGRAL_C_FWD_HPP_INCLUDED
 *** misc/spirit-1.6.1/miniboost/boost/mpl/is_sequence.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/mpl/is_sequence.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/mpl/is_sequence.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 17,22 ****
 --- 17,27 ----
@@ -1234,18 +1367,19 @@
   #include "boost/mpl/or.hpp"
   #include "boost/mpl/begin_end.hpp"
 ***************
-*** 98,101 ****
---- 103,110 ----
+*** 97,101 ****
+--- 102,110 ----
+  BOOST_MPL_AUX_VOID_SPEC(1, is_sequence)
   
   }} // namespace boost::mpl
-  
++ 
 + #if defined _MSC_VER
 + #pragma warning(pop)
 + #endif
-+ 
+  
   #endif // BOOST_MPL_IS_SEQUENCE_HPP_INCLUDED
 *** misc/spirit-1.6.1/miniboost/boost/mpl/sequence_tag.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/mpl/sequence_tag.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/mpl/sequence_tag.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 17,22 ****
 --- 17,27 ----
@@ -1261,18 +1395,19 @@
   #include "boost/mpl/aux_/has_tag.hpp"
   #include "boost/mpl/aux_/has_begin.hpp"
 ***************
-*** 130,133 ****
---- 135,142 ----
+*** 129,133 ****
+--- 134,142 ----
+  BOOST_MPL_AUX_VOID_SPEC(1, sequence_tag)
   
   }} // namespace boost::mpl
-  
++ 
 + #if defined _MSC_VER
 + #pragma warning(pop)
 + #endif
-+ 
+  
   #endif // BOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED
 *** misc/spirit-1.6.1/miniboost/boost/optional.hpp	Tue Jul  8 04:19:09 2003
---- misc/build/spirit-1.6.1/miniboost/boost/optional.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/optional.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 17,22 ****
 --- 17,27 ----
@@ -1302,19 +1437,20 @@
          // This is provided for those compilers which don't like the conversion to bool
          // on some contexts.
 ***************
-*** 313,317 ****
---- 322,330 ----
+*** 312,317 ****
+--- 321,330 ----
   
-  } // namespace boost
   
+  } // namespace boost
++ 
 + #if defined _MSC_VER
 + #pragma warning(pop)
 + #endif
-+ 
+  
   #endif
   
 *** misc/spirit-1.6.1/miniboost/boost/scoped_array.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/scoped_array.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/scoped_array.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 83,94 ****
 --- 83,98 ----
@@ -1335,7 +1471,7 @@
       bool operator! () const // never throws
       {
 *** misc/spirit-1.6.1/miniboost/boost/scoped_ptr.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/scoped_ptr.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/scoped_ptr.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 102,113 ****
 --- 102,117 ----
@@ -1356,7 +1492,7 @@
       bool operator! () const // never throws
       {
 *** misc/spirit-1.6.1/miniboost/boost/shared_array.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/shared_array.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/shared_array.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 94,105 ****
 --- 94,109 ----
@@ -1377,7 +1513,7 @@
       bool operator! () const // never throws
       {
 *** misc/spirit-1.6.1/miniboost/boost/shared_ptr.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/shared_ptr.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/shared_ptr.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 35,41 ****
   
@@ -1415,7 +1551,7 @@
       // operator! is redundant, but some compilers need it
   
 *** misc/spirit-1.6.1/miniboost/boost/throw_exception.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/throw_exception.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/throw_exception.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 29,35 ****
   
@@ -1435,7 +1571,7 @@
   #else
   
 *** misc/spirit-1.6.1/miniboost/boost/type_traits/add_reference.hpp	Tue Jul  8 04:19:09 2003
---- misc/build/spirit-1.6.1/miniboost/boost/type_traits/add_reference.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/type_traits/add_reference.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 10,15 ****
 --- 10,20 ----
@@ -1451,18 +1587,19 @@
   #include "boost/detail/workaround.hpp"
   #include "boost/config.hpp"
 ***************
-*** 87,90 ****
---- 92,99 ----
+*** 86,90 ****
+--- 91,99 ----
+  } // namespace boost
   
   #include "boost/type_traits/detail/type_trait_undef.hpp"
-  
++ 
 + #if defined _MSC_VER
 + #pragma warning(pop)
 + #endif
-+ 
+  
   #endif // BOOST_TT_ADD_REFERENCE_HPP_INCLUDED
 *** misc/spirit-1.6.1/miniboost/boost/type_traits/is_base_and_derived.hpp	Tue Jul  8 04:19:09 2003
---- misc/build/spirit-1.6.1/miniboost/boost/type_traits/is_base_and_derived.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/type_traits/is_base_and_derived.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 10,15 ****
 --- 10,20 ----
@@ -1478,18 +1615,19 @@
   #include "boost/type_traits/is_same.hpp"
   #include "boost/type_traits/is_convertible.hpp"
 ***************
-*** 204,207 ****
---- 209,216 ----
+*** 203,207 ****
+--- 208,216 ----
+  } // namespace boost
   
   #include "boost/type_traits/detail/bool_trait_undef.hpp"
-  
++ 
 + #if defined _MSC_VER
 + #pragma warning(pop)
 + #endif
-+ 
+  
   #endif // BOOST_TT_IS_BASE_AND_DERIVED_HPP_INCLUDED
 *** misc/spirit-1.6.1/miniboost/boost/type_traits/is_polymorphic.hpp	Tue Jul  8 04:19:09 2003
---- misc/build/spirit-1.6.1/miniboost/boost/type_traits/is_polymorphic.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/type_traits/is_polymorphic.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 6,11 ****
 --- 6,16 ----
@@ -1505,18 +1643,55 @@
   #include <boost/type_traits/remove_cv.hpp>
   // should be the last #include
 ***************
-*** 87,90 ****
---- 92,99 ----
+*** 86,90 ****
+--- 91,99 ----
+  } // namespace boost
   
   #include "boost/type_traits/detail/bool_trait_undef.hpp"
-  
++ 
 + #if defined _MSC_VER
 + #pragma warning(pop)
 + #endif
-+ 
+  
   #endif
+*** misc/spirit-1.6.1/miniboost/boost/type_traits/type_with_alignment.hpp	Tue Jul  8 04:19:09 2003
+--- misc/build/spirit-1.6.1/miniboost/boost/type_traits/type_with_alignment.hpp	Wed Dec  5 10:08:58 2007
+***************
+*** 72,78 ****
+  #undef BOOST_TT_CHOOSE_MIN_ALIGNMENT
+  #undef BOOST_TT_CHOOSE_T
+  
+! template<int TAlign, int Align>
+  struct is_aligned
+  {
+      BOOST_STATIC_CONSTANT(bool,
+--- 72,78 ----
+  #undef BOOST_TT_CHOOSE_MIN_ALIGNMENT
+  #undef BOOST_TT_CHOOSE_T
+  
+! template<std::size_t TAlign, std::size_t Align>
+  struct is_aligned
+  {
+      BOOST_STATIC_CONSTANT(bool,
+***************
+*** 93,99 ****
+  
+  // This alignment method originally due to Brian Parker, implemented by David
+  // Abrahams, and then ported here by Doug Gregor. 
+! template <int Align>
+  class type_with_alignment
+  {
+      typedef detail::lower_alignment<Align> t1;
+--- 93,99 ----
+  
+  // This alignment method originally due to Brian Parker, implemented by David
+  // Abrahams, and then ported here by Doug Gregor. 
+! template <std::size_t Align>
+  class type_with_alignment
+  {
+      typedef detail::lower_alignment<Align> t1;
 *** misc/spirit-1.6.1/miniboost/boost/utility/addressof.hpp	Tue Jul  8 04:19:09 2003
---- misc/build/spirit-1.6.1/miniboost/boost/utility/addressof.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/utility/addressof.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 16,21 ****
 --- 16,26 ----
@@ -1532,18 +1707,19 @@
   # include <boost/detail/workaround.hpp>
   # if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
 ***************
-*** 40,43 ****
---- 45,52 ----
-  
+*** 39,43 ****
+--- 44,52 ----
   }
   
+  }
++ 
 + #if defined _MSC_VER
 + #pragma warning(pop)
 + #endif
-+ 
+  
   #endif // BOOST_UTILITY_ADDRESSOF_HPP
 *** misc/spirit-1.6.1/miniboost/boost/weak_ptr.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/weak_ptr.hpp	Wed Jun  6 20:04:00 2007
+--- misc/build/spirit-1.6.1/miniboost/boost/weak_ptr.hpp	Wed Dec  5 10:08:58 2007
 ***************
 *** 16,26 ****
   
@@ -1559,160 +1735,14 @@
   
 --- 16,21 ----
 ***************
-*** 186,193 ****
+*** 185,193 ****
+  }
   
   } // namespace boost
-  
+- 
 - #ifdef BOOST_MSVC
 - # pragma warning(pop)
 - #endif    
-- 
-  #endif  // #ifndef BOOST_WEAK_PTR_HPP_INCLUDED
---- 181,184 ----
-*** misc/spirit-1.6.1/miniboost/boost/concept_check.hpp	2007-05-20 07:38:14.000000000 -0400
---- misc/build/spirit-1.6.1/miniboost/boost/concept_check.hpp	2007-05-20 07:52:59.000000000 -0400
-***************
-*** 708,719 ****
-        function_requires< AssignableConcept<Container> >();
-        const_constraints(c);
-      }
-!     void const_constraints(const Container& c) {
-!       i = c.begin();
-!       i = c.end();
-!       n = c.size();
-!       n = c.max_size();
-!       b = c.empty();
-      }
-      Container c;
-      bool b;
---- 708,719 ----
-        function_requires< AssignableConcept<Container> >();
-        const_constraints(c);
-      }
-!     void const_constraints(const Container& cnr) {
-!       i = cnr.begin();
-!       i = cnr.end();
-!       n = cnr.size();
-!       n = cnr.max_size();
-!       b = cnr.empty();
-      }
-      Container c;
-      bool b;
-***************
-*** 777,785 ****
-          BidirectionalIteratorConcept<const_reverse_iterator> >();
-        const_constraints(c);
-      }
-!     void const_constraints(const ReversibleContainer& c) {
-!       const_reverse_iterator i = c.rbegin();
-!       i = c.rend();
-      }
-      ReversibleContainer c;
-    };
---- 777,785 ----
-          BidirectionalIteratorConcept<const_reverse_iterator> >();
-        const_constraints(c);
-      }
-!     void const_constraints(const ReversibleContainer& cnr) {
-!       const_reverse_iterator i = cnr.rbegin();
-!       i = cnr.rend();
-      }
-      ReversibleContainer c;
-    };
-***************
-*** 821,828 ****
-  
-        const_constraints(c);
-      }
-!     void const_constraints(const RandomAccessContainer& c) {
-!       const_reference r = c[n];
-        ignore_unused_variable_warning(r);
-      }
-      RandomAccessContainer c;
---- 821,828 ----
   
-        const_constraints(c);
-      }
-!     void const_constraints(const RandomAccessContainer& cnr) {
-!       const_reference r = cnr[n];
-        ignore_unused_variable_warning(r);
-      }
-      RandomAccessContainer c;
-***************
-*** 925,932 ****
-        reference r = c.back();
-        ignore_unused_variable_warning(r);
-      }
-!     void const_constraints(const BackInsertionSequence& c) {
-!       const_reference r = c.back();
-        ignore_unused_variable_warning(r);
-      };
-      BackInsertionSequence c;
---- 925,932 ----
-        reference r = c.back();
-        ignore_unused_variable_warning(r);
-      }
-!     void const_constraints(const BackInsertionSequence& cnr) {
-!       const_reference r = cnr.back();
-        ignore_unused_variable_warning(r);
-      };
-      BackInsertionSequence c;
-***************
-*** 947,956 ****
-        c.erase(r.first, r.second);
-        const_constraints(c);
-      }
-!     void const_constraints(const AssociativeContainer& c) {
-!       ci = c.find(k);
-!       n = c.count(k);
-!       cr = c.equal_range(k);
-      }
-      typedef typename AssociativeContainer::iterator iterator;
-      typedef typename AssociativeContainer::const_iterator const_iterator;
---- 947,956 ----
-        c.erase(r.first, r.second);
-        const_constraints(c);
-      }
-!     void const_constraints(const AssociativeContainer& cnr) {
-!       ci = cnr.find(k);
-!       n = cnr.count(k);
-!       cr = cnr.equal_range(k);
-      }
-      typedef typename AssociativeContainer::iterator iterator;
-      typedef typename AssociativeContainer::const_iterator const_iterator;
-*** misc/spirit-1.6.1/miniboost/boost/type_traits/type_with_alignment.hpp	Wed May 23 19:45:34 2007
---- misc/build/spirit-1.6.1/miniboost/boost/type_traits/type_with_alignment.hpp	Wed May 23 19:47:00 2007
-***************
-*** 72,78 ****
-  #undef BOOST_TT_CHOOSE_MIN_ALIGNMENT
-  #undef BOOST_TT_CHOOSE_T
-  
-! template<int TAlign, int Align>
-  struct is_aligned
-  {
-      BOOST_STATIC_CONSTANT(bool,
---- 72,78 ----
-  #undef BOOST_TT_CHOOSE_MIN_ALIGNMENT
-  #undef BOOST_TT_CHOOSE_T
-  
-! template<std::size_t TAlign, std::size_t Align>
-  struct is_aligned
-  {
-      BOOST_STATIC_CONSTANT(bool,
-***************
-*** 93,99 ****
-  
-  // This alignment method originally due to Brian Parker, implemented by David
-  // Abrahams, and then ported here by Doug Gregor. 
-! template <int Align>
-  class type_with_alignment
-  {
-      typedef detail::lower_alignment<Align> t1;
---- 93,99 ----
-  
-  // This alignment method originally due to Brian Parker, implemented by David
-  // Abrahams, and then ported here by Doug Gregor. 
-! template <std::size_t Align>
-  class type_with_alignment
-  {
-      typedef detail::lower_alignment<Align> t1;
+  #endif  // #ifndef BOOST_WEAK_PTR_HPP_INCLUDED
+--- 180,184 ----