   using std::max;
   #     endif
 + #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
-***************
-*** 17,22 ****
---- 17,27 ----
-  //
-  // See http://www.boost.org/libs/mpl for documentation.
-  
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ #endif
-+ 
-  #include "boost/mpl/aux_/value_wknd.hpp"
-  #include "boost/mpl/aux_/ice_cast.hpp"
-  #include "boost/mpl/aux_/void_spec.hpp"
-***************
-*** 174,177 ****
---- 179,186 ----
-  } // namespace mpl
+*** 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
-  
-+ #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	Thu Oct 12 17:51:28 2006
-***************
-*** 18,23 ****
---- 18,28 ----
-  //
-  // See http://www.boost.org/libs/mpl for documentation.
-  
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ #endif
-+ 
-  #include "boost/mpl/integral_c_fwd.hpp"
-  #include "boost/mpl/aux_/ice_cast.hpp"
-  #include "boost/mpl/aux_/config/ctps.hpp"
-***************
-*** 50,53 ****
---- 55,62 ----
-  }}
-  #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	Thu Oct 12 17:51:28 2006
-***************
-*** 18,23 ****
---- 18,28 ----
-  //
-  // See http://www.boost.org/libs/mpl for documentation.
-  
-+ #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"
-  
-  namespace boost { namespace mpl {
-***************
-*** 29,32 ****
---- 34,41 ----
-  #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	Thu Oct 12 17:51:28 2006
-***************
-*** 17,22 ****
---- 17,27 ----
-  #ifndef BOOST_MPL_IS_SEQUENCE_HPP_INCLUDED
-  #define BOOST_MPL_IS_SEQUENCE_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/not.hpp"
-  #include "boost/mpl/or.hpp"
-  #include "boost/mpl/begin_end.hpp"
-***************
-*** 98,101 ****
---- 103,110 ----
-  
-  }} // 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	Thu Oct 12 17:51:28 2006
-***************
-*** 17,22 ****
---- 17,27 ----
-  #ifndef BOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED
-  #define BOOST_MPL_SEQUENCE_TAG_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/sequence_tag_fwd.hpp"
-  #include "boost/mpl/aux_/has_tag.hpp"
-  #include "boost/mpl/aux_/has_begin.hpp"
-***************
-*** 130,133 ****
---- 135,142 ----
-  
-  }} // namespace boost::mpl
-  
-+ #if defined _MSC_VER
-+ #pragma warning(pop)
-+ #endif
-+ 
-  #endif // BOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED
+  # 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	Thu Oct 12 17:51:28 2006
+--- misc/build/spirit-1.6.1/miniboost/boost/mpl/aux_/ice_cast.hpp	Wed Jun  6 20:04:00 2007
 ***************
 *** 17,22 ****
 --- 17,27 ----

  #     error "Unknown compiler version - please run the configure tests and report the results"
  #  else
***************
*** 117,123 ****
  #endif
  
  
- 
  
  
  
--- 119,124 ----
*** 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
***************
*** 40,45 ****
--- 40,46 ----

+ 
  #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
***************
*** 12,17 ****
--- 12,22 ----
