CWS-TOOLING: integrate CWS boost134

2009-09-09 10:30:24 +0200 fs r275970 : #i100127# provided by rene: check whether system-boost's function.hpp compiles without exception support 2009-09-04 21:58:00 +0200 fs r275832 : indention 2009-09-04 21:57:10 +0200 fs r275831 : #i10000# type in boost/spirit check. Thanks to thb 2009-09-04 10:58:54 +0200 fs r275787 : #i100127# provided by tono@openoffice.org: mingw needs using directives for std::min/max 2009-09-04 10:31:54 +0200 fs r275782 : #i100127# (approved by hjs) on Solaris, set GNUTAR to /usr/sfw/bin/gtar, this is available on baseline machines (Solaris 10.x), but not necessarily available in LD_LIBRARY_PATH 2009-08-19 21:47:55 +0200 rene r275161 : #i10000# check for the header actually used now 2009-08-17 21:55:31 +0200 fs r275073 : CWS-TOOLING: rebase CWS boost134 to trunk@275001 (milestone: DEV300:m55) 2009-07-16 09:39:25 +0200 fs r274031 : #i100127# extract download/% with GNUTAR instead of TAR 2009-07-14 09:18:15 +0200 fs r273960 : CWS-TOOLING: rebase CWS boost134 to trunk@273858 (milestone: DEV300:m52) 2009-07-13 09:55:14 +0200 fs r273919 : #i100127# use boost 1.39, not 1.34 2009-07-13 09:45:57 +0200 fs r273918 : use GNUTAR when extracting download/%.tar.gz, not TAR (necessary with boost 1.39 tarball) 2009-07-10 21:10:52 +0200 fs r273905 : #i100127# spirit now part of boost 2009-07-06 12:12:13 +0200 fs r273732 : #i10000# lngconvex, used in src/wizards, is built in shell => added missing module dependency 2009-07-02 15:34:51 +0200 fs r273660 : #i100127# 2009-07-02 13:35:24 +0200 fs r273645 : #i100127# MSVC needs some hinting when using boost::bind on (some) member functions 2009-07-02 10:33:59 +0200 fs r273625 : removed unused include (lead to an internal compiler error with MSVC and boost 1.34+) 2009-07-02 09:44:35 +0200 fs r273619 : change some include orders, prevents 'internal compiler errors' with MSVC 2009-07-01 09:19:25 +0200 fs r273547 : #i100127# who the heck is defining max as something unusable? 2009-07-01 09:17:28 +0200 fs r273546 : #i100127# defining min/max is causing trouble now 2009-07-01 09:15:40 +0200 fs r273545 : #i100127# reverted previous patch, and properly fixed the problem by defining BOOST_MEM_FN_ENABLE_CDECL, and disabling warning 4180 2009-07-01 09:14:23 +0200 fs r273544 : #i100127# re-disable warning 4180, still needed for some files 2009-07-01 09:07:33 +0200 fs r273543 : #i100127# reverted previous patch, and properly fixed the problem by defining BOOST_MEM_FN_ENABLE_CDECL 2009-06-24 11:00:32 +0200 fs r273319 : oops, re-introduced some inc locations 2009-06-23 22:10:02 +0200 fs r273304 : #i100127# disable warning C4180 2009-06-23 22:08:36 +0200 fs r273303 : #i100127# disable warning C4180 2009-06-16 12:26:49 +0200 fs r273015 : #i10000# (provided by mst@openoffice.org) 2009-06-15 09:10:27 +0200 fs r272962 : #i10000# use -r instead of -a when copying the include files, this prevents the spurious 'failed to preserve ownership' errors 2009-06-11 23:55:06 +0200 fs r272902 : #i100127# 2009-06-11 23:54:47 +0200 fs r272901 : #i100127# 2009-06-11 23:54:05 +0200 fs r272900 : make compile on unxsol[i|s]4 2009-06-10 10:12:22 +0200 fs r272798 : #i100127# don't deliver from within unxlngi6/misc/build/boost, but from a 'normalized' location unxlngi6/inc 2009-06-10 09:48:00 +0200 fs r272795 : #i100127# use 1.34.1 unconditionally on all platforms
author: Ivo Hinkelmann <ihi@openoffice.org> 2009-09-17 10:11:42 +0000
committer: Ivo Hinkelmann <ihi@openoffice.org> 2009-09-17 10:11:42 +0000
commit: 48f8d30dfa1ba1d5a902db7d401aa3c77d780ff7 (patch)
tree: dbc8315867f792adb6d682072ec697cccf9777a2 /boost
parent: c5c13c0be9673f12ba3c1a50610afbbb32dab94a (diff)
8 files changed, 423 insertions, 3129 deletions
diff --git a/boost/boost-1.30.2.patch b/boost/boost-1.30.2.patch
deleted file mode 100644
index fe53de6ba274..000000000000
--- a/boost/boost-1.30.2.patch
+++ /dev/null
@@ -1,736 +0,0 @@
-*** misc/boost-1.30.2/boost/config/platform/macos.hpp  Thu Feb 13 13:28:05 2003
---- misc/build/boost-1.30.2/boost/config/platform/macos.hpp    Mon Jun  4 10:01:49 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:
-! // HDU: disabled the TARGET_CARBON check because of issue #i72248#
-! //#  ifndef TARGET_CARBON
-  #     include <boost/config/posix_features.hpp>
-! //#  endif
-  #  ifndef BOOST_HAS_STDINT_H
-  #     define BOOST_HAS_STDINT_H
-  #  endif
-*** misc/boost-1.30.2/boost/bind.hpp	Tue Oct 15 12:51:34 2002
---- misc/build/boost-1.30.2/boost/bind.hpp	Tue Jul 25 14:47:06 2006
-***************
-*** 5,10 ****
---- 5,17 ----
-  #pragma once
-  #endif
-  
-+ #if defined(_MSC_VER) && !defined(BOOST_MEM_FN_ENABLE_CDECL)
-+ // enable support for __cdecl (SAL_CALL) C++-UNO interface methods;
-+ // makes sense to shift this to command line some day:
-+ // -DBOOST_MEM_FN_ENABLE_CDECL
-+ #define BOOST_MEM_FN_ENABLE_CDECL
-+ #endif
-+ 
-  //
-  //  bind.hpp - binds function objects to arguments
-  //
-***************
-*** 1472,1477 ****
---- 1479,1496 ----
-  #undef BOOST_BIND_MF_NAME
-  #undef BOOST_BIND_MF_CC
-  
-+ #ifdef BOOST_MEM_FN_ENABLE_CDECL
-+ 
-+ #define BOOST_BIND_MF_NAME(X) X##_cdecl
-+ #define BOOST_BIND_MF_CC __cdecl
-+ 
-+ #include <boost/bind/bind_mf_cc.hpp>
-+ 
-+ #undef BOOST_BIND_MF_NAME
-+ #undef BOOST_BIND_MF_CC
-+ 
-+ #endif
-+ 
-  #ifdef BOOST_MEM_FN_ENABLE_STDCALL
-  
-  #define BOOST_BIND_MF_NAME(X) X##_stdcall
-*** misc/boost-1.30.2/boost/config/compiler/gcc.hpp	2003-08-02 18:20:49.000000000 +0200
---- misc/build/boost-1.30.2/boost/config/compiler/gcc.hpp	2006-11-07 11:28:26.000000000 +0100
-***************
-*** 73,80 ****
-  #  error "Compiler not configured - please reconfigure"
-  #endif
-  //
-! // last known and checked version is 3.3:
-! #if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3))
-  #  if defined(BOOST_ASSERT_CONFIG)
-  #     error "Unknown compiler version - please run the configure tests and report the results"
-  #  else
---- 73,80 ----
-  #  error "Compiler not configured - please reconfigure"
-  #endif
-  //
-! // last known and checked version is 4.2:
-! #if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 2))
-  #  if defined(BOOST_ASSERT_CONFIG)
-  #     error "Unknown compiler version - please run the configure tests and report the results"
-  #  else
-*** misc/boost-1.30.2/boost/function/function_template.hpp	Fri Feb  7 15:03:36 2003
---- misc/build/boost-1.30.2/boost/function/function_template.hpp	Wed Mar  8 20:10:22 2006
-***************
-*** 15,20 ****
---- 15,23 ----
-  
-  // Note: this header is a header template and must NOT have multiple-inclusion
-  // protection.
-+ #if defined __GNUC__
-+ #pragma GCC system_header
-+ #endif
-  #include <boost/function/detail/prologue.hpp>
-  
-  #define BOOST_FUNCTION_TEMPLATE_PARMS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, typename T)
-***************
-*** 395,401 ****
-        invoker = 0;
-      }
-  
-! #if (defined __SUNPRO_CC) && (__SUNPRO_CC <= 0x530) && !(defined BOOST_NO_COMPILER_CONFIG)
-      // Sun C++ 5.3 can't handle the safe_bool idiom, so don't use it
-      operator bool () const { return !this->empty(); }
-  #else
---- 398,404 ----
-        invoker = 0;
-      }
-  
-! #if (defined __SUNPRO_CC) // workaround opt bug when compiling with -xO3
-      // Sun C++ 5.3 can't handle the safe_bool idiom, so don't use it
-      operator bool () const { return !this->empty(); }
-  #else
-***************
-*** 443,451 ****
-                             R BOOST_FUNCTION_COMMA
-                             BOOST_FUNCTION_TEMPLATE_ARGS
-                           >::type
-!           invoker_type;
-  
-!         invoker = &invoker_type::invoke;
-          function_base::manager =
-            &detail::function::functor_manager<FunctionPtr, Allocator>::manage;
-          function_base::functor =
---- 446,454 ----
-                             R BOOST_FUNCTION_COMMA
-                             BOOST_FUNCTION_TEMPLATE_ARGS
-                           >::type
-!           lcl_invoker_type;
-  
-!         invoker = &lcl_invoker_type::invoke;
-          function_base::manager =
-            &detail::function::functor_manager<FunctionPtr, Allocator>::manage;
-          function_base::functor =
-***************
-*** 476,491 ****
-                                         R BOOST_FUNCTION_COMMA
-                                         BOOST_FUNCTION_TEMPLATE_ARGS
-                                       >::type
-!           invoker_type;
-  
-!         invoker = &invoker_type::invoke;
-          function_base::manager = &detail::function::functor_manager<
-                                      FunctionObj, Allocator>::manage;
-  #ifndef BOOST_NO_STD_ALLOCATOR
-          typedef typename Allocator::template rebind<FunctionObj>::other
-!           allocator_type;
-!         typedef typename allocator_type::pointer pointer_type;
-!         allocator_type allocator;
-          pointer_type copy = allocator.allocate(1);
-          allocator.construct(copy, f);
-  
---- 479,494 ----
-                                         R BOOST_FUNCTION_COMMA
-                                         BOOST_FUNCTION_TEMPLATE_ARGS
-                                       >::type
-!           lcl_invoker_type;
-  
-!         invoker = &lcl_invoker_type::invoke;
-          function_base::manager = &detail::function::functor_manager<
-                                      FunctionObj, Allocator>::manage;
-  #ifndef BOOST_NO_STD_ALLOCATOR
-          typedef typename Allocator::template rebind<FunctionObj>::other
-!           lcl_allocator_type;
-!         typedef typename lcl_allocator_type::pointer pointer_type;
-!         lcl_allocator_type allocator;
-          pointer_type copy = allocator.allocate(1);
-          allocator.construct(copy, f);
-  
-***************
-*** 510,518 ****
-                                         R BOOST_FUNCTION_COMMA
-                                         BOOST_FUNCTION_TEMPLATE_ARGS
-                                       >::type
-!           invoker_type;
-  
-!         invoker = &invoker_type::invoke;
-          function_base::manager = &detail::function::trivial_manager;
-          function_base::functor =
-            function_base::manager(
---- 513,521 ----
-                                         R BOOST_FUNCTION_COMMA
-                                         BOOST_FUNCTION_TEMPLATE_ARGS
-                                       >::type
-!           lcl_invoker_type;
-  
-!         invoker = &lcl_invoker_type::invoke;
-          function_base::manager = &detail::function::trivial_manager;
-          function_base::functor =
-            function_base::manager(
-***************
-*** 532,539 ****
-                         R BOOST_FUNCTION_COMMA
-                         BOOST_FUNCTION_TEMPLATE_ARGS
-                       >::type
-!           invoker_type;
-!       invoker = &invoker_type::invoke;
-        function_base::manager = &detail::function::trivial_manager;
-        function_base::functor = detail::function::make_any_pointer(this);
-      }
---- 535,542 ----
-                         R BOOST_FUNCTION_COMMA
-                         BOOST_FUNCTION_TEMPLATE_ARGS
-                       >::type
-!           lcl_invoker_type;
-!       invoker = &lcl_invoker_type::invoke;
-        function_base::manager = &detail::function::trivial_manager;
-        function_base::functor = detail::function::make_any_pointer(this);
-      }
-*** misc/boost-1.30.2/boost/function.hpp	Fri Feb 14 16:34:39 2003
---- misc/build/boost-1.30.2/boost/function.hpp	Tue Jul 25 14:47:06 2006
-***************
-*** 16,21 ****
---- 16,26 ----
-  // William Kempf, Jesse Jones and Karl Nelson were all very helpful in the
-  // design of this library.
-  
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ #endif
-+ 
-  #include <boost/preprocessor/iterate.hpp>
-  #include <boost/detail/workaround.hpp>
-  
-***************
-*** 67,70 ****
---- 72,79 ----
-  #  define BOOST_PP_ITERATION_PARAMS_1 (3,(0,BOOST_FUNCTION_MAX_ARGS,<boost/function/detail/function_iterate.hpp>))
-  #  include BOOST_PP_ITERATE()
-  #  undef BOOST_PP_ITERATION_PARAMS_1
-+ #endif
-+ 
-+ #if defined _MSC_VER
-+ #pragma warning(pop)
-  #endif
-*** misc/boost-1.30.2/boost/mem_fn.hpp	Fri Dec 20 19:14:59 2002
---- misc/build/boost-1.30.2/boost/mem_fn.hpp	Tue Jul 25 14:47:06 2006
-***************
-*** 5,10 ****
---- 5,17 ----
-  #pragma once
-  #endif
-  
-+ #if defined(_MSC_VER) && !defined(BOOST_MEM_FN_ENABLE_CDECL)
-+ // enable support for __cdecl (SAL_CALL) C++-UNO interface methods;
-+ // makes sense to shift this to command line some day:
-+ // -DBOOST_MEM_FN_ENABLE_CDECL
-+ #define BOOST_MEM_FN_ENABLE_CDECL
-+ #endif
-+ 
-  //
-  //  mem_fn.hpp - a generalization of std::mem_fun[_ref]
-  //
-***************
-*** 46,51 ****
---- 53,70 ----
-  #undef BOOST_MEM_FN_CC
-  #undef BOOST_MEM_FN_NAME
-  
-+ #ifdef BOOST_MEM_FN_ENABLE_CDECL
-+ 
-+ #define BOOST_MEM_FN_NAME(X) inner_##X##_cdecl
-+ #define BOOST_MEM_FN_CC __cdecl
-+ 
-+ #include <boost/bind/mem_fn_template.hpp>
-+ 
-+ #undef BOOST_MEM_FN_CC
-+ #undef BOOST_MEM_FN_NAME
-+ 
-+ #endif
-+ 
-  #ifdef BOOST_MEM_FN_ENABLE_STDCALL
-  
-  #define BOOST_MEM_FN_NAME(X) inner_##X##_stdcall
-***************
-*** 87,92 ****
---- 106,123 ----
-  #undef BOOST_MEM_FN_CC
-  #undef BOOST_MEM_FN_NAME
-  
-+ #ifdef BOOST_MEM_FN_ENABLE_CDECL
-+ 
-+ #define BOOST_MEM_FN_NAME(X) inner_##X##_cdecl
-+ #define BOOST_MEM_FN_CC __cdecl
-+ 
-+ #include <boost/bind/mem_fn_template.hpp>
-+ 
-+ #undef BOOST_MEM_FN_CC
-+ #undef BOOST_MEM_FN_NAME
-+ 
-+ #endif
-+ 
-  #ifdef BOOST_MEM_FN_ENABLE_STDCALL
-  
-  #define BOOST_MEM_FN_NAME(X) inner_##X##_stdcall
-***************
-*** 128,133 ****
---- 159,178 ----
-  #undef BOOST_MEM_FN_NAME2
-  #undef BOOST_MEM_FN_CC
-  
-+ #ifdef BOOST_MEM_FN_ENABLE_CDECL
-+ 
-+ #define BOOST_MEM_FN_NAME(X) X##_cdecl
-+ #define BOOST_MEM_FN_NAME2(X) inner_##X##_cdecl
-+ #define BOOST_MEM_FN_CC __cdecl
-+ 
-+ #include <boost/bind/mem_fn_vw.hpp>
-+ 
-+ #undef BOOST_MEM_FN_NAME
-+ #undef BOOST_MEM_FN_NAME2
-+ #undef BOOST_MEM_FN_CC
-+ 
-+ #endif
-+ 
-  #ifdef BOOST_MEM_FN_ENABLE_STDCALL
-  
-  #define BOOST_MEM_FN_NAME(X) X##_stdcall
-***************
-*** 176,181 ****
---- 221,238 ----
-  #undef BOOST_MEM_FN_CC
-  #undef BOOST_MEM_FN_NAME
-  
-+ #ifdef BOOST_MEM_FN_ENABLE_CDECL
-+ 
-+ #define BOOST_MEM_FN_NAME(X) X##_cdecl
-+ #define BOOST_MEM_FN_CC __cdecl
-+ 
-+ #include <boost/bind/mem_fn_template.hpp>
-+ 
-+ #undef BOOST_MEM_FN_CC
-+ #undef BOOST_MEM_FN_NAME
-+ 
-+ #endif
-+ 
-  #ifdef BOOST_MEM_FN_ENABLE_STDCALL
-  
-  #define BOOST_MEM_FN_NAME(X) X##_stdcall
-***************
-*** 217,222 ****
---- 274,291 ----
-  #undef BOOST_MEM_FN_NAME
-  #undef BOOST_MEM_FN_CC
-  
-+ #ifdef BOOST_MEM_FN_ENABLE_CDECL
-+ 
-+ #define BOOST_MEM_FN_NAME(X) X##_cdecl
-+ #define BOOST_MEM_FN_CC __cdecl
-+ 
-+ #include <boost/bind/mem_fn_cc.hpp>
-+ 
-+ #undef BOOST_MEM_FN_NAME
-+ #undef BOOST_MEM_FN_CC
-+ 
-+ #endif
-+ 
-  #ifdef BOOST_MEM_FN_ENABLE_STDCALL
-  
-  #define BOOST_MEM_FN_NAME(X) X##_stdcall
-*** misc/build/boost-1.30.2/boost/function/function_base.hpp	Fri Jul 18 06:04:54 2003
---- misc/modified/boost-1.30.2/boost/function/function_base.hpp	Thu Aug 10 11:17:30 2006
-***************
-*** 16,21 ****
---- 16,26 ----
-  #ifndef BOOST_FUNCTION_BASE_HEADER
-  #define BOOST_FUNCTION_BASE_HEADER
-  
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ #endif
-+ 
-  #include <stdexcept>
-  #include <string>
-  #include <memory>
-***************
-*** 413,416 ****
---- 418,425 ----
-  } // end namespace detail
-  } // end namespace boost
-  
-+ #if defined _MSC_VER
-+ #pragma warning(pop)
-+ #endif
-+ 
-  #endif // BOOST_FUNCTION_BASE_HEADER
-*** misc/build/boost-1.30.2/boost/iterator_adaptors.hpp	Fri Dec 27 17:51:52 2002
---- misc/modified/boost-1.30.2/boost/iterator_adaptors.hpp	Thu Aug 10 11:33:04 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/build/boost-1.30.2/boost/mpl/aux_/ice_cast.hpp	Tue Feb  4 21:21:05 2003
---- misc/modified/boost-1.30.2/boost/mpl/aux_/ice_cast.hpp	Thu Aug 10 11:17:20 2006
-***************
-*** 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/build/boost-1.30.2/boost/mpl/aux_/integral_wrapper.hpp	Thu Mar 13 13:13:32 2003
---- misc/modified/boost-1.30.2/boost/mpl/aux_/integral_wrapper.hpp	Thu Aug 10 11:17:06 2006
-***************
-*** 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/build/boost-1.30.2/boost/mpl/aux_/lambda_support.hpp	Sat Mar  8 08:10:07 2003
---- misc/modified/boost-1.30.2/boost/mpl/aux_/lambda_support.hpp	Thu Aug 10 11:16:54 2006
-***************
-*** 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/build/boost-1.30.2/boost/mpl/aux_/logical_op.hpp	Wed Feb 26 00:10:54 2003
---- misc/modified/boost-1.30.2/boost/mpl/aux_/logical_op.hpp	Thu Aug 10 11:16:40 2006
-***************
-*** 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/build/boost-1.30.2/boost/mpl/if.hpp	Thu Mar 13 13:13:29 2003
---- misc/modified/boost-1.30.2/boost/mpl/if.hpp	Thu Aug 10 11:16:06 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
-  } // namespace boost
-  
-+ #if defined _MSC_VER
-+ #pragma warning(pop)
-+ #endif
-+ 
-  #endif // BOOST_MPL_IF_HPP_INCLUDED
-*** misc/build/boost-1.30.2/boost/mpl/integral_c.hpp	Thu Mar 13 13:13:29 2003
---- misc/modified/boost-1.30.2/boost/mpl/integral_c.hpp	Thu Aug 10 11:15:52 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/build/boost-1.30.2/boost/mpl/integral_c_fwd.hpp	Thu Mar 13 13:13:30 2003
---- misc/modified/boost-1.30.2/boost/mpl/integral_c_fwd.hpp	Thu Aug 10 11:15:36 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/build/boost-1.30.2/boost/mpl/is_sequence.hpp	Wed Feb 26 00:10:43 2003
---- misc/modified/boost-1.30.2/boost/mpl/is_sequence.hpp	Thu Aug 10 11:15:14 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/build/boost-1.30.2/boost/mpl/sequence_tag.hpp	Mon Feb 24 01:50:53 2003
---- misc/modified/boost-1.30.2/boost/mpl/sequence_tag.hpp	Thu Aug 10 11:14:58 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
-
-*** misc/build/boost-1.30.2/boost/token_functions.hpp	2007-05-20 07:38:11.000000000 -0400
---- misc/modified/boost-1.30.2/boost/token_functions.hpp	2007-05-20 08:05:05.000000000 -0400
-***************
-*** 64,70 ****
-    // character (backslash \), can be assigned to other characters.
-  
-    struct escaped_list_error : public std::runtime_error{
-!     escaped_list_error(const std::string& what):std::runtime_error(what) { }
-    };
-    
-  
---- 64,70 ----
-    // character (backslash \), can be assigned to other characters.
-  
-    struct escaped_list_error : public std::runtime_error{
-!     escaped_list_error(const std::string& s_what) : std::runtime_error(s_what) { }
-    };
-    
-  
-*** misc/build/boost-1.30.2/boost/token_iterator.hpp	2007-05-20 07:38:10.000000000 -0400
---- misc/modified/boost-1.30.2/boost/token_iterator.hpp	2007-05-20 08:10:20.000000000 -0400
-***************
-*** 64,72 ****
-              
-              template<class Iterator>
-                  typename Iterator::reference
-!                 dereference(const Iterator& a) const{
-                  using namespace std;
-!                 assert(a.base().valid_);
-                  return tok_;
-              }   
-              template <class Iterator>
---- 64,72 ----
-              
-              template<class Iterator>
-                  typename Iterator::reference
-!                 dereference(const Iterator& iter ) const{
-                  using namespace std;
-!                 (void)iter; assert(iter.base().valid_);
-                  return tok_;
-              }   
-              template <class Iterator>
diff --git a/boost/boost_1_34_1.patch b/boost/boost_1_34_1.patch
deleted file mode 100644
index 6f0c79abff1e..000000000000
--- a/boost/boost_1_34_1.patch
+++ /dev/null
@@ -1,260 +0,0 @@
---- misc/boost_1_34_1/boost/config/compiler/visualc.hpp	2006-01-13 10:48:08.000000000 +0000
-+++ misc/build/boost_1_34_1/boost/config/compiler/visualc.hpp	2008-12-03 13:54:01.000000000 +0000
-@@ -108,6 +108,9 @@
- #  define BOOST_DISABLE_WIN32
- #endif
- 
-+// disable WORKAROUND macro - gives warning for undefined macros
-+#define BOOST_STRICT_CONFIG
-+
- //
- // all versions support __declspec:
- //
---- misc/boost_1_34_1/boost/mpl/apply.hpp	2004-09-02 16:40:41.000000000 +0100
-+++ misc/build/boost_1_34_1/boost/mpl/apply.hpp	2008-12-03 13:54:01.000000000 +0000
-@@ -135,7 +135,8 @@
- 
- ///// iteration, depth == 1
- 
--#elif BOOST_PP_ITERATION_DEPTH() == 1
-+#else
-+#if BOOST_PP_ITERATION_DEPTH() == 1
- 
- #   define i_ BOOST_PP_FRAME_ITERATION(1)
- 
-@@ -222,4 +223,5 @@
- 
- #   undef i_
- 
-+#endif
- #endif // BOOST_PP_IS_ITERATING
---- misc/boost_1_34_1/boost/mpl/apply_wrap.hpp	2004-09-03 16:56:55.000000000 +0100
-+++ misc/build/boost_1_34_1/boost/mpl/apply_wrap.hpp	2008-12-03 13:54:01.000000000 +0000
-@@ -78,7 +78,8 @@
- 
- ///// iteration, depth == 1
- 
--#elif BOOST_PP_ITERATION_DEPTH() == 1
-+#else
-+#if BOOST_PP_ITERATION_DEPTH() == 1
- 
- #   define i_ BOOST_PP_FRAME_ITERATION(1)
- 
-@@ -169,8 +170,8 @@
- #   undef i_
- 
- ///// iteration, depth == 2
--
--#elif BOOST_PP_ITERATION_DEPTH() == 2
-+#else
-+#if BOOST_PP_ITERATION_DEPTH() == 2
- 
- #   define j_ BOOST_PP_FRAME_ITERATION(2)
- 
-@@ -197,4 +198,6 @@
- 
- #   undef j_
- 
-+#endif
-+#endif
- #endif // BOOST_PP_IS_ITERATING
---- misc/boost_1_34_1/boost/mpl/aux_/full_lambda.hpp	2004-09-04 02:10:19.000000000 +0100
-+++ misc/build/boost_1_34_1/boost/mpl/aux_/full_lambda.hpp	2008-12-03 13:54:01.000000000 +0000
-@@ -227,7 +227,8 @@
- 
- ///// iteration, depth == 1
- 
--#elif BOOST_PP_ITERATION_DEPTH() == 1
-+#else
-+#if BOOST_PP_ITERATION_DEPTH() == 1
- #define i_ BOOST_PP_FRAME_ITERATION(1)
- 
- #if i_ > 0
-@@ -347,4 +348,5 @@
- };
- 
- #undef i_
-+#endif
- #endif // BOOST_PP_IS_ITERATING
---- misc/boost_1_34_1/boost/mpl/aux_/numeric_op.hpp	2005-08-25 17:27:21.000000000 +0100
-+++ misc/build/boost_1_34_1/boost/mpl/aux_/numeric_op.hpp	2008-12-03 13:54:01.000000000 +0000
-@@ -287,7 +287,8 @@
- 
- ///// iteration, depth == 1
- 
--#elif BOOST_PP_ITERATION_DEPTH() == 1
-+#else
-+#if BOOST_PP_ITERATION_DEPTH() == 1
- 
- #   define i_ BOOST_PP_FRAME_ITERATION(1)
- 
-@@ -308,4 +309,5 @@
- 
- #   undef i_
- 
-+#endif
- #endif // BOOST_PP_IS_ITERATING
---- misc/boost_1_34_1/boost/mpl/bind.hpp	2004-10-26 15:51:04.000000000 +0100
-+++ misc/build/boost_1_34_1/boost/mpl/bind.hpp	2008-12-03 13:54:01.000000000 +0000
-@@ -361,7 +361,8 @@
- 
- ///// iteration, depth == 1
- 
--#elif BOOST_PP_ITERATION_DEPTH() == 1
-+#else
-+#if BOOST_PP_ITERATION_DEPTH() == 1
- 
- #   define i_ BOOST_PP_FRAME_ITERATION(1)
- 
-@@ -528,7 +529,8 @@
- 
- ///// iteration, depth == 2
- 
--#elif BOOST_PP_ITERATION_DEPTH() == 2
-+#else
-+#if BOOST_PP_ITERATION_DEPTH() == 2
- 
- #   define j_ BOOST_PP_FRAME_ITERATION(2)
- #   if !defined(BOOST_MPL_CFG_NO_UNNAMED_PLACEHOLDER_SUPPORT)
-@@ -544,4 +546,6 @@
- #   endif
- #   undef j_
- 
-+#endif
-+#endif
- #endif // BOOST_PP_IS_ITERATING
---- misc/boost_1_34_1/boost/spirit/core/impl/match.ipp	2004-07-14 15:24:02.000000000 +0100
-+++ misc/build/boost_1_34_1/boost/spirit/core/impl/match.ipp	2008-12-03 13:54:01.000000000 +0000
-@@ -17,12 +17,12 @@
-     : len(-1), val() {}
- 
-     template <typename T>
--    inline match<T>::match(std::size_t length)
--    : len(length), val() {}
-+    inline match<T>::match(std::size_t _length)
-+    : len(_length), val() {}
- 
-     template <typename T>
--    inline match<T>::match(std::size_t length, ctor_param_t val_)
--    : len(length), val(val_) {}
-+    inline match<T>::match(std::size_t _length, ctor_param_t val_)
-+    : len(_length), val(val_) {}
- 
-     template <typename T>
-     inline bool
-@@ -64,11 +64,11 @@
-     inline match<nil_t>::match()
-     : len(-1) {}
- 
--    inline match<nil_t>::match(std::size_t length)
--    : len(length) {}
-+    inline match<nil_t>::match(std::size_t _length)
-+    : len(_length) {}
- 
--    inline match<nil_t>::match(std::size_t length, nil_t)
--    : len(length) {}
-+    inline match<nil_t>::match(std::size_t _length, nil_t)
-+    : len(_length) {}
- 
-     inline bool
-     match<nil_t>::operator!() const
---- misc/boost_1_34_1/boost/spirit/core/non_terminal/impl/rule.ipp	2004-07-09 09:28:02.000000000 +0100
-+++ misc/build/boost_1_34_1/boost/spirit/core/non_terminal/impl/rule.ipp	2008-12-03 13:54:01.000000000 +0000
-@@ -224,7 +224,7 @@
-         template <typename ParserT, typename ScannerT, typename AttrT>
-         struct concrete_parser : abstract_parser<ScannerT, AttrT>
-         {
--            concrete_parser(ParserT const& p) : p(p) {}
-+            concrete_parser(ParserT const& _p) : p(_p) {}
-             virtual ~concrete_parser() {}
- 
-             virtual typename match_result<ScannerT, AttrT>::type
---- misc/boost_1_34_1/boost/spirit/core/non_terminal/parser_id.hpp	2005-01-17 01:01:52.000000000 +0000
-+++ misc/build/boost_1_34_1/boost/spirit/core/non_terminal/parser_id.hpp	2008-12-03 13:54:01.000000000 +0000
-@@ -104,7 +104,7 @@
-                 : parser_id(reinterpret_cast<std::size_t>(this)); 
-         }
- 
--        void set_id(parser_id id) { tag = id; } 
-+        void set_id(parser_id _id) { tag = _id; } 
-         
-     private:
-     
---- misc/boost_1_34_1/boost/spirit/core/non_terminal/rule.hpp	2004-07-09 09:28:01.000000000 +0100
-+++ misc/build/boost_1_34_1/boost/spirit/core/non_terminal/rule.hpp	2008-12-03 13:54:01.000000000 +0000
-@@ -157,8 +157,8 @@
-             return ptr.get();
-         }
- 
--        rule(abstract_parser_t const* ptr)
--        : ptr(ptr) {}
-+        rule(abstract_parser_t const* _ptr)
-+        : ptr(_ptr) {}
- 
-         scoped_ptr<abstract_parser_t> ptr;
-     };
---- misc/boost_1_34_1/boost/spirit/core/non_terminal/subrule.hpp	2006-02-08 23:05:38.000000000 +0000
-+++ misc/build/boost_1_34_1/boost/spirit/core/non_terminal/subrule.hpp	2008-12-03 13:54:01.000000000 +0000
-@@ -208,7 +208,7 @@
-             subrule_list<
-                 subrule_parser<ID2, DefT2, ContextT2>,
-                 nil_t> >
--        operator,(subrule_parser<ID2, DefT2, ContextT2> const& rhs) const
-+        operator,(subrule_parser<ID2, DefT2, ContextT2> const& _rhs) const
-         {
-             return subrule_list<
-                 self_t,
-@@ -218,7 +218,7 @@
-                         *this,
-                         subrule_list<
-                             subrule_parser<ID2, DefT2, ContextT2>, nil_t>(
--                                rhs, nil_t()));
-+                                _rhs, nil_t()));
-         }
- 
-         typename DefT::embed_t rhs;
-@@ -256,10 +256,10 @@
-         parse_main(ScannerT const& scan) const
-         {
-             typedef typename parser_result<self_t, ScannerT>::type result_t;
--            result_t result;
-+            result_t _result;
-             impl::parse_subrule<result_t, ScannerT, ID>::
--                do_(result, scan);
--            return result;
-+                do_(_result, scan);
-+            return _result;
-         }
- 
-         template <typename ScannerT>
---- misc/boost_1_34_1/boost/spirit/core/scanner/scanner.hpp	2006-02-08 23:05:39.000000000 +0000
-+++ misc/build/boost_1_34_1/boost/spirit/core/scanner/scanner.hpp	2008-12-03 13:54:01.000000000 +0000
-@@ -242,22 +242,22 @@
-         bool
-         at_end() const
-         {
--            typedef typename PoliciesT::iteration_policy_t iteration_policy_t;
--            return iteration_policy_t::at_end(*this);
-+            typedef typename PoliciesT::iteration_policy_t _iteration_policy_t;
-+            return _iteration_policy_t::at_end(*this);
-         }
- 
-         value_t
-         operator*() const
-         {
--            typedef typename PoliciesT::iteration_policy_t iteration_policy_t;
--            return iteration_policy_t::filter(iteration_policy_t::get(*this));
-+            typedef typename PoliciesT::iteration_policy_t _iteration_policy_t;
-+            return _iteration_policy_t::filter(_iteration_policy_t::get(*this));
-         }
- 
-         scanner const&
-         operator++() const
-         {
--            typedef typename PoliciesT::iteration_policy_t iteration_policy_t;
--            iteration_policy_t::advance(*this);
-+            typedef typename PoliciesT::iteration_policy_t _iteration_policy_t;
-+            _iteration_policy_t::advance(*this);
-             return *this;
-         }
- 
diff --git a/boost/boost_1_39_0.patch b/boost/boost_1_39_0.patch
new file mode 100644
index 000000000000..d2ad9fc7db9f
--- /dev/null
+++ b/boost/boost_1_39_0.patch
@@ -0,0 +1,183 @@
+--- misc/boost_1_39_0/boost/function/function_template.hpp	2008-10-16 15:21:50.000000000 +0200
++++ misc/build/boost_1_39_0/boost/function/function_template.hpp	2009-07-09 12:58:51.141224220 +0200
+@@ -950,10 +950,10 @@
+           f.vtable->manager(f.functor, this->functor,
+                             boost::detail::function::move_functor_tag);
+ 		  f.vtable = 0;
+-#if !defined(BOOST_NO_EXCEPTIONS)      
+         } else {
+           clear();
+         }
++#if !defined(BOOST_NO_EXCEPTIONS)      
+       } catch (...) {
+         vtable = 0;
+         throw;
+--- misc/boost_1_39_0/boost/function/function_base.hpp	2008-10-16 15:21:50.000000000 +0200
++++ misc/build/boost_1_39_0/boost/function/function_base.hpp	2009-07-12 21:42:22.779873909 +0200
+@@ -42,7 +42,7 @@
+ #endif       
+ 
+ // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info.
+-#ifdef BOOST_NO_EXCEPTION_STD_NAMESPACE
++#ifdef BOOST_NO_STD_TYPEINFO
+ // Embedded VC++ does not have type_info in namespace std
+ #  define BOOST_FUNCTION_STD_NS
+ #else
+--- misc/boost_1_39_0/boost/config/compiler/visualc.hpp	2009-03-26 20:00:00.000000000 +0100
++++ misc/build/boost_1_39_0/boost/config/compiler/visualc.hpp	2009-06-10 21:53:42.484375000 +0200
+@@ -138,6 +138,9 @@
+ #  define BOOST_NO_RTTI
+ #endif
+ 
++// disable WORKAROUND macro - gives warning for undefined macros
++#define BOOST_STRICT_CONFIG 1
++
+ //
+ // all versions support __declspec:
+ //
+--- misc/boost_1_39_0/boost/mpl/apply_wrap.hpp	2008-10-11 08:50:46.000000000 +0200
++++ misc/build/boost_1_39_0/boost/mpl/apply_wrap.hpp	2009-06-10 21:53:42.500000000 +0200
+@@ -173,8 +173,8 @@
+ #   undef i_
+ 
+ ///// iteration, depth == 2
+-
+-#elif BOOST_PP_ITERATION_DEPTH() == 2
++#else
++#if BOOST_PP_ITERATION_DEPTH() == 2
+ 
+ #   define j_ BOOST_PP_FRAME_ITERATION(2)
+ 
+@@ -230,4 +231,5 @@
+ #   undef j_
+ 
+ #endif // BOOST_PP_ITERATION_DEPTH()
++#endif
+ #endif // BOOST_PP_IS_ITERATING
+--- misc/boost_1_39_0/boost/mpl/bind.hpp	2008-10-11 08:19:02.000000000 +0200
++++ misc/build/boost_1_39_0/boost/mpl/bind.hpp	2009-06-10 21:53:42.515625000 +0200
+@@ -531,7 +531,8 @@
+ 
+ ///// iteration, depth == 2
+ 
+-#elif BOOST_PP_ITERATION_DEPTH() == 2
++#else
++#if BOOST_PP_ITERATION_DEPTH() == 2
+ 
+ #   define j_ BOOST_PP_FRAME_ITERATION(2)
+ #   if !defined(BOOST_MPL_CFG_NO_UNNAMED_PLACEHOLDER_SUPPORT)
+@@ -548,4 +549,5 @@
+ #   undef j_
+ 
+ #endif // BOOST_PP_ITERATION_DEPTH()
++#endif
+ #endif // BOOST_PP_IS_ITERATING
+--- misc/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp	2008-06-22 17:05:38.000000000 +0200
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/impl/match.ipp	2009-06-10 21:53:42.531250000 +0200
+@@ -19,12 +19,12 @@
+     : len(-1), val() {}
+ 
+     template <typename T>
+-    inline match<T>::match(std::size_t length)
+-    : len(length), val() {}
++    inline match<T>::match(std::size_t _length)
++    : len(_length), val() {}
+ 
+     template <typename T>
+-    inline match<T>::match(std::size_t length, ctor_param_t val_)
+-    : len(length), val(val_) {}
++    inline match<T>::match(std::size_t _length, ctor_param_t val_)
++    : len(_length), val(val_) {}
+ 
+     template <typename T>
+     inline bool
+@@ -66,11 +66,11 @@
+     inline match<nil_t>::match()
+     : len(-1) {}
+ 
+-    inline match<nil_t>::match(std::size_t length)
+-    : len(length) {}
++    inline match<nil_t>::match(std::size_t _length)
++    : len(_length) {}
+ 
+-    inline match<nil_t>::match(std::size_t length, nil_t)
+-    : len(length) {}
++    inline match<nil_t>::match(std::size_t _length, nil_t)
++    : len(_length) {}
+ 
+     inline bool
+     match<nil_t>::operator!() const
+--- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp	2008-06-22 17:05:38.000000000 +0200
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/impl/rule.ipp	2009-06-10 21:53:42.546875000 +0200
+@@ -226,7 +226,7 @@
+         template <typename ParserT, typename ScannerT, typename AttrT>
+         struct concrete_parser : abstract_parser<ScannerT, AttrT>
+         {
+-            concrete_parser(ParserT const& p) : p(p) {}
++            concrete_parser(ParserT const& _p) : p(_p) {}
+             virtual ~concrete_parser() {}
+ 
+             virtual typename match_result<ScannerT, AttrT>::type
+--- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp	2008-06-22 17:05:38.000000000 +0200
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/parser_id.hpp	2009-06-10 21:53:42.562500000 +0200
+@@ -106,7 +106,7 @@
+                 : parser_id(reinterpret_cast<std::size_t>(this)); 
+         }
+ 
+-        void set_id(parser_id id) { tag = id; } 
++        void set_id(parser_id _id) { tag = _id; } 
+         
+     private:
+     
+--- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp	2008-06-22 17:05:38.000000000 +0200
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/rule.hpp	2009-07-08 22:23:45.899895415 +0200
+@@ -159,11 +159,11 @@
+             return ptr.get();
+         }
+ 
+-        rule(abstract_parser_t* ptr)
+-        : ptr(ptr) {}
++        rule(abstract_parser_t* _ptr)
++        : ptr(_ptr) {}
+ 
+-        rule(abstract_parser_t const* ptr)
+-        : ptr(ptr) {}
++        rule(abstract_parser_t const* _ptr)
++        : ptr(_ptr) {}
+ 
+         scoped_ptr<abstract_parser_t> ptr;
+     };
+--- misc/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp	2008-06-22 17:05:38.000000000 +0200
++++ misc/build/boost_1_39_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp	2009-06-10 21:53:42.593750000 +0200
+@@ -210,7 +210,7 @@
+             subrule_list<
+                 subrule_parser<ID2, DefT2, ContextT2>,
+                 nil_t> >
+-        operator,(subrule_parser<ID2, DefT2, ContextT2> const& rhs) const
++        operator,(subrule_parser<ID2, DefT2, ContextT2> const& _rhs) const
+         {
+             return subrule_list<
+                 self_t,
+@@ -220,7 +220,7 @@
+                         *this,
+                         subrule_list<
+                             subrule_parser<ID2, DefT2, ContextT2>, nil_t>(
+-                                rhs, nil_t()));
++                                _rhs, nil_t()));
+         }
+ 
+         typename DefT::embed_t rhs;
+@@ -258,10 +258,10 @@
+         parse_main(ScannerT const& scan) const
+         {
+             typedef typename parser_result<self_t, ScannerT>::type result_t;
+-            result_t result;
++            result_t _result;
+             impl::parse_subrule<result_t, ScannerT, ID>::
+-                do_(result, scan);
+-            return result;
++                do_(_result, scan);
++            return _result;
+         }
+ 
+         template <typename ScannerT>
diff --git a/boost/makefile.mk b/boost/makefile.mk
index 7f5e5b4c5441..e58e8939a09e 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -35,7 +35,7 @@
 
 PRJ=.
 
-PRJNAME=ooo_boost
+PRJNAME=boost
 TARGET=ooo_boost
 
 # --- Settings -----------------------------------------------------
@@ -52,19 +52,9 @@ all:
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=boost-1.30.2
+TARFILE_NAME=boost_1_39_0
 PATCH_FILES=$(TARFILE_NAME).patch
 
-.IF "$(COMID)"=="gcc3"
-
-# enabled for gcc4.x
-.IF "$(CCNUMVER)">="000400000000" 
-  TARFILE_NAME=boost_1_34_1
-  PATCH_FILES=$(TARFILE_NAME).patch
-.ENDIF
-
-.ENDIF
-
 CONFIGURE_DIR=
 CONFIGURE_ACTION=
 
@@ -78,4 +68,41 @@ BUILD_FLAGS=
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
 
+# --- post-build ---------------------------------------------------
+
+# "normalize" the output structure, in that the C++ headers are
+# copied to the canonic location in OUTPATH
+# The allows, later on, to use the standard mechanisms to deliver those
+# files, instead of delivering them out of OUTPATH/misc/build/..., which
+# could cause problems
+
+NORMALIZE_FLAG_FILE=so_normalized_$(TARGET)
+
+$(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
+    -@$(MKDIRHIER) $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.h $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/*.hpp $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/bind $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/config $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/detail $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/exception $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/function $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/iterator $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpl $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/numeric $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/optional $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pending $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/pool $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/preprocessor $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/spirit $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/smart_ptr $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/tuple $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/type_traits $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/utility $(INCCOM)$/$(PRJNAME)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/variant $(INCCOM)$/$(PRJNAME)
+    @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
+
+normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
+
+$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize
 .ENDIF			# "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || "$(COM)"=="GCC")
diff --git a/boost/prj/build.lst b/boost/prj/build.lst
index 50762576e06d..421265b927f7 100644
--- a/boost/prj/build.lst
+++ b/boost/prj/build.lst
@@ -1,4 +1,3 @@
 bo      boost : SO:so_prereq solenv NULL
 bo      boost           usr1    -       all     bo_mkout NULL
 bo      boost           nmake   -       all     bo_boost NULL
-bo      boost\spirit    nmake   -       all     bo_spirit NULL
diff --git a/boost/prj/d.lst b/boost/prj/d.lst
index 8c17a2800a4b..1db88f339a85 100644
--- a/boost/prj/d.lst
+++ b/boost/prj/d.lst
@@ -1,390 +1,300 @@
 mkdir: %_DEST%\inc%_EXT%\boost
-
-..\%__SRC%\misc\build\boost-1.30.2\boost\rational.hpp %_DEST%\inc%_EXT%\boost\rational.hpp
-..\%__SRC%\misc\build\boost-1.30.2\boost\operators.hpp %_DEST%\inc%_EXT%\boost\operators.hpp
-..\%__SRC%\misc\build\boost-1.30.2\boost\tokenizer.hpp %_DEST%\inc%_EXT%\boost\tokenizer.hpp
-..\%__SRC%\misc\build\boost-1.30.2\boost\token_iterator.hpp %_DEST%\inc%_EXT%\boost\token_iterator.hpp
-..\%__SRC%\misc\build\boost-1.30.2\boost\token_functions.hpp %_DEST%\inc%_EXT%\boost\token_functions.hpp
-..\%__SRC%\misc\build\boost-1.30.2\boost\enable_shared_from_this.hpp %_DEST%\inc%_EXT%\boost\enable_shared_from_this.hpp
-..\%__SRC%\misc\build\boost-1.30.2\boost\array.hpp %_DEST%\inc%_EXT%\boost\array.hpp
-
-..\%__SRC%\misc\build\boost-1.30.2\boost\cast.hpp %_DEST%\inc%_EXT%\boost\cast.hpp
-..\%__SRC%\misc\build\boost-1.30.2\boost\enable_shared_from_this.hpp %_DEST%\inc%_EXT%\boost\enable_shared_from_this.hpp
-
-..\%__SRC%\misc\build\boost-1.30.2\boost\function.hpp %_DEST%\inc%_EXT%\boost\function.hpp
-mkdir: %_DEST%\inc%_EXT%\boost\function
-..\%__SRC%\misc\build\boost-1.30.2\boost\function\*.*pp %_DEST%\inc%_EXT%\boost\function\*.*pp
-mkdir: %_DEST%\inc%_EXT%\boost\function\detail
-..\%__SRC%\misc\build\boost-1.30.2\boost\function\detail\*.*pp %_DEST%\inc%_EXT%\boost\function\detail\*.*pp
-mkdir: %_DEST%\inc%_EXT%\boost\pending
-..\%__SRC%\misc\build\boost-1.30.2\boost\pending\ct_if.hpp %_DEST%\inc%_EXT%\boost\pending\ct_if.hpp
-
-..\%__SRC%\misc\build\boost-1.30.2\boost\mem_fn.hpp %_DEST%\inc%_EXT%\boost\mem_fn.hpp
-..\%__SRC%\misc\build\boost-1.30.2\boost\get_pointer.hpp %_DEST%\inc%_EXT%\boost\get_pointer.hpp
-..\%__SRC%\misc\build\boost-1.30.2\boost\bind.hpp %_DEST%\inc%_EXT%\boost\bind.hpp
 mkdir: %_DEST%\inc%_EXT%\boost\bind
-..\%__SRC%\misc\build\boost-1.30.2\boost\bind\*.*pp %_DEST%\inc%_EXT%\boost\bind\*.*pp
-
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\*.*pp %_DEST%\inc%_EXT%\boost\*.*pp
-
 mkdir: %_DEST%\inc%_EXT%\boost\config
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\config\*.*pp %_DEST%\inc%_EXT%\boost\config\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\config\compiler
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\config\compiler\*.*pp %_DEST%\inc%_EXT%\boost\config\compiler\*.*pp
+mkdir: %_DEST%\inc%_EXT%\boost\config\no_tr1
 mkdir: %_DEST%\inc%_EXT%\boost\config\platform
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\config\platform\*.*pp %_DEST%\inc%_EXT%\boost\config\platform\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\config\stdlib
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\config\stdlib\*.*pp %_DEST%\inc%_EXT%\boost\config\stdlib\*.*pp
-
 mkdir: %_DEST%\inc%_EXT%\boost\detail
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\detail\*.*pp %_DEST%\inc%_EXT%\boost\detail\*.*pp
-
+mkdir: %_DEST%\inc%_EXT%\boost\function
+mkdir: %_DEST%\inc%_EXT%\boost\function\detail
+mkdir: %_DEST%\inc%_EXT%\boost\iterator
+mkdir: %_DEST%\inc%_EXT%\boost\iterator\detail
+mkdir: %_DEST%\inc%_EXT%\boost\exception
+mkdir: %_DEST%\inc%_EXT%\boost\exception\detail
+mkdir: %_DEST%\inc%_EXT%\boost\function
 mkdir: %_DEST%\inc%_EXT%\boost\mpl
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\*.*pp %_DEST%\inc%_EXT%\boost\mpl\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\config
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\config\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\config\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\bcc\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc551
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\bcc551\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc551\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\gcc
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\gcc\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\gcc\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc60
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\msvc60\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc60\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc70
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\msvc70\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc70\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\mwcw
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\mwcw\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\mwcw\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ctps
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\no_ctps\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ctps\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ttp
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\no_ttp\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ttp\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\plain
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessed\plain\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\plain\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessor
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\preprocessor\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessor\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\aux_\range_c
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\aux_\range_c\*.*pp %_DEST%\inc%_EXT%\boost\mpl\aux_\range_c\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\limits
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\limits\*.*pp %_DEST%\inc%_EXT%\boost\mpl\limits\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\list
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\list\*.*pp %_DEST%\inc%_EXT%\boost\mpl\list\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\list\aux_
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\list\aux_\*.*pp %_DEST%\inc%_EXT%\boost\mpl\list\aux_\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\list\aux_\preprocessed\*.*pp %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed\plain
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\list\aux_\preprocessed\plain\*.*pp %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed\plain\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\math
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\math\*.*pp %_DEST%\inc%_EXT%\boost\mpl\math\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\vector\*.*pp %_DEST%\inc%_EXT%\boost\mpl\vector\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\vector\aux_\*.*pp %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\vector\aux_\preprocessed\*.*pp %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\no_ctps
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\vector\aux_\preprocessed\no_ctps\*.*pp %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\no_ctps\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\plain
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\vector\aux_\preprocessed\plain\*.*pp %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\plain\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\typeof_based
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\mpl\vector\aux_\preprocessed\typeof_based\*.*pp %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\typeof_based\*.*pp
-
+mkdir: %_DEST%\inc%_EXT%\boost\numeric
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\conversion
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\conversion\detail
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas
+mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas\detail
+mkdir: %_DEST%\inc%_EXT%\boost\optional
+mkdir: %_DEST%\inc%_EXT%\boost\pending
+mkdir: %_DEST%\inc%_EXT%\boost\pool
+mkdir: %_DEST%\inc%_EXT%\boost\pool\detail
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\arithmetic\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\arithmetic\detail\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\array
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\array\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\array\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\comparison
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\comparison\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\comparison\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\config
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\config\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\config\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\control
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\control\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\control\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\control\detail
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\control\detail\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\edg
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\control\detail\edg\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\edg\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\msvc
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\control\detail\msvc\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\msvc\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\debug
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\debug\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\debug\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\detail
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\detail\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\detail\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\facilities
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\facilities\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\facilities\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\iteration
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\iteration\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\iteration\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\iteration\detail\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\bounds
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\iteration\detail\bounds\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\bounds\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\iter
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\iteration\detail\iter\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\iter\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\list
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\list\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\list\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\list\detail
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\list\detail\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\list\detail\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\list\detail\edg
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\list\detail\edg\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\list\detail\edg\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\logical
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\logical\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\logical\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\punctuation
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\punctuation\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\punctuation\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\repetition
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\repetition\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\repetition\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\repetition\detail\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\edg
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\repetition\detail\edg\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\edg\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\msvc
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\repetition\detail\msvc\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\msvc\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\selection
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\selection\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\selection\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\seq
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\seq\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\seq\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\seq\detail
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\seq\detail\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\seq\detail\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\slot\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\slot\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\slot\detail\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\preprocessor\tuple
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\preprocessor\tuple\*.*pp %_DEST%\inc%_EXT%\boost\preprocessor\tuple\*.*pp
-
-mkdir: %_DEST%\inc%_EXT%\boost\type_traits
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\type_traits\*.*pp %_DEST%\inc%_EXT%\boost\type_traits\*.*pp
-mkdir: %_DEST%\inc%_EXT%\boost\type_traits\detail
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\type_traits\detail\*.*pp %_DEST%\inc%_EXT%\boost\type_traits\detail\*.*pp
-
-mkdir: %_DEST%\inc%_EXT%\boost\utility
-..\%__SRC%\misc\build\spirit-1.6.1\miniboost\boost\utility\*.*pp %_DEST%\inc%_EXT%\boost\utility\*.*pp
-
-
-..\%__SRC%\misc\build\spirit-1.6.1\boost\*.*pp %_DEST%\inc%_EXT%\boost\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\*.*pp %_DEST%\inc%_EXT%\boost\spirit\*.*pp
-
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\actor
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\attribute
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\attribute\*.*pp %_DEST%\inc%_EXT%\boost\spirit\attribute\*.*pp
-
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\core
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\composite
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\composite\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\composite\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\composite\impl
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\composite\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\composite\impl\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\impl
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\impl\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\meta
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\meta\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\meta\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\meta\impl
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\meta\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\meta\impl\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\non_terminal\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal\impl
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\non_terminal\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal\impl\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\primitives
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\primitives\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\primitives\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\primitives\impl
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\primitives\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\primitives\impl\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\scanner
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\scanner\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\scanner\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\core\scanner\impl
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\core\scanner\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\core\scanner\impl\*.*pp
-
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\debug
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\debug\*.*pp %_DEST%\inc%_EXT%\boost\spirit\debug\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\debug\impl
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\debug\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\debug\impl\*.*pp
-
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\dynamic
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\dynamic\*.*pp %_DEST%\inc%_EXT%\boost\spirit\dynamic\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\dynamic\impl
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\dynamic\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\dynamic\impl\*.*pp
-
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\error_handling
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\error_handling\*.*pp %_DEST%\inc%_EXT%\boost\spirit\error_handling\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\error_handling\impl
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\error_handling\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\error_handling\impl\*.*pp
-
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor\impl
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta\impl
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\impl
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner\impl
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\non_terminal
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\non_terminal\impl
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\primitives
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\primitives\impl
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite\impl
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling\impl
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator\impl
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl\chset
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\include
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\iterator
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\iterator\*.*pp %_DEST%\inc%_EXT%\boost\spirit\iterator\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\iterator\impl
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\iterator\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\iterator\impl\*.*pp
-
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\meta
+mkdir: %_DEST%\inc%_EXT%\boost\spirit\meta\impl
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\phoenix
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\phoenix\*.*pp %_DEST%\inc%_EXT%\boost\spirit\phoenix\*.*pp
-
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\symbols
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\symbols\*.*pp %_DEST%\inc%_EXT%\boost\spirit\symbols\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\symbols\impl
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\symbols\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\symbols\impl\*.*pp
-
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\tree
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\tree\*.*pp %_DEST%\inc%_EXT%\boost\spirit\tree\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\tree\impl
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\tree\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\tree\impl\*.*pp
-
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\utility
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\utility\*.*pp %_DEST%\inc%_EXT%\boost\spirit\utility\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\utility\impl
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\utility\impl\*.*pp %_DEST%\inc%_EXT%\boost\spirit\utility\impl\*.*pp
 mkdir: %_DEST%\inc%_EXT%\boost\spirit\utility\impl\chset
-..\%__SRC%\misc\build\spirit-1.6.1\boost\spirit\utility\impl\chset\*.*pp %_DEST%\inc%_EXT%\boost\spirit\utility\impl\chset\*.*pp
-
-mkdir: %_DEST%\inc%_EXT%\boost\pool
-..\%__SRC%\misc\build\boost-1.30.2\boost\pool\*.hpp %_DEST%\inc%_EXT%\boost\pool
-mkdir: %_DEST%\inc%_EXT%\boost\pool\detail
-..\%__SRC%\misc\build\boost-1.30.2\boost\pool\detail\*.hpp %_DEST%\inc%_EXT%\boost\pool\detail
-..\%__SRC%\misc\build\boost-1.30.2\boost\pool\detail\*.inc %_DEST%\inc%_EXT%\boost\pool\detail
-
+mkdir: %_DEST%\inc%_EXT%\boost\smart_ptr
+mkdir: %_DEST%\inc%_EXT%\boost\smart_ptr\detail
 mkdir: %_DEST%\inc%_EXT%\boost\tuple
-..\%__SRC%\misc\build\boost-1.30.2\boost\tuple\*.hpp %_DEST%\inc%_EXT%\boost\tuple
 mkdir: %_DEST%\inc%_EXT%\boost\tuple\detail
-..\%__SRC%\misc\build\boost-1.30.2\boost\tuple\detail\*.hpp %_DEST%\inc%_EXT%\boost\tuple\detail
-
-mkdir: %_DEST%\inc%_EXT%\boost\numeric
-mkdir: %_DEST%\inc%_EXT%\boost\numeric\conversion
-mkdir: %_DEST%\inc%_EXT%\boost\numeric\conversion\detail
-mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas
-mkdir: %_DEST%\inc%_EXT%\boost\numeric\ublas\detail
-..\%__SRC%\misc\build\boost-1.30.2\boost\numeric\ublas\*.hpp %_DEST%\inc%_EXT%\boost\numeric\ublas\*.hpp
-
-mkdir: %_DEST%\inc%_EXT%\boost\config\no_tr1
-mkdir: %_DEST%\inc%_EXT%\boost\optional
-
-..\%__SRC%\misc\build\boost_1_34_1\boost\* %_DEST%\inc%_EXT%\boost
-..\%__SRC%\misc\build\boost_1_34_1\boost\function\* %_DEST%\inc%_EXT%\boost\function
-..\%__SRC%\misc\build\boost_1_34_1\boost\function\detail\* %_DEST%\inc%_EXT%\boost\function\detail
-..\%__SRC%\misc\build\boost_1_34_1\boost\pending\* %_DEST%\inc%_EXT%\boost\pending
-..\%__SRC%\misc\build\boost_1_34_1\boost\bind\* %_DEST%\inc%_EXT%\boost\bind
-..\%__SRC%\misc\build\boost_1_34_1\boost\config\* %_DEST%\inc%_EXT%\boost\config
-..\%__SRC%\misc\build\boost_1_34_1\boost\config\compiler\* %_DEST%\inc%_EXT%\boost\config\compiler
-..\%__SRC%\misc\build\boost_1_34_1\boost\config\platform\* %_DEST%\inc%_EXT%\boost\config\platform
-..\%__SRC%\misc\build\boost_1_34_1\boost\config\stdlib\* %_DEST%\inc%_EXT%\boost\config\stdlib
-..\%__SRC%\misc\build\boost_1_34_1\boost\config\no_tr1\* %_DEST%\inc%_EXT%\boost\config\no_tr1
-..\%__SRC%\misc\build\boost_1_34_1\boost\detail\* %_DEST%\inc%_EXT%\boost\detail
-mkdir: %_DEST%\inc%_EXT%\boost\iterator
-mkdir: %_DEST%\inc%_EXT%\boost\iterator\detail
-..\%__SRC%\misc\build\boost_1_34_1\boost\iterator\* %_DEST%\inc%_EXT%\boost\iterator
-..\%__SRC%\misc\build\boost_1_34_1\boost\iterator\detail\* %_DEST%\inc%_EXT%\boost\iterator\detail
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\* %_DEST%\inc%_EXT%\boost\mpl
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\* %_DEST%\inc%_EXT%\boost\mpl\aux_
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\config\* %_DEST%\inc%_EXT%\boost\mpl\aux_\config
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\bcc\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\bcc551\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc551
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\gcc\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\gcc
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\msvc60\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc60
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\msvc70\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc70
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\mwcw\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\mwcw
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\no_ctps\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ctps
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\no_ttp\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ttp
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\plain
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\preprocessor\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessor
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\aux_\range_c\* %_DEST%\inc%_EXT%\boost\mpl\aux_\range_c
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\limits\* %_DEST%\inc%_EXT%\boost\mpl\limits
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\list\* %_DEST%\inc%_EXT%\boost\mpl\list
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\list\aux_\* %_DEST%\inc%_EXT%\boost\mpl\list\aux_
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\list\aux_\preprocessed\* %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\list\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed\plain
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\math\* %_DEST%\inc%_EXT%\boost\mpl\math
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\vector\* %_DEST%\inc%_EXT%\boost\mpl\vector
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\vector\aux_\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\vector\aux_\preprocessed\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\vector\aux_\preprocessed\no_ctps\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\no_ctps
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\vector\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\plain
-..\%__SRC%\misc\build\boost_1_34_1\boost\mpl\vector\aux_\preprocessed\typeof_based\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\typeof_based
-
-..\%__SRC%\misc\build\boost_1_34_1\boost\numeric\*.hpp %_DEST%\inc%_EXT%\boost\numeric\*.hpp
-..\%__SRC%\misc\build\boost_1_34_1\boost\numeric\conversion\*.hpp %_DEST%\inc%_EXT%\boost\numeric\conversion\*.hpp
-..\%__SRC%\misc\build\boost_1_34_1\boost\numeric\conversion\detail\*.hpp %_DEST%\inc%_EXT%\boost\numeric\conversion\detail\*.hpp
-..\%__SRC%\misc\build\boost_1_34_1\boost\numeric\ublas\*.hpp %_DEST%\inc%_EXT%\boost\numeric\ublas\*.hpp
-..\%__SRC%\misc\build\boost_1_34_1\boost\numeric\ublas\detail\*.hpp %_DEST%\inc%_EXT%\boost\numeric\ublas\detail\*.hpp
-
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\* %_DEST%\inc%_EXT%\boost\preprocessor
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\arithmetic\* %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\arithmetic\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\array\* %_DEST%\inc%_EXT%\boost\preprocessor\array
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\comparison\* %_DEST%\inc%_EXT%\boost\preprocessor\comparison
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\config\* %_DEST%\inc%_EXT%\boost\preprocessor\config
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\control\* %_DEST%\inc%_EXT%\boost\preprocessor\control
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\control\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\control\detail\edg\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\edg
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\control\detail\msvc\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\msvc
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\debug\* %_DEST%\inc%_EXT%\boost\preprocessor\debug
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\detail
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\facilities\* %_DEST%\inc%_EXT%\boost\preprocessor\facilities
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\iteration\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\iteration\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\iteration\detail\bounds\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\bounds
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\iteration\detail\iter\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\iter
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\list\* %_DEST%\inc%_EXT%\boost\preprocessor\list
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\list\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\list\detail
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\list\detail\edg\* %_DEST%\inc%_EXT%\boost\preprocessor\list\detail\edg
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\logical\* %_DEST%\inc%_EXT%\boost\preprocessor\logical
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\punctuation\* %_DEST%\inc%_EXT%\boost\preprocessor\punctuation
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\repetition\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\repetition\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\repetition\detail\edg\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\edg
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\repetition\detail\msvc\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\msvc
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\repetition\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\selection\* %_DEST%\inc%_EXT%\boost\preprocessor\selection
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\seq\* %_DEST%\inc%_EXT%\boost\preprocessor\seq
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\seq\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\seq\detail
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\slot\* %_DEST%\inc%_EXT%\boost\preprocessor\slot
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\slot\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
-..\%__SRC%\misc\build\boost_1_34_1\boost\preprocessor\tuple\* %_DEST%\inc%_EXT%\boost\preprocessor\tuple
-..\%__SRC%\misc\build\boost_1_34_1\boost\type_traits\* %_DEST%\inc%_EXT%\boost\type_traits
-..\%__SRC%\misc\build\boost_1_34_1\boost\type_traits\detail\* %_DEST%\inc%_EXT%\boost\type_traits\detail
-..\%__SRC%\misc\build\boost_1_34_1\boost\utility\* %_DEST%\inc%_EXT%\boost\utility
-..\%__SRC%\misc\build\boost_1_34_1\boost\pool\* %_DEST%\inc%_EXT%\boost\pool
-..\%__SRC%\misc\build\boost_1_34_1\boost\pool\detail\* %_DEST%\inc%_EXT%\boost\pool\detail
-..\%__SRC%\misc\build\boost_1_34_1\boost\tuple\* %_DEST%\inc%_EXT%\boost\tuple
-..\%__SRC%\misc\build\boost_1_34_1\boost\tuple\detail\* %_DEST%\inc%_EXT%\boost\tuple\detail
-..\%__SRC%\misc\build\boost_1_34_1\boost\optional\* %_DEST%\inc%_EXT%\boost\optional
+mkdir: %_DEST%\inc%_EXT%\boost\type_traits
+mkdir: %_DEST%\inc%_EXT%\boost\type_traits\detail
+mkdir: %_DEST%\inc%_EXT%\boost\utility
+mkdir: %_DEST%\inc%_EXT%\boost\variant
+mkdir: %_DEST%\inc%_EXT%\boost\variant\detail
 
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\* %_DEST%\inc%_EXT%\boost\spirit
-mkdir: %_DEST%\inc%_EXT%\boost\spirit\actor
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\actor\* %_DEST%\inc%_EXT%\boost\spirit\actor
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\attribute\* %_DEST%\inc%_EXT%\boost\spirit\attribute
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\* %_DEST%\inc%_EXT%\boost\spirit\core
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\composite\* %_DEST%\inc%_EXT%\boost\spirit\core\composite
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\composite\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\composite\impl
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\impl
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\meta\* %_DEST%\inc%_EXT%\boost\spirit\core\meta
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\meta\impl
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\non_terminal\* %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\non_terminal\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal\impl
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\primitives\* %_DEST%\inc%_EXT%\boost\spirit\core\primitives
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\primitives\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\primitives\impl
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\scanner\* %_DEST%\inc%_EXT%\boost\spirit\core\scanner
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\core\scanner\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\scanner\impl
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\debug\* %_DEST%\inc%_EXT%\boost\spirit\debug
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\debug\impl\* %_DEST%\inc%_EXT%\boost\spirit\debug\impl
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\dynamic\* %_DEST%\inc%_EXT%\boost\spirit\dynamic
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\dynamic\impl\* %_DEST%\inc%_EXT%\boost\spirit\dynamic\impl
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\error_handling\* %_DEST%\inc%_EXT%\boost\spirit\error_handling
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\error_handling\impl\* %_DEST%\inc%_EXT%\boost\spirit\error_handling\impl
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\iterator\* %_DEST%\inc%_EXT%\boost\spirit\iterator
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\iterator\impl\* %_DEST%\inc%_EXT%\boost\spirit\iterator\impl
-mkdir: %_DEST%\inc%_EXT%\boost\spirit\meta
-mkdir: %_DEST%\inc%_EXT%\boost\spirit\meta\impl
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\meta\* %_DEST%\inc%_EXT%\boost\spirit\meta
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\meta\impl
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\phoenix\* %_DEST%\inc%_EXT%\boost\spirit\phoenix
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\symbols\* %_DEST%\inc%_EXT%\boost\spirit\symbols
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\symbols\impl\* %_DEST%\inc%_EXT%\boost\spirit\symbols\impl
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\tree\* %_DEST%\inc%_EXT%\boost\spirit\tree
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\tree\impl\* %_DEST%\inc%_EXT%\boost\spirit\tree\impl
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\utility\* %_DEST%\inc%_EXT%\boost\spirit\utility
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\utility\impl\* %_DEST%\inc%_EXT%\boost\spirit\utility\impl
-..\%__SRC%\misc\build\boost_1_34_1\boost\spirit\utility\impl\chset\* %_DEST%\inc%_EXT%\boost\spirit\utility\impl\chset
+..\%__SRC%\inc\boost\* %_DEST%\inc%_EXT%\boost
+..\%__SRC%\inc\boost\bind\* %_DEST%\inc%_EXT%\boost\bind
+..\%__SRC%\inc\boost\config\* %_DEST%\inc%_EXT%\boost\config
+..\%__SRC%\inc\boost\config\compiler\* %_DEST%\inc%_EXT%\boost\config\compiler
+..\%__SRC%\inc\boost\config\no_tr1\* %_DEST%\inc%_EXT%\boost\config\no_tr1
+..\%__SRC%\inc\boost\config\platform\* %_DEST%\inc%_EXT%\boost\config\platform
+..\%__SRC%\inc\boost\config\stdlib\* %_DEST%\inc%_EXT%\boost\config\stdlib
+..\%__SRC%\inc\boost\detail\* %_DEST%\inc%_EXT%\boost\detail
+..\%__SRC%\inc\boost\function\* %_DEST%\inc%_EXT%\boost\function
+..\%__SRC%\inc\boost\function\detail\* %_DEST%\inc%_EXT%\boost\function\detail
+..\%__SRC%\inc\boost\iterator\* %_DEST%\inc%_EXT%\boost\iterator
+..\%__SRC%\inc\boost\iterator\detail\* %_DEST%\inc%_EXT%\boost\iterator\detail
+..\%__SRC%\inc\boost\exception\* %_DEST%\inc%_EXT%\boost\exception
+..\%__SRC%\inc\boost\exception\detail\* %_DEST%\inc%_EXT%\boost\exception\detail
+..\%__SRC%\inc\boost\mpl\* %_DEST%\inc%_EXT%\boost\mpl
+..\%__SRC%\inc\boost\mpl\aux_\* %_DEST%\inc%_EXT%\boost\mpl\aux_
+..\%__SRC%\inc\boost\mpl\aux_\config\* %_DEST%\inc%_EXT%\boost\mpl\aux_\config
+..\%__SRC%\inc\boost\mpl\aux_\preprocessed\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed
+..\%__SRC%\inc\boost\mpl\aux_\preprocessed\bcc551\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc551
+..\%__SRC%\inc\boost\mpl\aux_\preprocessed\bcc\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\bcc
+..\%__SRC%\inc\boost\mpl\aux_\preprocessed\gcc\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\gcc
+..\%__SRC%\inc\boost\mpl\aux_\preprocessed\msvc60\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc60
+..\%__SRC%\inc\boost\mpl\aux_\preprocessed\msvc70\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\msvc70
+..\%__SRC%\inc\boost\mpl\aux_\preprocessed\mwcw\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\mwcw
+..\%__SRC%\inc\boost\mpl\aux_\preprocessed\no_ctps\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ctps
+..\%__SRC%\inc\boost\mpl\aux_\preprocessed\no_ttp\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\no_ttp
+..\%__SRC%\inc\boost\mpl\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessed\plain
+..\%__SRC%\inc\boost\mpl\aux_\preprocessor\* %_DEST%\inc%_EXT%\boost\mpl\aux_\preprocessor
+..\%__SRC%\inc\boost\mpl\aux_\range_c\* %_DEST%\inc%_EXT%\boost\mpl\aux_\range_c
+..\%__SRC%\inc\boost\mpl\limits\* %_DEST%\inc%_EXT%\boost\mpl\limits
+..\%__SRC%\inc\boost\mpl\list\* %_DEST%\inc%_EXT%\boost\mpl\list
+..\%__SRC%\inc\boost\mpl\list\aux_\* %_DEST%\inc%_EXT%\boost\mpl\list\aux_
+..\%__SRC%\inc\boost\mpl\list\aux_\preprocessed\* %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed
+..\%__SRC%\inc\boost\mpl\list\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\list\aux_\preprocessed\plain
+..\%__SRC%\inc\boost\mpl\math\* %_DEST%\inc%_EXT%\boost\mpl\math
+..\%__SRC%\inc\boost\mpl\vector\* %_DEST%\inc%_EXT%\boost\mpl\vector
+..\%__SRC%\inc\boost\mpl\vector\aux_\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_
+..\%__SRC%\inc\boost\mpl\vector\aux_\preprocessed\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed
+..\%__SRC%\inc\boost\mpl\vector\aux_\preprocessed\no_ctps\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\no_ctps
+..\%__SRC%\inc\boost\mpl\vector\aux_\preprocessed\plain\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\plain
+..\%__SRC%\inc\boost\mpl\vector\aux_\preprocessed\typeof_based\* %_DEST%\inc%_EXT%\boost\mpl\vector\aux_\preprocessed\typeof_based
+..\%__SRC%\inc\boost\numeric\*.hpp %_DEST%\inc%_EXT%\boost\numeric\*.hpp
+..\%__SRC%\inc\boost\numeric\conversion\*.hpp %_DEST%\inc%_EXT%\boost\numeric\conversion\*.hpp
+..\%__SRC%\inc\boost\numeric\conversion\detail\*.hpp %_DEST%\inc%_EXT%\boost\numeric\conversion\detail\*.hpp
+..\%__SRC%\inc\boost\numeric\ublas\*.hpp %_DEST%\inc%_EXT%\boost\numeric\ublas\*.hpp
+..\%__SRC%\inc\boost\numeric\ublas\detail\*.hpp %_DEST%\inc%_EXT%\boost\numeric\ublas\detail\*.hpp
+..\%__SRC%\inc\boost\optional\* %_DEST%\inc%_EXT%\boost\optional
+..\%__SRC%\inc\boost\pending\* %_DEST%\inc%_EXT%\boost\pending
+..\%__SRC%\inc\boost\pool\* %_DEST%\inc%_EXT%\boost\pool
+..\%__SRC%\inc\boost\pool\detail\* %_DEST%\inc%_EXT%\boost\pool\detail
+..\%__SRC%\inc\boost\preprocessor\* %_DEST%\inc%_EXT%\boost\preprocessor
+..\%__SRC%\inc\boost\preprocessor\arithmetic\* %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic
+..\%__SRC%\inc\boost\preprocessor\arithmetic\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\arithmetic\detail
+..\%__SRC%\inc\boost\preprocessor\array\* %_DEST%\inc%_EXT%\boost\preprocessor\array
+..\%__SRC%\inc\boost\preprocessor\comparison\* %_DEST%\inc%_EXT%\boost\preprocessor\comparison
+..\%__SRC%\inc\boost\preprocessor\config\* %_DEST%\inc%_EXT%\boost\preprocessor\config
+..\%__SRC%\inc\boost\preprocessor\control\* %_DEST%\inc%_EXT%\boost\preprocessor\control
+..\%__SRC%\inc\boost\preprocessor\control\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail
+..\%__SRC%\inc\boost\preprocessor\control\detail\edg\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\edg
+..\%__SRC%\inc\boost\preprocessor\control\detail\msvc\* %_DEST%\inc%_EXT%\boost\preprocessor\control\detail\msvc
+..\%__SRC%\inc\boost\preprocessor\debug\* %_DEST%\inc%_EXT%\boost\preprocessor\debug
+..\%__SRC%\inc\boost\preprocessor\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\detail
+..\%__SRC%\inc\boost\preprocessor\facilities\* %_DEST%\inc%_EXT%\boost\preprocessor\facilities
+..\%__SRC%\inc\boost\preprocessor\iteration\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration
+..\%__SRC%\inc\boost\preprocessor\iteration\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail
+..\%__SRC%\inc\boost\preprocessor\iteration\detail\bounds\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\bounds
+..\%__SRC%\inc\boost\preprocessor\iteration\detail\iter\* %_DEST%\inc%_EXT%\boost\preprocessor\iteration\detail\iter
+..\%__SRC%\inc\boost\preprocessor\list\* %_DEST%\inc%_EXT%\boost\preprocessor\list
+..\%__SRC%\inc\boost\preprocessor\list\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\list\detail
+..\%__SRC%\inc\boost\preprocessor\list\detail\edg\* %_DEST%\inc%_EXT%\boost\preprocessor\list\detail\edg
+..\%__SRC%\inc\boost\preprocessor\logical\* %_DEST%\inc%_EXT%\boost\preprocessor\logical
+..\%__SRC%\inc\boost\preprocessor\punctuation\* %_DEST%\inc%_EXT%\boost\preprocessor\punctuation
+..\%__SRC%\inc\boost\preprocessor\repetition\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition
+..\%__SRC%\inc\boost\preprocessor\repetition\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail
+..\%__SRC%\inc\boost\preprocessor\repetition\detail\edg\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\edg
+..\%__SRC%\inc\boost\preprocessor\repetition\detail\msvc\* %_DEST%\inc%_EXT%\boost\preprocessor\repetition\detail\msvc
+..\%__SRC%\inc\boost\preprocessor\selection\* %_DEST%\inc%_EXT%\boost\preprocessor\selection
+..\%__SRC%\inc\boost\preprocessor\seq\* %_DEST%\inc%_EXT%\boost\preprocessor\seq
+..\%__SRC%\inc\boost\preprocessor\seq\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\seq\detail
+..\%__SRC%\inc\boost\preprocessor\slot\* %_DEST%\inc%_EXT%\boost\preprocessor\slot
+..\%__SRC%\inc\boost\preprocessor\slot\detail\* %_DEST%\inc%_EXT%\boost\preprocessor\slot\detail
+..\%__SRC%\inc\boost\preprocessor\tuple\* %_DEST%\inc%_EXT%\boost\preprocessor\tuple
+..\%__SRC%\inc\boost\spirit\* %_DEST%\inc%_EXT%\boost\spirit
+..\%__SRC%\inc\boost\spirit\actor\* %_DEST%\inc%_EXT%\boost\spirit\actor
+..\%__SRC%\inc\boost\spirit\attribute\* %_DEST%\inc%_EXT%\boost\spirit\attribute
+..\%__SRC%\inc\boost\spirit\core\* %_DEST%\inc%_EXT%\boost\spirit\core
+..\%__SRC%\inc\boost\spirit\core\composite\* %_DEST%\inc%_EXT%\boost\spirit\core\composite
+..\%__SRC%\inc\boost\spirit\core\composite\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\composite\impl
+..\%__SRC%\inc\boost\spirit\core\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\impl
+..\%__SRC%\inc\boost\spirit\core\meta\* %_DEST%\inc%_EXT%\boost\spirit\core\meta
+..\%__SRC%\inc\boost\spirit\core\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\meta\impl
+..\%__SRC%\inc\boost\spirit\core\non_terminal\* %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal
+..\%__SRC%\inc\boost\spirit\core\non_terminal\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\non_terminal\impl
+..\%__SRC%\inc\boost\spirit\core\primitives\* %_DEST%\inc%_EXT%\boost\spirit\core\primitives
+..\%__SRC%\inc\boost\spirit\core\primitives\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\primitives\impl
+..\%__SRC%\inc\boost\spirit\core\scanner\* %_DEST%\inc%_EXT%\boost\spirit\core\scanner
+..\%__SRC%\inc\boost\spirit\core\scanner\impl\* %_DEST%\inc%_EXT%\boost\spirit\core\scanner\impl
+..\%__SRC%\inc\boost\spirit\debug\* %_DEST%\inc%_EXT%\boost\spirit\debug
+..\%__SRC%\inc\boost\spirit\debug\impl\* %_DEST%\inc%_EXT%\boost\spirit\debug\impl
+..\%__SRC%\inc\boost\spirit\dynamic\* %_DEST%\inc%_EXT%\boost\spirit\dynamic
+..\%__SRC%\inc\boost\spirit\dynamic\impl\* %_DEST%\inc%_EXT%\boost\spirit\dynamic\impl
+..\%__SRC%\inc\boost\spirit\error_handling\* %_DEST%\inc%_EXT%\boost\spirit\error_handling
+..\%__SRC%\inc\boost\spirit\error_handling\impl\* %_DEST%\inc%_EXT%\boost\spirit\error_handling\impl
+..\%__SRC%\inc\boost\spirit\home\* %_DEST%\inc%_EXT%\boost\spirit\home
+..\%__SRC%\inc\boost\spirit\home\classic\* %_DEST%\inc%_EXT%\boost\spirit\home\classic
+..\%__SRC%\inc\boost\spirit\home\classic\actor\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor
+..\%__SRC%\inc\boost\spirit\home\classic\actor\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\actor\impl
+..\%__SRC%\inc\boost\spirit\home\classic\debug\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\debug
+..\%__SRC%\inc\boost\spirit\home\classic\meta\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta
+..\%__SRC%\inc\boost\spirit\home\classic\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\meta\impl
+..\%__SRC%\inc\boost\spirit\home\classic\core\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core
+..\%__SRC%\inc\boost\spirit\home\classic\core\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\impl
+..\%__SRC%\inc\boost\spirit\home\classic\core\scanner\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner
+..\%__SRC%\inc\boost\spirit\home\classic\core\scanner\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\scanner\impl
+..\%__SRC%\inc\boost\spirit\home\classic\core\non_terminal\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\non_terminal
+..\%__SRC%\inc\boost\spirit\home\classic\core\non_terminal\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\non_terminal\impl
+..\%__SRC%\inc\boost\spirit\home\classic\core\primitives\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\primitives
+..\%__SRC%\inc\boost\spirit\home\classic\core\primitives\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\primitives\impl
+..\%__SRC%\inc\boost\spirit\home\classic\core\composite\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite
+..\%__SRC%\inc\boost\spirit\home\classic\core\composite\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\core\composite\impl
+..\%__SRC%\inc\boost\spirit\home\classic\error_handling\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling
+..\%__SRC%\inc\boost\spirit\home\classic\error_handling\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\error_handling\impl
+..\%__SRC%\inc\boost\spirit\home\classic\iterator\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator
+..\%__SRC%\inc\boost\spirit\home\classic\iterator\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\iterator\impl
+..\%__SRC%\inc\boost\spirit\home\classic\utility\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility
+..\%__SRC%\inc\boost\spirit\home\classic\utility\impl\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl
+..\%__SRC%\inc\boost\spirit\home\classic\utility\impl\chset\* %_DEST%\inc%_EXT%\boost\spirit\home\classic\utility\impl\chset
+..\%__SRC%\inc\boost\spirit\include\* %_DEST%\inc%_EXT%\boost\spirit\include
+..\%__SRC%\inc\boost\spirit\iterator\* %_DEST%\inc%_EXT%\boost\spirit\iterator
+..\%__SRC%\inc\boost\spirit\iterator\impl\* %_DEST%\inc%_EXT%\boost\spirit\iterator\impl
+..\%__SRC%\inc\boost\spirit\meta\* %_DEST%\inc%_EXT%\boost\spirit\meta
+..\%__SRC%\inc\boost\spirit\meta\impl\* %_DEST%\inc%_EXT%\boost\spirit\meta\impl
+..\%__SRC%\inc\boost\spirit\phoenix\* %_DEST%\inc%_EXT%\boost\spirit\phoenix
+..\%__SRC%\inc\boost\spirit\symbols\* %_DEST%\inc%_EXT%\boost\spirit\symbols
+..\%__SRC%\inc\boost\spirit\symbols\impl\* %_DEST%\inc%_EXT%\boost\spirit\symbols\impl
+..\%__SRC%\inc\boost\spirit\tree\* %_DEST%\inc%_EXT%\boost\spirit\tree
+..\%__SRC%\inc\boost\spirit\tree\impl\* %_DEST%\inc%_EXT%\boost\spirit\tree\impl
+..\%__SRC%\inc\boost\spirit\utility\* %_DEST%\inc%_EXT%\boost\spirit\utility
+..\%__SRC%\inc\boost\spirit\utility\impl\* %_DEST%\inc%_EXT%\boost\spirit\utility\impl
+..\%__SRC%\inc\boost\spirit\utility\impl\chset\* %_DEST%\inc%_EXT%\boost\spirit\utility\impl\chset
+..\%__SRC%\inc\boost\smart_ptr\* %_DEST%\inc%_EXT%\boost\smart_ptr
+..\%__SRC%\inc\boost\smart_ptr\detail\* %_DEST%\inc%_EXT%\boost\smart_ptr\detail
+..\%__SRC%\inc\boost\tuple\* %_DEST%\inc%_EXT%\boost\tuple
+..\%__SRC%\inc\boost\tuple\detail\* %_DEST%\inc%_EXT%\boost\tuple\detail
+..\%__SRC%\inc\boost\type_traits\* %_DEST%\inc%_EXT%\boost\type_traits
+..\%__SRC%\inc\boost\type_traits\detail\* %_DEST%\inc%_EXT%\boost\type_traits\detail
+..\%__SRC%\inc\boost\utility\* %_DEST%\inc%_EXT%\boost\utility
+..\%__SRC%\inc\boost\variant\* %_DEST%\inc%_EXT%\boost\variant
+..\%__SRC%\inc\boost\variant\detail\* %_DEST%\inc%_EXT%\boost\variant\detail
diff --git a/boost/spirit-1.6.1.patch b/boost/spirit-1.6.1.patch
deleted file mode 100644
index 66adf6ba1ab5..000000000000
--- a/boost/spirit-1.6.1.patch
+++ /dev/null
@@ -1,1748 +0,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	Wed Dec  5 10:08:58 2007
-***************
-*** 11,16 ****
---- 11,21 ----
-  #ifndef BOOST_SPIRIT_ACTIONS_HPP
-  #define BOOST_SPIRIT_ACTIONS_HPP
-  
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ #endif
-+ 
-  ///////////////////////////////////////////////////////////////////////////////
-  #include <algorithm>
-  
-***************
-*** 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 Dec  5 10:08:58 2007
-***************
-*** 65,75 ****
-          unary(BaseT const& base)
-          : base_t(base) {}
-  
-!         unary(param_t s)
-!         : base_t(s) {}
-  
-!         unary(BaseT const& base, param_t s)
-!         : base_t(base, s) {}
-  
-          return_t
-          subject() const
---- 65,75 ----
-          unary(BaseT const& base)
-          : base_t(base) {}
-  
-!         unary(param_t _s)
-!         : base_t(_s) {}
-  
-!         unary(BaseT const& _base, param_t _s)
-! 		: base_t(_base, _s) {}
-  
-          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 Dec  5 10:08:58 2007
-***************
-*** 12,17 ****
---- 12,22 ----
-  #ifndef BOOST_SPIRIT_EPSILON_HPP
-  #define BOOST_SPIRIT_EPSILON_HPP
-  
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ #endif
-+ 
-  ////////////////////////////////////////////////////////////////////////////////
-  #if !defined(BOOST_SPIRIT_PARSER_HPP)
-  #include "boost/spirit/core/parser.hpp"
-***************
-*** 70,76 ****
-  private:
-  };
-  
-! #if BOOST_WORKAROUND(BOOST_MSVC, == 1310) // VC 7.1
-  template <typename CondT>
-  inline condition_parser<CondT, false>
-  operator~(condition_parser<CondT, true> const& p)
---- 75,81 ----
-  private:
-  };
-  
-! #if BOOST_WORKAROUND(BOOST_MSVC, == 1310) || BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x550))
-  template <typename CondT>
-  inline condition_parser<CondT, false>
-  operator~(condition_parser<CondT, true> const& p)
-***************
-*** 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 Dec  5 10:08:58 2007
-***************
-*** 112,120 ****
-              typedef typename base_t::return_t                   return_t;
-  
-              subject() : base_t() {}
-!             subject(BaseT const& base) : base_t(base) {}
-!             subject(param_t s) : base_t(s) {}
-!             subject(BaseT const& base, param_t s) : base_t(base, s) {}
-          };
-  
-          //////////////////////////////////
---- 112,120 ----
-              typedef typename base_t::return_t                   return_t;
-  
-              subject() : base_t() {}
-!             subject(BaseT const& _base) : base_t(_base) {}
-!             subject(param_t _s) : base_t(_s) {}
-!             subject(BaseT const& _base, param_t _s) : base_t(_base, _s) {}
-          };
-  
-          //////////////////////////////////
-***************
-*** 126,134 ****
-              typedef typename base_t::return_t                   return_t;
-  
-              left_subject() : base_t() {}
-!             left_subject(BaseT const& base) : base_t(base) {}
-!             left_subject(param_t s) : base_t(s) {}
-!             left_subject(BaseT const& base, param_t s) : base_t(base, s) {}
-  
-              return_t
-              left() const { return base_t::get(); }
---- 126,134 ----
-              typedef typename base_t::return_t                   return_t;
-  
-              left_subject() : base_t() {}
-!             left_subject(BaseT const& _base) : base_t(_base) {}
-!             left_subject(param_t _s) : base_t(_s) {}
-!             left_subject(BaseT const& _base, param_t _s) : base_t(_base, _s) {}
-  
-              return_t
-              left() const { return base_t::get(); }
-***************
-*** 143,151 ****
-              typedef typename base_t::return_t                   return_t;
-  
-              right_subject() : base_t() {}
-!             right_subject(BaseT const& base) : base_t(base) {}
-!             right_subject(param_t s) : base_t(s) {}
-!             right_subject(BaseT const& base, param_t s) : base_t(base, s) {}
-  
-              return_t
-              right() const { return base_t::get(); }
---- 143,151 ----
-              typedef typename base_t::return_t                   return_t;
-  
-              right_subject() : base_t() {}
-!             right_subject(BaseT const& _base) : base_t(_base) {}
-!             right_subject(param_t _s) : base_t(_s) {}
-!             right_subject(BaseT const& _base, param_t _s) : base_t(_base, _s) {}
-  
-              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 Dec  5 10:08:58 2007
-***************
-*** 12,17 ****
---- 12,21 ----
-  #if !defined(BOOST_SPIRIT_OPERATORS_IPP)
-  #define BOOST_SPIRIT_OPERATORS_IPP
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-+ 
-  ///////////////////////////////////////////////////////////////////////////////
-  namespace boost { namespace spirit {
-  
-***************
-*** 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 Dec  5 10:08:58 2007
-***************
-*** 154,167 ****
-              { return nil_t(); }
-          };
-  
-!     #if !defined(__BORLANDC__)
-          struct dummy { void nonnull() {}; };
-          typedef void (dummy::*safe_bool)();
-      #else
-          typedef bool safe_bool;
-      #endif
-  
-!     #if !defined(__BORLANDC__)
-      #define BOOST_SPIRIT_SAFE_BOOL(cond)  ((cond) ? &impl::dummy::nonnull : 0)
-      #else
-      #define BOOST_SPIRIT_SAFE_BOOL(cond)  (cond)
---- 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
-  
-!     #if !defined(__BORLANDC__) && !defined(__SUNPRO_CC) // workaround opt bug when compiling with -xO3
-      #define BOOST_SPIRIT_SAFE_BOOL(cond)  ((cond) ? &impl::dummy::nonnull : 0)
-      #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 Dec  5 10:08:58 2007
-***************
-*** 11,16 ****
---- 11,20 ----
-  #if !defined(BOOST_SPIRIT_PARSER_IPP)
-  #define BOOST_SPIRIT_PARSER_IPP
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-+ 
-  ///////////////////////////////////////////////////////////////////////////////
-  namespace boost { namespace spirit {
-  
-***************
-*** 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 Dec  5 10:08:58 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	Wed Dec  5 10:08:58 2007
-***************
-*** 11,16 ****
---- 11,20 ----
-  #if !defined(BOOST_SPIRIT_FUNDAMENTAL_IPP)
-  #define BOOST_SPIRIT_FUNDAMENTAL_IPP
-  
-+ #if defined __SUNPRO_CC
-+ #pragma disable_warn
-+ #endif
-+ 
-  ///////////////////////////////////////////////////////////////////////////////
-  namespace boost { namespace spirit {
-  
-***************
-*** 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 Dec  5 10:08:58 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	Wed Dec  5 10:08:58 2007
-***************
-*** 228,234 ****
-              subrule_list<
-                  subrule_parser<ID2, DefT2, ContextT2>,
-                  nil_t> >
-!         operator,(subrule_parser<ID2, DefT2, ContextT2> const& rhs) const
-          {
-              return subrule_list<
-                  self_t,
---- 228,234 ----
-              subrule_list<
-                  subrule_parser<ID2, DefT2, ContextT2>,
-                  nil_t> >
-!         operator,(subrule_parser<ID2, DefT2, ContextT2> const& _rhs) const
-          {
-              return subrule_list<
-                  self_t,
-***************
-*** 238,244 ****
-                          *this,
-                          subrule_list<
-                              subrule_parser<ID2, DefT2, ContextT2>, nil_t>(
-!                                 rhs, nil_t()));
-          }
-  
-          typename DefT::embed_t rhs;
---- 238,244 ----
-                          *this,
-                          subrule_list<
-                              subrule_parser<ID2, DefT2, ContextT2>, nil_t>(
-!                                 _rhs, nil_t()));
-          }
-  
-          typename DefT::embed_t rhs;
-***************
-*** 276,285 ****
-          parse_main(ScannerT const& scan) const
-          {
-              typedef typename parser_result<self_t, ScannerT>::type result_t;
-!             result_t result;
-              impl::parse_subrule<result_t, ScannerT, ID>::
-!                 do_(result, scan);
-!             return result;
-          }
-  
-          template <typename ScannerT>
---- 276,285 ----
-          parse_main(ScannerT const& scan) const
-          {
-              typedef typename parser_result<self_t, ScannerT>::type result_t;
-!             result_t _result;
-              impl::parse_subrule<result_t, ScannerT, ID>::
-!                 do_(_result, scan);
-!             return _result;
-          }
-  
-          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 Dec  5 10:08:58 2007
-***************
-*** 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 {
-  
-***************
-*** 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 Dec  5 10:08:58 2007
-***************
-*** 18,23 ****
---- 18,26 ----
-  #include <iterator>
-  
-  #include "boost/config.hpp"
-+ #ifdef BOOST_NO_STD_ITERATOR_TRAITS
-+ #include "boost/iterator_adaptors.hpp"
-+ #endif
-  #include "boost/spirit/core/match.hpp"
-  #include "boost/spirit/core/non_terminal/parser_id.hpp"
-  
-***************
-*** 236,245 ****
---- 239,255 ----
-      typedef IteratorT iterator_t;
-      typedef PoliciesT policies_t;
-  
-+ #ifdef BOOST_NO_STD_ITERATOR_TRAITS
-+     typedef typename boost::detail::iterator_traits<IteratorT>::value_type
-+         value_t;
-+     typedef typename boost::detail::iterator_traits<IteratorT>::reference
-+         ref_t;
-+ #else
-      typedef typename BOOST_SPIRIT_IT_NS::iterator_traits<IteratorT>::value_type
-          value_t;
-      typedef typename BOOST_SPIRIT_IT_NS::iterator_traits<IteratorT>::reference
-          ref_t;
-+ #endif
-      typedef typename boost::call_traits<IteratorT>::param_type
-          iter_param_t;
-  
-***************
-*** 260,281 ****
-      bool
-      at_end() const
-      {
-!         typedef typename PoliciesT::iteration_policy_t iteration_policy_t;
-!         return iteration_policy_t::at_end(*this);
-      }
-  
-      value_t
-      operator*() const
-      {
-!         typedef typename PoliciesT::iteration_policy_t iteration_policy_t;
-!         return iteration_policy_t::filter(iteration_policy_t::get(*this));
-      }
-  
-      scanner const&
-      operator++() const
-      {
-!         typedef typename PoliciesT::iteration_policy_t iteration_policy_t;
-!         iteration_policy_t::advance(*this);
-          return *this;
-      }
-  
---- 270,291 ----
-      bool
-      at_end() const
-      {
-!         typedef typename PoliciesT::iteration_policy_t _iteration_policy_t;
-!         return _iteration_policy_t::at_end(*this);
-      }
-  
-      value_t
-      operator*() const
-      {
-!         typedef typename PoliciesT::iteration_policy_t _iteration_policy_t;
-!         return _iteration_policy_t::filter(_iteration_policy_t::get(*this));
-      }
-  
-      scanner const&
-      operator++() const
-      {
-!         typedef typename PoliciesT::iteration_policy_t _iteration_policy_t;
-!         _iteration_policy_t::advance(*this);
-          return *this;
-      }
-  
-*** 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 Dec  5 10:08:58 2007
-***************
-*** 38,44 ****
-  
-          parser_error_base() {}
-          virtual ~parser_error_base() throw() {}
-!         parser_error_base(parser_error_base const&) {}
-          parser_error_base& operator=(parser_error_base const&)
-          { return *this; }
-      };
---- 38,44 ----
-  
-          parser_error_base() {}
-          virtual ~parser_error_base() throw() {}
-!         parser_error_base(parser_error_base const&) : std::exception() {}
-          parser_error_base& operator=(parser_error_base const&)
-          { return *this; }
-      };
-***************
-*** 104,111 ****
-          typedef unary<ParserT, parser<self_t> >         base_t;
-          typedef unary_parser_category                   parser_category_t;
-  
-!         assertive_parser(ParserT const& parser, ErrorDescrT descriptor)
-!         : base_t(parser), descriptor(descriptor) {}
-  
-          template <typename ScannerT>
-          struct result
---- 104,111 ----
-          typedef unary<ParserT, parser<self_t> >         base_t;
-          typedef unary_parser_category                   parser_category_t;
-  
-!         assertive_parser(ParserT const& parser, ErrorDescrT desc)
-!         : base_t(parser), descriptor(desc) {}
-  
-          template <typename ScannerT>
-          struct result
-***************
-*** 200,208 ****
-  
-          error_status(
-              result_t result_ = fail,
-!             int length = -1,
-              T const& value_ = T())
-!         : result(result_), length(length), value(value_) {}
-  
-          result_t    result;
-          int         length;
---- 200,208 ----
-  
-          error_status(
-              result_t result_ = fail,
-!             int length_ = -1,
-              T const& value_ = T())
-!         : result(result_), length(length_), value(value_) {}
-  
-          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 Dec  5 10:08:58 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>
-***************
-*** 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 Dec  5 10:08:58 2007
-***************
-*** 11,16 ****
---- 11,21 ----
-  #ifndef BOOST_SPIRIT_ITERATOR_MULTI_PASS_HPP
-  #define BOOST_SPIRIT_ITERATOR_MULTI_PASS_HPP
-  
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ #endif
-+ 
-  #include <boost/config.hpp>
-  #include <boost/throw_exception.hpp>
-  #include <boost/detail/workaround.hpp>
-***************
-*** 1313,1317 ****
---- 1318,1327 ----
-  
-  #undef BOOST_SPIRIT_IT_NS
-  #endif  // defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)
-+ 
-+ #if defined _MSC_VER
-+ #pragma warning(pop)
-+ #endif
-+ 
-  #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 Dec  5 10:08:58 2007
-***************
-*** 12,17 ****
---- 12,22 ----
-  #ifndef BOOST_SPIRIT_CHSET_HPP
-  #define BOOST_SPIRIT_CHSET_HPP
-  
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ #endif
-+ 
-  ///////////////////////////////////////////////////////////////////////////////
-  #include <boost/shared_ptr.hpp>
-  #include <boost/spirit/core/primitives/primitives.hpp>
-***************
-*** 229,234 ****
---- 234,243 ----
-  
-  ///////////////////////////////////////////////////////////////////////////////
-  }} // namespace boost::spirit
-+ 
-+ #if defined _MSC_VER
-+ #pragma warning(pop)
-+ #endif
-  
-  #endif
-  
-*** 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 Dec  5 10:08:58 2007
-***************
-*** 12,17 ****
---- 12,22 ----
-  #ifndef BOOST_SPIRIT_CHSET_OPERATORS_HPP
-  #define BOOST_SPIRIT_CHSET_OPERATORS_HPP
-  
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ #endif
-+ 
-  ///////////////////////////////////////////////////////////////////////////////
-  #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 Dec  5 10:08:58 2007
-***************
-*** 389,395 ****
-              as_parser<OpenT>::convert(open),
-              as_parser<CloseT>::convert(close)
-          );
-! };
-  
-  ///////////////////////////////////////////////////////////////////////////////
-  }} // namespace boost::spirit
---- 389,395 ----
-              as_parser<OpenT>::convert(open),
-              as_parser<CloseT>::convert(close)
-          );
-! }
-  
-  ///////////////////////////////////////////////////////////////////////////////
-  }} // 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 Dec  5 10:08:58 2007
-***************
-*** 54,66 ****
-              typedef typename ScannerT::iterator_t   iterator_t;
-  
-              iterator_t const s(scan.first);
-!             functor_result_t result;
-!             int const len = functor(scan, result);
-  
-              if (len < 0)
-                  return scan.no_match();
-              else
-!                 return scan.create_match(len, result, s, scan.first);
-          }
-      };
-  
---- 54,66 ----
-              typedef typename ScannerT::iterator_t   iterator_t;
-  
-              iterator_t const s(scan.first);
-!             functor_result_t res;
-!             int const len = functor(scan, res);
-  
-              if (len < 0)
-                  return scan.no_match();
-              else
-!                 return scan.create_match(len, res, s, scan.first);
-          }
-      };
-  
-*** 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 Dec  5 10:08:58 2007
-***************
-*** 12,17 ****
---- 12,22 ----
-  #ifndef BOOST_SPIRIT_CHSET_IPP
-  #define BOOST_SPIRIT_CHSET_IPP
-  
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ #endif
-+ 
-  ///////////////////////////////////////////////////////////////////////////////
-  #include <boost/limits.hpp>
-  #include <boost/spirit/utility/chset.hpp>
-***************
-*** 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 Dec  5 10:08:58 2007
-***************
-*** 11,16 ****
---- 11,21 ----
-  #ifndef BOOST_SPIRIT_CHSET_OPERATORS_IPP
-  #define BOOST_SPIRIT_CHSET_OPERATORS_IPP
-  
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ #endif
-+ 
-  ///////////////////////////////////////////////////////////////////////////////
-  #include <boost/limits.hpp>
-  
-***************
-*** 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 Dec  5 10:08:58 2007
-***************
-*** 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/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 Dec  5 10:08:58 2007
-***************
-*** 59,65 ****
-  #endif
-  //
-  // last known and checked version is 3.2:
-! #if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 2))
-  #  if defined(BOOST_ASSERT_CONFIG)
-  #     error "Unknown compiler version - please run the configure tests and report the results"
-  #  else
---- 59,66 ----
-  #endif
-  //
-  // last known and checked version is 3.2:
-! // although 3.4+x & 4.x are unchecked, we will give it a try
-! #if (__GNUC__ > 4)
-  #  if defined(BOOST_ASSERT_CONFIG)
-  #     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 Dec  5 10:08:58 2007
-***************
-*** 45,52 ****
-  #      define BOOST_NO_INTEGRAL_INT64_T
-  #    endif
-  
-! #    if (__SUNPRO_CC <= 0x540) || !defined(BOOST_STRICT_CONFIG)
-  #      define BOOST_NO_TEMPLATE_TEMPLATES
-  #    endif
-  
-  #define BOOST_COMPILER "Sun compiler version " BOOST_STRINGIZE(__SUNPRO_CC)
---- 45,57 ----
-  #      define BOOST_NO_INTEGRAL_INT64_T
-  #    endif
-  
-! #    if (__SUNPRO_CC <= 0x550) || !defined(BOOST_STRICT_CONFIG)
-  #      define BOOST_NO_TEMPLATE_TEMPLATES
-+        // see http://lists.boost.org/MailArchives/boost/msg47184.php
-+        // and http://lists.boost.org/MailArchives/boost/msg47220.php
-+ #      define BOOST_NO_INCLASS_MEMBER_INITIALIZATION
-+ #      define BOOST_NO_SFINAE
-+ #      define BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS
-  #    endif
-  
-  #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 Dec  5 10:12:34 2007
-***************
-*** 65,75 ****
-  #  define BOOST_NO_INTRINSIC_WCHAR_T
-  #endif
-  
-! //   
-! // check for exception handling support:   
-! #ifndef _CPPUNWIND   
-! #  define BOOST_NO_EXCEPTIONS   
-! #endif 
-  
-  //
-  // __int64 support:
---- 65,75 ----
-  #  define BOOST_NO_INTRINSIC_WCHAR_T
-  #endif
-  
-! //
-! // check for exception handling support:
-! #ifndef _CPPUNWIND
-! #  define BOOST_NO_EXCEPTIONS
-! #endif
-  
-  //
-  // __int64 support:
-***************
-*** 94,99 ****
---- 94,101 ----
-  #   define BOOST_COMPILER_VERSION 7.0
-  # elif _MSC_VER == 1310
-  #   define BOOST_COMPILER_VERSION 7.1
-+ # elif _MSC_VER == 1400
-+ #   define BOOST_COMPILER_VERSION 8.0
-  # else
-  #   define BOOST_COMPILER_VERSION _MSC_VER
-  # endif
-***************
-*** 108,121 ****
-  #endif
-  //
-  // last known and checked version is 1310:
-! #if (_MSC_VER > 1310)
-  #  if defined(BOOST_ASSERT_CONFIG)
-  #     error "Unknown compiler version - please run the configure tests and report the results"
-  #  else
-  #     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 > 1500)
-  #  if defined(BOOST_ASSERT_CONFIG)
-  #     error "Unknown compiler version - please run the configure tests and report the results"
-  #  else
-  #     pragma message("Unknown compiler version - please run the configure tests and report the results")
-  #  endif
-  #endif
-  
-  
-  
-*** 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 Dec  5 10:08:58 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	Wed Dec  5 10:08:58 2007
-***************
-*** 40,45 ****
---- 40,46 ----
-  #  define NOMINMAX
-  #endif
-  
-+ #if (_MSC_VER < 1400)
-  #ifdef BOOST_MSVC
-  namespace std{
-    // Apparently, something in the Microsoft libraries requires the "long"
-***************
-*** 65,67 ****
---- 66,69 ----
-  using std::min;
-  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 Dec  5 10:08:58 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 Dec  5 10:08:58 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 Dec  5 10:08:58 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)) \
-***************
-*** 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
-  
-  #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 Dec  5 10:08:58 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 Dec  5 10:08:58 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)
-***************
-*** 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 Dec  5 10:08:58 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	Wed Dec  5 10:08:58 2007
-***************
-*** 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"
-***************
-*** 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 Dec  5 10:08:58 2007
-***************
-*** 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"
-***************
-*** 48,53 ****
---- 53,62 ----
-      operator bool() const { return this->value; }
-  };
-  }}
-+ #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 Dec  5 10:08:58 2007
-***************
-*** 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 {
-***************
-*** 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 Dec  5 10:08:58 2007
-***************
-*** 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"
-***************
-*** 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 Dec  5 10:08:58 2007
-***************
-*** 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"
-***************
-*** 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 Dec  5 10:08:58 2007
-***************
-*** 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.
-***************
-*** 312,317 ****
---- 321,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	Wed Dec  5 10:08:58 2007
-***************
-*** 83,94 ****
---- 83,98 ----
-  
-      // 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/scoped_ptr.hpp	Tue Jul  8 04:19:08 2003
---- misc/build/spirit-1.6.1/miniboost/boost/scoped_ptr.hpp	Wed Dec  5 10:08:58 2007
-***************
-*** 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 Dec  5 10:08:58 2007
-***************
-*** 94,105 ****
---- 94,109 ----
-  
-      // 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
-      {
-          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 Dec  5 10:08:58 2007
-***************
-*** 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,257 ****
---- 246,261 ----
-  
-      // 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
-      {
-          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 Dec  5 10:08:58 2007
-***************
-*** 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	Wed Dec  5 10:08:58 2007
-***************
-*** 10,15 ****
---- 10,20 ----
-  #ifndef BOOST_TT_ADD_REFERENCE_HPP_INCLUDED
-  #define BOOST_TT_ADD_REFERENCE_HPP_INCLUDED
-  
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ #endif
-+ 
-  #include "boost/type_traits/is_reference.hpp"
-  #include "boost/detail/workaround.hpp"
-  #include "boost/config.hpp"
-***************
-*** 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 Dec  5 10:08:58 2007
-***************
-*** 10,15 ****
---- 10,20 ----
-  #ifndef BOOST_TT_IS_BASE_AND_DERIVED_HPP_INCLUDED
-  #define BOOST_TT_IS_BASE_AND_DERIVED_HPP_INCLUDED
-  
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ #endif
-+ 
-  #include "boost/type_traits/is_class.hpp"
-  #include "boost/type_traits/is_same.hpp"
-  #include "boost/type_traits/is_convertible.hpp"
-***************
-*** 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 Dec  5 10:08:58 2007
-***************
-*** 6,11 ****
---- 6,16 ----
-  #ifndef BOOST_TT_IS_POLYMORPHIC_HPP
-  #define BOOST_TT_IS_POLYMORPHIC_HPP
-  
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ #endif
-+ 
-  #include <boost/type_traits/is_class.hpp>
-  #include <boost/type_traits/remove_cv.hpp>
-  // should be the last #include
-***************
-*** 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 Dec  5 10:08:58 2007
-***************
-*** 16,21 ****
---- 16,26 ----
-  #ifndef BOOST_UTILITY_ADDRESSOF_HPP
-  # define BOOST_UTILITY_ADDRESSOF_HPP
-  
-+ #if defined _MSC_VER
-+ #pragma warning(push)
-+ #pragma warning(disable: 4668) // "id is not defined as a preprocessor macro"
-+ #endif
-+ 
-  # include <boost/config.hpp>
-  # include <boost/detail/workaround.hpp>
-  # if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
-***************
-*** 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 Dec  5 10:08:58 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 ----
-***************
-*** 185,193 ****
-  }
-  
-  } // namespace boost
-- 
-- #ifdef BOOST_MSVC
-- # pragma warning(pop)
-- #endif    
-  
-  #endif  // #ifndef BOOST_WEAK_PTR_HPP_INCLUDED
---- 180,184 ----
diff --git a/boost/spirit/makefile.mk b/boost/spirit/makefile.mk
deleted file mode 100644
index e34465e4cd34..000000000000
--- a/boost/spirit/makefile.mk
+++ /dev/null
@@ -1,81 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.9 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# Hopefully we can move to a newer boost version soon, coming with spirit 1.8.*,
-# so there won't be the need handle a separate spirit 1.6.* anymore.
-# Depends on the compilers... :(
-
-# dmake create_clean -- just unpacks
-# dmake patch -- unpacks and applies patch file
-# dmake create_patch -- creates a patch file
-
-PRJ=..
-
-PRJNAME=ooo_boost
-TARGET=ooo_spirit
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# force patched boost for sunpro CC
-# to workaround opt bug when compiling with -xO3
-.IF "$(SYSTEM_BOOST)" == "YES" && ("$(OS)"!="SOLARIS" || "$(COM)"=="GCC")
-all:
-        @echo "An already available installation of boost should exist on your system."
-        @echo "Therefore the version provided here does not need to be built in addition."
-.ELSE
-
-# --- Files --------------------------------------------------------
-
-.IF "$(COMID)"=="gcc3" && "$(CCNUMVER)">="000400000000" 
-all:
-        @echo "spirit is already included in boost 1.34"
-.ELSE
-
-TARFILE_NAME=spirit-1.6.1
-PATCH_FILES=$(PRJ)$/$(TARFILE_NAME).patch
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=
-
-BUILD_DIR=
-BUILD_ACTION=
-BUILD_FLAGS=
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
-.ENDIF
-.ENDIF
author	Ivo Hinkelmann <ihi@openoffice.org>	2009-09-17 10:11:42 +0000
committer	Ivo Hinkelmann <ihi@openoffice.org>	2009-09-17 10:11:42 +0000
commit	48f8d30dfa1ba1d5a902db7d401aa3c77d780ff7 (patch)
tree	dbc8315867f792adb6d682072ec697cccf9777a2 /boost
parent	c5c13c0be9673f12ba3c1a50610afbbb32dab94a (diff)