INTEGRATION: CWS pj81 (1.7.18); FILE MERGED

2007/06/10 13:23:41 pjanik 1.7.18.1: #i72248# prevent inconsistent builds for TARGET_CARBON platforms
Patch from hdu, moved from aquavcl01.

1 files changed, 570 insertions, 565 deletions

diff --git a/boost/spirit-1.6.1.patch b/boost/spirit-1.6.1.patch
index f2320eec4a05..ec412f3b41fc 100644
--- a/boost/spirit-1.6.1.patch
+++ b/boost/spirit-1.6.1.patch
@@ -1,57 +1,5 @@
-*** 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	Thu Oct 12 17:51:27 2006
-***************
-*** 60,70 ****
-          : len(-1), val(impl::match_attr<T>::get_default()) {}
-  
-          explicit
-!         match(unsigned length)
-!         : len(length), val((impl::match_attr<T>::get_default())) {}
-  
-!         match(unsigned length, param_type val_)
-!         : len(length), val(val_) {}
-  
-          operator impl::safe_bool() const
-          { return BOOST_SPIRIT_SAFE_BOOL(len >= 0); }
---- 60,70 ----
-          : len(-1), val(impl::match_attr<T>::get_default()) {}
-  
-          explicit
-!         match(unsigned _length)
-!         : len(_length), val((impl::match_attr<T>::get_default())) {}
-  
-!         match(unsigned _length, param_type val_)
-!         : len(_length), val(val_) {}
-  
-          operator impl::safe_bool() const
-          { return BOOST_SPIRIT_SAFE_BOOL(len >= 0); }
-***************
-*** 120,130 ****
-          : len(-1) {}
-  
-          explicit
-!         match(unsigned length)
-!         : len(length) {}
-  
-!         match(unsigned length, nil_t)
-!         : len(length) {}
-  
-          operator impl::safe_bool() const
-          { return BOOST_SPIRIT_SAFE_BOOL(len >= 0); }
---- 120,130 ----
-          : len(-1) {}
-  
-          explicit
-!         match(unsigned _length)
-!         : len(_length) {}
-  
-!         match(unsigned _length, nil_t)
-!         : len(_length) {}
-  
-          operator impl::safe_bool() const
-          { return BOOST_SPIRIT_SAFE_BOOL(len >= 0); }
 *** 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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/boost/spirit/core/composite/actions.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 11,16 ****
 --- 11,21 ----
@@ -74,11 +22,11 @@
   
 + #if defined _MSC_VER
 + #pragma warning(pop)
-  #endif
-+ 
 + #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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/boost/spirit/core/composite/composite.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 65,75 ****
           unary(BaseT const& base)
@@ -105,7 +53,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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/boost/spirit/core/composite/epsilon.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 12,17 ****
 --- 12,22 ----
@@ -145,11 +93,11 @@
   
 + #if defined _MSC_VER
 + #pragma warning(pop)
-  #endif
-+ 
 + #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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/boost/spirit/core/composite/impl/composite.ipp	Wed Jun  6 20:04:00 2007
 ***************
 *** 112,120 ****
               typedef typename base_t::return_t                   return_t;
@@ -214,7 +162,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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/boost/spirit/core/composite/impl/operators.ipp	Wed Jun  6 20:04:00 2007
 ***************
 *** 12,17 ****
 --- 12,21 ----
@@ -236,13 +184,13 @@
   
 + #if defined __SUNPRO_CC
 + #pragma enable_warn
-  #endif
-+ 
 + #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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/boost/spirit/core/impl/match.ipp	Wed Jun  6 20:04:00 2007
 ***************
-*** 154,160 ****
+*** 154,167 ****
               { return nil_t(); }
           };
   
@@ -250,16 +198,6 @@
           struct dummy { void nonnull() {}; };
           typedef void (dummy::*safe_bool)();
       #else
---- 154,160 ----
-              { return nil_t(); }
-          };
-  
-!     #if !defined(__BORLANDC__) && !defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
-          struct dummy { void nonnull() {}; };
-          typedef void (dummy::*safe_bool)();
-      #else
-***************
-*** 161,167 ****
           typedef bool safe_bool;
       #endif
   
@@ -267,7 +205,14 @@
       #define BOOST_SPIRIT_SAFE_BOOL(cond)  ((cond) ? &impl::dummy::nonnull : 0)
       #else
       #define BOOST_SPIRIT_SAFE_BOOL(cond)  (cond)
---- 161,167 ----
+--- 154,167 ----
+              { return nil_t(); }
+          };
+  
+!     #if !defined(__BORLANDC__) && !defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
+          struct dummy { void nonnull() {}; };
+          typedef void (dummy::*safe_bool)();
+      #else
           typedef bool safe_bool;
       #endif
   
@@ -276,7 +221,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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/boost/spirit/core/impl/parser.ipp	Wed Jun  6 20:04:00 2007
 ***************
 *** 11,16 ****
 --- 11,20 ----
@@ -298,12 +243,64 @@
   
 + #if defined __SUNPRO_CC
 + #pragma enable_warn
-  #endif
-+ 
 + #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
+***************
+*** 60,70 ****
+          : len(-1), val(impl::match_attr<T>::get_default()) {}
+  
+          explicit
+!         match(unsigned length)
+!         : len(length), val((impl::match_attr<T>::get_default())) {}
+  
+!         match(unsigned length, param_type val_)
+!         : len(length), val(val_) {}
+  
+          operator impl::safe_bool() const
+          { return BOOST_SPIRIT_SAFE_BOOL(len >= 0); }
+--- 60,70 ----
+          : len(-1), val(impl::match_attr<T>::get_default()) {}
+  
+          explicit
+!         match(unsigned _length)
+!         : len(_length), val((impl::match_attr<T>::get_default())) {}
+  
+!         match(unsigned _length, param_type val_)
+!         : len(_length), val(val_) {}
+  
+          operator impl::safe_bool() const
+          { return BOOST_SPIRIT_SAFE_BOOL(len >= 0); }
+***************
+*** 120,130 ****
+          : len(-1) {}
+  
+          explicit
+!         match(unsigned length)
+!         : len(length) {}
+  
+!         match(unsigned length, nil_t)
+!         : len(length) {}
+  
+          operator impl::safe_bool() const
+          { return BOOST_SPIRIT_SAFE_BOOL(len >= 0); }
+--- 120,130 ----
+          : len(-1) {}
+  
+          explicit
+!         match(unsigned _length)
+!         : len(_length) {}
+  
+!         match(unsigned _length, nil_t)
+!         : len(_length) {}
   
+          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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/boost/spirit/core/meta/impl/fundamental.ipp	Wed Jun  6 20:04:00 2007
 ***************
 *** 11,16 ****
 --- 11,20 ----
@@ -328,8 +325,33 @@
 + #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
+***************
+*** 243,249 ****
+      //////////////////////////////////
+      template<typename GrammarT>
+      inline void
+!     grammar_destruct(GrammarT* self)
+      {
+  #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
+          typedef impl::grammar_helper_base<GrammarT> helper_base_t;
+--- 243,255 ----
+      //////////////////////////////////
+      template<typename GrammarT>
+      inline void
+!     grammar_destruct(GrammarT*
+! #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
+! # if !defined(__GNUC__) || (__GNUC__ > 2)
+! self
+! #endif
+! #endif
+! 	)
+      {
+  #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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/boost/spirit/core/non_terminal/subrule.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 228,234 ****
               subrule_list<
@@ -387,33 +409,35 @@
           }
   
           template <typename ScannerT>
-*** 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	Thu Oct 12 17:51:28 2006
+*** 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
 ***************
-*** 243,249 ****
-      //////////////////////////////////
-      template<typename GrammarT>
-      inline void
-!     grammar_destruct(GrammarT* self)
-      {
-  #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
-          typedef impl::grammar_helper_base<GrammarT> helper_base_t;
---- 243,255 ----
-      //////////////////////////////////
-      template<typename GrammarT>
-      inline void
-!     grammar_destruct(GrammarT*
-! #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
-! # if !defined(__GNUC__) || (__GNUC__ > 2)
-! self
-! #endif
-! #endif
-! 	)
-      {
-  #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
-          typedef impl::grammar_helper_base<GrammarT> helper_base_t;
+*** 11,16 ****
+--- 11,20 ----
+  #if !defined(BOOST_SPIRIT_SKIPPER_IPP)
+  #define BOOST_SPIRIT_SKIPPER_IPP
+  
++ #if defined __SUNPRO_CC
++ #pragma disable_warn
++ #endif
++ 
+  ///////////////////////////////////////////////////////////////////////////////
+  namespace boost { namespace spirit {
+  
+***************
+*** 176,180 ****
+--- 180,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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/boost/spirit/core/scanner/scanner.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 18,23 ****
 --- 18,26 ----
@@ -493,35 +517,8 @@
           return *this;
       }
   
-*** 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	Thu Oct 12 17:51:28 2006
-***************
-*** 11,16 ****
---- 11,20 ----
-  #if !defined(BOOST_SPIRIT_SKIPPER_IPP)
-  #define BOOST_SPIRIT_SKIPPER_IPP
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-+ 
-  ///////////////////////////////////////////////////////////////////////////////
-  namespace boost { namespace spirit {
-  
-***************
-*** 176,180 ****
---- 180,188 ----
-  ///////////////////////////////////////////////////////////////////////////////
-  }} // namespace boost::spirit
-  
-+ #if defined __SUNPRO_CC
-+ #pragma enable_warn
-  #endif
-+ 
-+ #endif
-  
 *** 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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/boost/spirit/error_handling/exceptions.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 38,44 ****
   
@@ -579,8 +576,34 @@
   
           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
+***************
+*** 24,29 ****
+--- 24,33 ----
+  #if !defined FILE_ITERATOR_IPP
+  #define      FILE_ITERATOR_IPP
+  
++ #if defined __SUNPRO_CC
++ #pragma disable_warn
++ #endif
++ 
+  ///////////////////////////////////////////////////////////////////////////////
+  #include <cassert>
+  #include <fcntl.h>
+***************
+*** 490,493 ****
+--- 494,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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/boost/spirit/iterator/multi_pass.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 11,16 ****
 --- 11,21 ----
@@ -608,34 +631,8 @@
 + 
   #endif  // BOOST_SPIRIT_ITERATOR_MULTI_PASS_HPP
   
-*** 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	Thu Oct 12 17:51:28 2006
-***************
-*** 24,29 ****
---- 24,33 ----
-  #if !defined FILE_ITERATOR_IPP
-  #define      FILE_ITERATOR_IPP
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-+ 
-  ///////////////////////////////////////////////////////////////////////////////
-  #include <cassert>
-  #include <fcntl.h>
-***************
-*** 490,493 ****
---- 494,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/utility/chset.hpp	Tue Jul  8 04:19:06 2003
---- misc/build/spirit-1.6.1/boost/spirit/utility/chset.hpp	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/boost/spirit/utility/chset.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 12,17 ****
 --- 12,22 ----
@@ -651,21 +648,20 @@
   #include <boost/shared_ptr.hpp>
   #include <boost/spirit/core/primitives/primitives.hpp>
 ***************
-*** 230,236 ****
---- 235,245 ----
+*** 230,235 ****
+--- 235,244 ----
   ///////////////////////////////////////////////////////////////////////////////
   }} // namespace boost::spirit
   
 + #if defined _MSC_VER
 + #pragma warning(pop)
-  #endif
-+ 
 + #endif
++ 
+  #endif
   
   #include <boost/spirit/utility/impl/chset.ipp>
-  #include <boost/spirit/utility/chset_operators.hpp>
 *** 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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/boost/spirit/utility/chset_operators.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 12,17 ****
 --- 12,22 ----
@@ -681,7 +677,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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/boost/spirit/utility/confix.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 389,395 ****
               as_parser<OpenT>::convert(open),
@@ -700,7 +696,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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/boost/spirit/utility/functor_parser.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 54,66 ****
               typedef typename ScannerT::iterator_t   iterator_t;
@@ -730,29 +726,8 @@
           }
       };
   
-*** 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	Thu Oct 12 17:51:28 2006
-***************
-*** 47,54 ****
-          typedef fixed_loop<ParserT, ExactT>     self_t;
-          typedef unary<ParserT, parser<self_t> >  base_t;
-  
-!         fixed_loop (ParserT const & subject, ExactT const & exact)
-!         : base_t(subject), m_exact(exact) {}
-  
-          template <typename ScannerT>
-          typename parser_result <self_t, ScannerT>::type
---- 47,54 ----
-          typedef fixed_loop<ParserT, ExactT>     self_t;
-          typedef unary<ParserT, parser<self_t> >  base_t;
-  
-!         fixed_loop (ParserT const & subject_, ExactT const & exact_)
-!         : base_t(subject_), m_exact(exact_) {}
-  
-          template <typename ScannerT>
-          typename parser_result <self_t, ScannerT>::type
 *** 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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/boost/spirit/utility/impl/chset.ipp	Wed Jun  6 20:04:00 2007
 ***************
 *** 12,17 ****
 --- 12,22 ----
@@ -775,12 +750,12 @@
   
 + #if defined _MSC_VER
 + #pragma warning(pop)
-  #endif
-+ 
 + #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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/boost/spirit/utility/impl/chset_operators.ipp	Wed Jun  6 20:04:00 2007
 ***************
 *** 11,16 ****
 --- 11,21 ----
@@ -803,290 +778,33 @@
   
 + #if defined _MSC_VER
 + #pragma warning(pop)
-  #endif
-+ 
-+ #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	Thu Oct 12 17:51:28 2006
-***************
-*** 119,124 ****
---- 119,129 ----
-  #ifndef BOOST_ITERATOR_ADAPTOR_DWA053000_HPP_
-  # define BOOST_ITERATOR_ADAPTOR_DWA053000_HPP_
-  
-+ # if defined _MSC_VER
-+ # pragma warning(push)
-+ # pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ # endif
-+ 
-  # include <boost/iterator.hpp>
-  # include <boost/utility.hpp>
-  # include <boost/compressed_pair.hpp>
-***************
-*** 873,879 ****
-           return policies().dereference(*this);
-      }
-  
-! #if BOOST_WORKAROUND(BOOST_MSVC, > 0)
-  # pragma warning(push)
-  # pragma warning( disable : 4284 )
-  #endif
---- 878,884 ----
-           return policies().dereference(*this);
-      }
-  
-! #if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-  # pragma warning(push)
-  # pragma warning( disable : 4284 )
-  #endif
-***************
-*** 882,888 ****
-      operator->() const
-          { return detail::operator_arrow(*this, iterator_category()); }
-  
-! #if BOOST_WORKAROUND(BOOST_MSVC, > 0)
-  # pragma warning(pop)
-  #endif
-  
---- 887,893 ----
-      operator->() const
-          { return detail::operator_arrow(*this, iterator_category()); }
-  
-! #if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-  # pragma warning(pop)
-  #endif
-  
-***************
-*** 1430,1435 ****
---- 1435,1443 ----
-  } // namespace boost
-  # undef BOOST_ARG_DEPENDENT_TYPENAME
-  
-+ # if defined _MSC_VER
-+ # pragma warning(pop)
-+ # endif
-  
-  #endif
-  
-*** 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	Thu Oct 12 17:51:28 2006
-***************
-*** 17,22 ****
---- 17,27 ----
-  #ifndef BOOST_OPTIONAL_FLC_19NOV2002_HPP
-  #define BOOST_OPTIONAL_FLC_19NOV2002_HPP
-  
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
 + #endif
 + 
-  #include<new>
-  #include<algorithm>
-  
-***************
-*** 194,200 ****
---- 199,209 ----
-  
-      // implicit conversion to "bool"
-      // No-throw
-+ #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
-+     operator bool() const { return m_initialized; }
-+ #else
-      operator unspecified_bool_type() const { return m_initialized ? &this_type::destroy : 0 ; }
-+ #endif // defined(__SUNPRO_CC)
-  
-         // This is provided for those compilers which don't like the conversion to bool
-         // on some contexts.
-***************
-*** 313,317 ****
---- 322,330 ----
-  
-  } // 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	Thu Oct 12 17:51:28 2006
-***************
-*** 83,88 ****
---- 83,91 ----
-  
-      // implicit conversion to "bool"
-  
-+ #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
-+     operator bool() const { return ptr != 0; }
-+ #else
-      typedef T * (this_type::*unspecified_bool_type)() const;
-  
-      operator unspecified_bool_type() const // never throws
-***************
-*** 89,94 ****
---- 92,98 ----
-      {
-          return ptr == 0? 0: &this_type::get;
-      }
-+ #endif // defined(__SUNPRO_CC)
-  
-      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	Thu Oct 12 17:51:28 2006
-***************
-*** 102,107 ****
---- 102,110 ----
-  
-      // implicit conversion to "bool"
-  
-+ #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
-+     operator bool() const { return ptr != 0; }
-+ #else
-      typedef T * (this_type::*unspecified_bool_type)() const;
-  
-      operator unspecified_bool_type() const // never throws
-***************
-*** 108,113 ****
---- 111,117 ----
-      {
-          return ptr == 0? 0: &this_type::get;
-      }
-+ #endif // defined(__SUNPRO_CC)
-  
-      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	Thu Oct 12 17:51:28 2006
-***************
-*** 94,99 ****
---- 94,102 ----
-  
-      // implicit conversion to "bool"
-  
-+ #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
-+     operator bool() const { return px != 0; }
-+ #else
-      typedef T * (this_type::*unspecified_bool_type)() const;
-  
-      operator unspecified_bool_type() const // never throws
-***************
-*** 100,105 ****
---- 103,109 ----
-      {
-          return px == 0? 0: &this_type::get;
-      }
-+ #endif // defined(__SUNPRO_CC)
-  
-      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	Thu Oct 12 17:51:28 2006
-***************
-*** 35,41 ****
-  
-  #ifdef BOOST_MSVC  // moved here to work around VC++ compiler crash
-  # pragma warning(push)
-! # pragma warning(disable:4284) // odd return type for operator->
   #endif
   
-  namespace boost
---- 35,41 ----
-  
-  #ifdef BOOST_MSVC  // moved here to work around VC++ compiler crash
-  # pragma warning(push)
-! # pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-  #endif
-  
-  namespace boost
-***************
-*** 246,251 ****
---- 246,254 ----
-  
-      // implicit conversion to "bool"
-  
-+ #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
-+     operator bool() const { return px != 0; }
-+ #else
-      typedef T * (this_type::*unspecified_bool_type)() const;
-  
-      operator unspecified_bool_type() const // never throws
-***************
-*** 252,257 ****
---- 255,261 ----
-      {
-          return px == 0? 0: &this_type::get;
-      }
-+ #endif // defined(__SUNPRO_CC)
-  
-      // 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	Thu Oct 12 17:51:28 2006
-***************
-*** 29,35 ****
-  
-  #ifdef BOOST_NO_EXCEPTIONS
-  
-! void throw_exception(std::exception const & e); // user defined
-  
-  #else
-  
---- 29,36 ----
-  
-  #ifdef BOOST_NO_EXCEPTIONS
-  
-! // void throw_exception(std::exception const & e); // user defined
-! inline void throw_exception(std::exception const &) {}
-  
-  #else
-  
-*** 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	Thu Oct 12 17:51:28 2006
-***************
-*** 16,26 ****
-  
-  #include <boost/shared_ptr.hpp>
-  
-- #ifdef BOOST_MSVC  // moved here to work around VC++ compiler crash
-- # pragma warning(push)
-- # pragma warning(disable:4284) // odd return type for operator->
-- #endif
-- 
-  namespace boost
-  {
-  
---- 16,21 ----
+*** 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
 ***************
-*** 186,193 ****
+*** 47,54 ****
+          typedef fixed_loop<ParserT, ExactT>     self_t;
+          typedef unary<ParserT, parser<self_t> >  base_t;
   
-  } // namespace boost
+!         fixed_loop (ParserT const & subject, ExactT const & exact)
+!         : base_t(subject), m_exact(exact) {}
   
-- #ifdef BOOST_MSVC
-- # pragma warning(pop)
-- #endif    
-- 
-  #endif  // #ifndef BOOST_WEAK_PTR_HPP_INCLUDED
---- 181,184 ----
-*** 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	Thu Oct 12 17:51:28 2006
-***************
-*** 66,68 ****
---- 66,74 ----
-  // #define BOOST_DISABLE_WIN32
+          template <typename ScannerT>
+          typename parser_result <self_t, ScannerT>::type
+--- 47,54 ----
+          typedef fixed_loop<ParserT, ExactT>     self_t;
+          typedef unary<ParserT, parser<self_t> >  base_t;
   
+!         fixed_loop (ParserT const & subject_, ExactT const & exact_)
+!         : base_t(subject_), m_exact(exact_) {}
   
-+ // Switch off exception statements if file is compiled without
-+ // exception support:
-+ #if defined(EXCEPTIONS_OFF) && !defined(BOOST_NO_EXCEPTIONS)
-+ #define BOOST_NO_EXCEPTIONS
-+ #endif
-+ 
+          template <typename ScannerT>
+          typename parser_result <self_t, ScannerT>::type
 *** 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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/miniboost/boost/config/compiler/gcc.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 59,65 ****
   #endif
@@ -1106,7 +824,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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/miniboost/boost/config/compiler/sunpro_cc.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 45,52 ****
   #      define BOOST_NO_INTEGRAL_INT64_T
@@ -1132,7 +850,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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/miniboost/boost/config/compiler/visualc.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 65,75 ****
   #  define BOOST_NO_INTRINSIC_WCHAR_T
@@ -1187,17 +905,38 @@
   #     error "Unknown compiler version - please run the configure tests and report the results"
   #  else
 ***************
-*** 117,123 ****
-  #endif
-  
-  
-- 
+*** 120,123 ****
   
   
   
---- 119,124 ----
+- 
+--- 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
+***************
+*** 19,27 ****
+  #    define BOOST_HAS_UNISTD_H
+  #  endif
+  // boilerplate code:
+! #  ifndef TARGET_CARBON
+  #     include <boost/config/posix_features.hpp>
+! #  endif
+  #  ifndef BOOST_HAS_STDINT_H
+  #     define BOOST_HAS_STDINT_H
+  #  endif
+--- 19,28 ----
+  #    define BOOST_HAS_UNISTD_H
+  #  endif
+  // boilerplate code:
+! // See issue #i72248# 
+! //#  ifndef TARGET_CARBON
+  #     include <boost/config/posix_features.hpp>
+! //#  endif
+  #  ifndef BOOST_HAS_STDINT_H
+  #     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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/miniboost/boost/config/platform/win32.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 40,45 ****
 --- 40,46 ----
@@ -1215,8 +954,190 @@
   using std::max;
   #     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
+***************
+*** 66,68 ****
+--- 66,74 ----
+  // #define BOOST_DISABLE_WIN32
+  
+  
++ // Switch off exception statements if file is compiled without
++ // exception support:
++ #if defined(EXCEPTIONS_OFF) && !defined(BOOST_NO_EXCEPTIONS)
++ #define BOOST_NO_EXCEPTIONS
++ #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
+***************
+*** 119,124 ****
+--- 119,129 ----
+  #ifndef BOOST_ITERATOR_ADAPTOR_DWA053000_HPP_
+  # define BOOST_ITERATOR_ADAPTOR_DWA053000_HPP_
+  
++ # if defined _MSC_VER
++ # pragma warning(push)
++ # pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
++ # endif
++ 
+  # include <boost/iterator.hpp>
+  # include <boost/utility.hpp>
+  # include <boost/compressed_pair.hpp>
+***************
+*** 873,879 ****
+           return policies().dereference(*this);
+      }
+  
+! #if BOOST_WORKAROUND(BOOST_MSVC, > 0)
+  # pragma warning(push)
+  # pragma warning( disable : 4284 )
+  #endif
+--- 878,884 ----
+           return policies().dereference(*this);
+      }
+  
+! #if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+  # pragma warning(push)
+  # pragma warning( disable : 4284 )
+  #endif
+***************
+*** 882,888 ****
+      operator->() const
+          { return detail::operator_arrow(*this, iterator_category()); }
+  
+! #if BOOST_WORKAROUND(BOOST_MSVC, > 0)
+  # pragma warning(pop)
+  #endif
+  
+--- 887,893 ----
+      operator->() const
+          { return detail::operator_arrow(*this, iterator_category()); }
+  
+! #if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+  # pragma warning(pop)
+  #endif
+  
+***************
+*** 1430,1435 ****
+--- 1435,1443 ----
+  } // namespace boost
+  # undef BOOST_ARG_DEPENDENT_TYPENAME
+  
++ # if defined _MSC_VER
++ # pragma warning(pop)
++ # endif
+  
+  #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
+***************
+*** 17,22 ****
+--- 17,27 ----
+  #ifndef BOOST_MPL_AUX_ICE_CAST_HPP_INCLUDED
+  #define BOOST_MPL_AUX_ICE_CAST_HPP_INCLUDED
+  
++ #if defined _MSC_VER
++ #pragma warning(push)
++ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
++ #endif
++ 
+  #include "boost/mpl/aux_/config/workaround.hpp"
+  
+  #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) \
+***************
+*** 28,31 ****
+--- 33,40 ----
+  #   define BOOST_MPL_AUX_ICE_CAST(T, expr) static_cast<T>(expr)
+  #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
+***************
+*** 17,22 ****
+--- 17,27 ----
+  
+  // no include guards, the header is intended for multiple inclusion!
+  
++ #if defined _MSC_VER
++ #pragma warning(push)
++ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
++ #endif
++ 
+  #include "boost/mpl/aux_/ice_cast.hpp"
+  #include "boost/mpl/aux_/config/nttp.hpp"
+  #include "boost/mpl/aux_/config/static_constant.hpp"
+***************
+*** 84,86 ****
+--- 89,95 ----
+  #undef AUX_WRAPPER_PARAMS
+  #undef AUX_WRAPPER_INST
+  #undef AUX_WRAPPER_VALUE_TYPE
++ 
++ #if defined _MSC_VER
++ #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
+***************
+*** 17,22 ****
+--- 17,27 ----
+  #ifndef BOOST_MPL_AUX_LAMBDA_SUPPORT_HPP_INCLUDED
+  #define BOOST_MPL_AUX_LAMBDA_SUPPORT_HPP_INCLUDED
+  
++ #if defined _MSC_VER
++ #pragma warning(push)
++ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
++ #endif
++ 
+  #include "boost/mpl/aux_/config/lambda.hpp"
+  
+  #if !defined(BOOST_MPL_NO_FULL_LAMBDA_SUPPORT)
+***************
+*** 133,136 ****
+--- 138,145 ----
+  
+  #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
+***************
+*** 17,22 ****
+--- 17,27 ----
+  
+  // no include guards, the header is intended for multiple inclusion!
+  
++ #if defined _MSC_VER
++ #pragma warning(push)
++ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
++ #endif
++ 
+  #if !defined(BOOST_MPL_PREPROCESSING_MODE)
+  #   include "boost/mpl/bool.hpp"
+  #   include "boost/mpl/aux_/nested_type_wknd.hpp"
+***************
+*** 167,169 ****
+--- 172,178 ----
+  #undef AUX_LOGICAL_OP_NAME
+  #undef AUX_LOGICAL_OP_VALUE1
+  #undef AUX_LOGICAL_OP_VALUE2
++ 
++ #if defined _MSC_VER
++ #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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/miniboost/boost/mpl/if.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 17,22 ****
 --- 17,27 ----
@@ -1243,7 +1164,7 @@
 + 
   #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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/miniboost/boost/mpl/integral_c.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 18,23 ****
 --- 18,28 ----
@@ -1270,7 +1191,7 @@
 + 
   #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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/miniboost/boost/mpl/integral_c_fwd.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 18,23 ****
 --- 18,28 ----
@@ -1297,7 +1218,7 @@
 + 
   #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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/miniboost/boost/mpl/is_sequence.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 17,22 ****
 --- 17,27 ----
@@ -1324,7 +1245,7 @@
 + 
   #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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/miniboost/boost/mpl/sequence_tag.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 17,22 ****
 --- 17,27 ----
@@ -1350,114 +1271,171 @@
 + #endif
 + 
   #endif // BOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED
-*** 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	Thu Oct 12 17:51:28 2006
+*** 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
 ***************
 *** 17,22 ****
 --- 17,27 ----
-  #ifndef BOOST_MPL_AUX_ICE_CAST_HPP_INCLUDED
-  #define BOOST_MPL_AUX_ICE_CAST_HPP_INCLUDED
+  #ifndef BOOST_OPTIONAL_FLC_19NOV2002_HPP
+  #define BOOST_OPTIONAL_FLC_19NOV2002_HPP
   
 + #if defined _MSC_VER
 + #pragma warning(push)
 + #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
 + #endif
 + 
-  #include "boost/mpl/aux_/config/workaround.hpp"
+  #include<new>
+  #include<algorithm>
   
-  #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) \
 ***************
-*** 28,31 ****
---- 33,40 ----
-  #   define BOOST_MPL_AUX_ICE_CAST(T, expr) static_cast<T>(expr)
-  #endif
+*** 194,200 ****
+--- 199,209 ----
+  
+      // implicit conversion to "bool"
+      // No-throw
++ #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
++     operator bool() const { return m_initialized; }
++ #else
+      operator unspecified_bool_type() const { return m_initialized ? &this_type::destroy : 0 ; }
++ #endif // defined(__SUNPRO_CC)
+  
+         // This is provided for those compilers which don't like the conversion to bool
+         // on some contexts.
+***************
+*** 313,317 ****
+--- 322,330 ----
+  
+  } // namespace boost
   
 + #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	Thu Oct 12 17:51:28 2006
+  #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
 ***************
-*** 17,22 ****
---- 17,27 ----
+*** 83,94 ****
+--- 83,98 ----
   
-  // no include guards, the header is intended for multiple inclusion!
+      // implicit conversion to "bool"
   
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ #endif
-+ 
-  #include "boost/mpl/aux_/ice_cast.hpp"
-  #include "boost/mpl/aux_/config/nttp.hpp"
-  #include "boost/mpl/aux_/config/static_constant.hpp"
++ #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
++     operator bool() const { return ptr != 0; }
++ #else
+      typedef T * (this_type::*unspecified_bool_type)() const;
+  
+      operator unspecified_bool_type() const // never throws
+      {
+          return ptr == 0? 0: &this_type::get;
+      }
++ #endif // defined(__SUNPRO_CC)
+  
+      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
 ***************
-*** 84,86 ****
---- 89,95 ----
-  #undef AUX_WRAPPER_PARAMS
-  #undef AUX_WRAPPER_INST
-  #undef AUX_WRAPPER_VALUE_TYPE
-+ 
-+ #if defined _MSC_VER
-+ #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	Thu Oct 12 17:51:28 2006
+*** 102,113 ****
+--- 102,117 ----
+  
+      // implicit conversion to "bool"
+  
++ #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
++     operator bool() const { return ptr != 0; }
++ #else
+      typedef T * (this_type::*unspecified_bool_type)() const;
+  
+      operator unspecified_bool_type() const // never throws
+      {
+          return ptr == 0? 0: &this_type::get;
+      }
++ #endif // defined(__SUNPRO_CC)
+  
+      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
 ***************
-*** 17,22 ****
---- 17,27 ----
-  #ifndef BOOST_MPL_AUX_LAMBDA_SUPPORT_HPP_INCLUDED
-  #define BOOST_MPL_AUX_LAMBDA_SUPPORT_HPP_INCLUDED
+*** 94,105 ****
+--- 94,109 ----
   
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ #endif
-+ 
-  #include "boost/mpl/aux_/config/lambda.hpp"
+      // implicit conversion to "bool"
   
-  #if !defined(BOOST_MPL_NO_FULL_LAMBDA_SUPPORT)
++ #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
++     operator bool() const { return px != 0; }
++ #else
+      typedef T * (this_type::*unspecified_bool_type)() const;
+  
+      operator unspecified_bool_type() const // never throws
+      {
+          return px == 0? 0: &this_type::get;
+      }
++ #endif // defined(__SUNPRO_CC)
+  
+      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
 ***************
-*** 133,136 ****
---- 138,145 ----
+*** 35,41 ****
   
-  #endif // BOOST_MPL_NO_FULL_LAMBDA_SUPPORT
+  #ifdef BOOST_MSVC  // moved here to work around VC++ compiler crash
+  # pragma warning(push)
+! # pragma warning(disable:4284) // odd return type for operator->
+  #endif
   
-+ #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	Thu Oct 12 17:51:29 2006
+  namespace boost
+--- 35,41 ----
+  
+  #ifdef BOOST_MSVC  // moved here to work around VC++ compiler crash
+  # pragma warning(push)
+! # pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
+  #endif
+  
+  namespace boost
 ***************
-*** 17,22 ****
---- 17,27 ----
+*** 246,257 ****
+--- 246,261 ----
   
-  // no include guards, the header is intended for multiple inclusion!
+      // implicit conversion to "bool"
   
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ #endif
-+ 
-  #if !defined(BOOST_MPL_PREPROCESSING_MODE)
-  #   include "boost/mpl/bool.hpp"
-  #   include "boost/mpl/aux_/nested_type_wknd.hpp"
++ #if defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
++     operator bool() const { return px != 0; }
++ #else
+      typedef T * (this_type::*unspecified_bool_type)() const;
+  
+      operator unspecified_bool_type() const // never throws
+      {
+          return px == 0? 0: &this_type::get;
+      }
++ #endif // defined(__SUNPRO_CC)
+  
+      // 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
 ***************
-*** 167,169 ****
---- 172,178 ----
-  #undef AUX_LOGICAL_OP_NAME
-  #undef AUX_LOGICAL_OP_VALUE1
-  #undef AUX_LOGICAL_OP_VALUE2
-+ 
-+ #if defined _MSC_VER
-+ #pragma warning(pop)
-+ #endif
+*** 29,35 ****
+  
+  #ifdef BOOST_NO_EXCEPTIONS
+  
+! void throw_exception(std::exception const & e); // user defined
+  
+  #else
+  
+--- 29,36 ----
+  
+  #ifdef BOOST_NO_EXCEPTIONS
+  
+! // void throw_exception(std::exception const & e); // user defined
+! inline void throw_exception(std::exception const &) {}
+  
+  #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	Thu Oct 12 17:51:29 2006
+--- misc/build/spirit-1.6.1/miniboost/boost/type_traits/add_reference.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 10,15 ****
 --- 10,20 ----
@@ -1484,7 +1462,7 @@
 + 
   #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	Thu Oct 12 17:51:29 2006
+--- misc/build/spirit-1.6.1/miniboost/boost/type_traits/is_base_and_derived.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 10,15 ****
 --- 10,20 ----
@@ -1511,7 +1489,7 @@
 + 
   #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	Thu Oct 12 17:51:29 2006
+--- misc/build/spirit-1.6.1/miniboost/boost/type_traits/is_polymorphic.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 6,11 ****
 --- 6,16 ----
@@ -1534,11 +1512,11 @@
   
 + #if defined _MSC_VER
 + #pragma warning(pop)
-  #endif
-+ 
 + #endif
++ 
+  #endif
 *** 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	Fri Sep  1 11:10:07 2006
+--- misc/build/spirit-1.6.1/miniboost/boost/utility/addressof.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 16,21 ****
 --- 16,26 ----
@@ -1564,3 +1542,30 @@
 + #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
+***************
+*** 16,26 ****
+  
+  #include <boost/shared_ptr.hpp>
+  
+- #ifdef BOOST_MSVC  // moved here to work around VC++ compiler crash
+- # pragma warning(push)
+- # pragma warning(disable:4284) // odd return type for operator->
+- #endif
+- 
+  namespace boost
+  {
+  
+--- 16,21 ----
+***************
+*** 186,193 ****
+  
+  } // namespace boost
+  
+- #ifdef BOOST_MSVC
+- # pragma warning(pop)
+- #endif    
+- 
+  #endif  // #ifndef BOOST_WEAK_PTR_HPP_INCLUDED
+--- 181,184 ----