62 files changed, 95 insertions, 595 deletions

diff --git a/indexlib/boost-compat/checked_delete.hpp b/indexlib/boost-compat/checked_delete.h
index 9bb84e8e..db740fcb 100644
--- a/indexlib/boost-compat/checked_delete.hpp
+++ b/indexlib/boost-compat/checked_delete.h
@@ -1,5 +1,5 @@
-#ifndef BOOST_CHECKED_DELETE_HPP_INCLUDED
-#define BOOST_CHECKED_DELETE_HPP_INCLUDED
+#ifndef BOOST_CHECKED_DELETE_H_INCLUDED
+#define BOOST_CHECKED_DELETE_H_INCLUDED
 
 // MS compatible compilers support #pragma once
 
@@ -66,4 +66,4 @@ template<class T> struct checked_array_deleter
 
 } // namespace boost
 
-#endif  // #ifndef BOOST_CHECKED_DELETE_HPP_INCLUDED
+#endif  // #ifndef BOOST_CHECKED_DELETE_H_INCLUDED
diff --git a/indexlib/boost-compat/config.hpp b/indexlib/boost-compat/config.h
index 055a2785..86f12b81 100644
--- a/indexlib/boost-compat/config.hpp
+++ b/indexlib/boost-compat/config.h
@@ -1,4 +1,4 @@
-//  Boost config.hpp configuration header file  ------------------------------//
+//  Boost config.h configuration header file  ------------------------------//
 
 //  (C) Copyright John Maddock 2002. 
 //  Use, modification and distribution are subject to the 
@@ -7,15 +7,15 @@
 
 //  See http://www.boost.org/libs/config for most recent version.
 
-//  Boost config.hpp policy and rationale documentation has been moved to
+//  Boost config.h policy and rationale documentation has been moved to
 //  http://www.boost.org/libs/config
 //
 //  CAUTION: This file is intended to be completely stable -
 //           DO NOT MODIFY THIS FILE!
 //
 
-#ifndef BOOST_CONFIG_HPP
-#define BOOST_CONFIG_HPP
+#ifndef BOOST_CONFIG_H
+#define BOOST_CONFIG_H
 
 // if we don't have a user config, then use the default location:
 #if !defined(BOOST_USER_CONFIG) && !defined(BOOST_NO_USER_CONFIG)
@@ -56,7 +56,7 @@
 // get config suffix code:
 #include <boost/config/suffix.hpp>
 
-#endif  // BOOST_CONFIG_HPP
+#endif  // BOOST_CONFIG_H
 
 
 
diff --git a/indexlib/boost-compat/config/abi/borland_prefix.hpp b/indexlib/boost-compat/config/abi/borland_prefix.h
index 49f42494..49f42494 100644
--- a/indexlib/boost-compat/config/abi/borland_prefix.hpp
+++ b/indexlib/boost-compat/config/abi/borland_prefix.h
diff --git a/indexlib/boost-compat/config/abi/borland_suffix.hpp b/indexlib/boost-compat/config/abi/borland_suffix.h
index 940535f3..940535f3 100644
--- a/indexlib/boost-compat/config/abi/borland_suffix.hpp
+++ b/indexlib/boost-compat/config/abi/borland_suffix.h
diff --git a/indexlib/boost-compat/config/abi/msvc_prefix.hpp b/indexlib/boost-compat/config/abi/msvc_prefix.h
index 3d3905c2..3d3905c2 100644
--- a/indexlib/boost-compat/config/abi/msvc_prefix.hpp
+++ b/indexlib/boost-compat/config/abi/msvc_prefix.h
diff --git a/indexlib/boost-compat/config/abi/msvc_suffix.hpp b/indexlib/boost-compat/config/abi/msvc_suffix.h
index a64d783e..a64d783e 100644
--- a/indexlib/boost-compat/config/abi/msvc_suffix.hpp
+++ b/indexlib/boost-compat/config/abi/msvc_suffix.h
diff --git a/indexlib/boost-compat/config/abi_prefix.hpp b/indexlib/boost-compat/config/abi_prefix.h
index 1733dc03..d4ddd29b 100644
--- a/indexlib/boost-compat/config/abi_prefix.hpp
+++ b/indexlib/boost-compat/config/abi_prefix.h
@@ -6,8 +6,8 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt).
 
-#ifndef BOOST_CONFIG_ABI_PREFIX_HPP
-# define BOOST_CONFIG_ABI_PREFIX_HPP
+#ifndef BOOST_CONFIG_ABI_PREFIX_H
+# define BOOST_CONFIG_ABI_PREFIX_H
 #else
 # error double inclusion of header boost/config/abi_prefix.hpp is an error
 #endif
diff --git a/indexlib/boost-compat/config/abi_suffix.hpp b/indexlib/boost-compat/config/abi_suffix.h
index 6339da63..4876507e 100644
--- a/indexlib/boost-compat/config/abi_suffix.hpp
+++ b/indexlib/boost-compat/config/abi_suffix.h
@@ -9,10 +9,10 @@
 // This header should be #included AFTER code that was preceded by a #include
 // <boost/config/abi_prefix.hpp>.
 
-#ifndef BOOST_CONFIG_ABI_PREFIX_HPP
+#ifndef BOOST_CONFIG_ABI_PREFIX_H
 # error Header boost/config/abi_prefix.hpp must only be used after boost/config/abi_prefix.hpp
 #else
-# undef BOOST_CONFIG_ABI_PREFIX_HPP
+# undef BOOST_CONFIG_ABI_PREFIX_H
 #endif
 
 // the suffix header occurs after all of our code:
diff --git a/indexlib/boost-compat/config/auto_link.hpp b/indexlib/boost-compat/config/auto_link.h
index b4e580ff..e3bdc41d 100644
--- a/indexlib/boost-compat/config/auto_link.hpp
+++ b/indexlib/boost-compat/config/auto_link.h
@@ -5,9 +5,9 @@
 
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
-  *   FILE         auto_link.hpp
+  *   FILE         auto_link.h
   *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Automatic library inclusion for Borland/Microsoft compilers.
+  *   DESCRIPTION: Automatic library inclusion for Microsoft compilers.
   */
 
 /*************************************************************************
@@ -29,7 +29,7 @@ has no include guards - so be sure to include it only once from your library!
 Algorithm:
 ~~~~~~~~~~
 
-Libraries for Borland and Microsoft compilers are automatically
+Libraries for Microsoft compilers are automatically
 selected here, the name of the lib is selected according to the following
 formula:
 
@@ -67,10 +67,10 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 ***************************************************************************/
 
 #ifdef __cplusplus
-#  ifndef BOOST_CONFIG_HPP
+#  ifndef BOOST_CONFIG_H
 #     include <boost/config.hpp>
 #  endif
-#elif defined(_MSC_VER) && !defined(__MWERKS__) && !defined(__EDG_VERSION__)
+#elif defined(_MSC_VER) && !defined(__EDG_VERSION__)
 //
 // C language compatability (no, honestly)
 //
@@ -82,11 +82,9 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 // Only include what follows for known and supported compilers:
 //
 #if defined(BOOST_MSVC) \
-    || defined(__BORLANDC__) \
-    || (defined(__MWERKS__) && defined(_WIN32) && (__MWERKS__ >= 0x3000)) \
     || (defined(__ICL) && defined(_MSC_EXTENSIONS) && (_MSC_VER >= 1200))
 
-#ifndef BOOST_VERSION_HPP
+#ifndef BOOST_VERSION_H
 #  include <boost/version.hpp>
 #endif
 
@@ -125,26 +123,11 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
    // vc80:
 #  define BOOST_LIB_TOOLSET "vc80"
 
-#elif defined(__BORLANDC__)
-
-   // CBuilder 6:
-#  define BOOST_LIB_TOOLSET "bcb"
-
 #elif defined(__ICL)
 
    // Intel C++, no version number:
 #  define BOOST_LIB_TOOLSET "iw"
 
-#elif defined(__MWERKS__) && (__MWERKS__ <= 0x31FF )
-
-   // Metrowerks CodeWarrior 8.x
-#  define BOOST_LIB_TOOLSET "cw8"
-
-#elif defined(__MWERKS__) && (__MWERKS__ <= 0x32FF )
-
-   // Metrowerks CodeWarrior 9.x
-#  define BOOST_LIB_TOOLSET "cw9"
-
 #endif
 
 //
@@ -156,7 +139,7 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 #  define BOOST_LIB_THREAD_OPT
 #endif
 
-#if defined(_MSC_VER) || defined(__MWERKS__)
+#if defined(_MSC_VER)
 
 #  ifdef _DLL
 
@@ -232,37 +215,6 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 
 #  endif
 
-#elif defined(__BORLANDC__)
-
-//
-// figure out whether we want the debug builds or not:
-//
-#pragma defineonoption BOOST_BORLAND_DEBUG -v
-//
-// sanity check:
-//
-#if defined(__STL_DEBUG) || defined(_STLP_DEBUG)
-#error "Pre-built versions of the Boost libraries are not provided in STLPort-debug form"
-#endif
-
-#  ifdef _RTLDLL
-
-#     ifdef BOOST_BORLAND_DEBUG
-#         define BOOST_LIB_RT_OPT "-d"
-#     else
-#         define BOOST_LIB_RT_OPT
-#     endif
-
-#  else
-
-#     ifdef BOOST_BORLAND_DEBUG
-#         define BOOST_LIB_RT_OPT "-sd"
-#     else
-#         define BOOST_LIB_RT_OPT "-s"
-#     endif
-
-#  endif
-
 #endif
 
 //
@@ -296,7 +248,7 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 #endif
 
 
-#endif // _MSC_VER || __BORLANDC__
+#endif // _MSC_VER
 
 //
 // finally undef any macros we may have set:
diff --git a/indexlib/boost-compat/config/compiler/borland.hpp b/indexlib/boost-compat/config/compiler/borland.hpp
deleted file mode 100644
index 531691ef..00000000
--- a/indexlib/boost-compat/config/compiler/borland.hpp
+++ /dev/null
@@ -1,177 +0,0 @@
-//  (C) Copyright John Maddock 2001 - 2003.
-//  (C) Copyright David Abrahams 2002 - 2003.
-//  (C) Copyright Aleksey Gurtovoy 2002.
-//  Use, modification and distribution are subject to the
-//  Boost Software License, Version 1.0. (See accompanying file
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org for most recent version.
-
-//  Borland C++ compiler setup:
-
-// Version 5.0 and below:
-#   if __BORLANDC__ <= 0x0550
-// Borland C++Builder 4 and 5:
-#     define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-#     if __BORLANDC__ == 0x0550
-// Borland C++Builder 5, command-line compiler 5.5:
-#       define BOOST_NO_OPERATORS_IN_NAMESPACE
-#     endif
-#   endif
-
-// Version 5.51 and below:
-#if (__BORLANDC__ <= 0x551)
-#  define BOOST_NO_CV_SPECIALIZATIONS
-#  define BOOST_NO_CV_VOID_SPECIALIZATIONS
-#  define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
-#  define BOOST_NO_DEDUCED_TYPENAME
-// workaround for missing WCHAR_MAX/WCHAR_MIN:
-#include <climits>
-#include <cwchar>
-#ifndef WCHAR_MAX
-#  define WCHAR_MAX 0xffff
-#endif
-#ifndef WCHAR_MIN
-#  define WCHAR_MIN 0
-#endif
-#endif
-
-#if (__BORLANDC__ <= 0x564)
-#  define BOOST_NO_SFINAE
-#endif
-
-// Version 7.0 (Kylix) and below:
-#if (__BORLANDC__ <= 0x570)
-#  define BOOST_NO_INTEGRAL_INT64_T
-#  define BOOST_NO_DEPENDENT_NESTED_DERIVATIONS
-#  define BOOST_NO_PRIVATE_IN_AGGREGATE
-#  define BOOST_NO_USING_TEMPLATE
-#  define BOOST_BCB_PARTIAL_SPECIALIZATION_BUG
-#  define BOOST_NO_TEMPLATE_TEMPLATES
-#  define BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE
-#  define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-   // we shouldn't really need this - but too many things choke
-   // without it, this needs more investigation:
-#  define BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
-#  define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
-#  ifdef NDEBUG
-      // fix broken <cstring> so that Boost.test works:
-#     include <cstring>
-#     undef strcmp
-#  endif
-
-//
-// new bug in 5.61:
-#if (__BORLANDC__ >= 0x561) && (__BORLANDC__ <= 0x570)
-   // this seems to be needed by the command line compiler, but not the IDE:
-#  define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
-#endif
-
-#  ifdef _WIN32
-#     define BOOST_NO_SWPRINTF
-#  elif defined(linux) || defined(__linux__) || defined(__linux)
-      // we should really be able to do without this
-      // but the wcs* functions aren't imported into std::
-#     define BOOST_NO_STDC_NAMESPACE
-      // _CPPUNWIND doesn't get automatically set for some reason:
-#     pragma defineonoption BOOST_CPPUNWIND -x
-#  endif
-#endif
-
-//
-// Post 0x561 we have long long and stdint.h:
-#if __BORLANDC__ >= 0x561
-#  ifndef __NO_LONG_LONG
-#     define BOOST_HAS_LONG_LONG
-#  endif
-   // On non-Win32 platforms let the platform config figure this out:
-#  ifdef _WIN32
-#      define BOOST_HAS_STDINT_H
-#  endif
-#endif
-
-// Borland C++Builder 6 defaults to using STLPort.  If _USE_OLD_RW_STL is
-// defined, then we have 0x560 or greater with the Rogue Wave implementation
-// which presumably has the std::DBL_MAX bug.
-#if ((__BORLANDC__ >= 0x550) && (__BORLANDC__ < 0x560)) || defined(_USE_OLD_RW_STL)
-// <climits> is partly broken, some macros define symbols that are really in
-// namespace std, so you end up having to use illegal constructs like
-// std::DBL_MAX, as a fix we'll just include float.h and have done with:
-#include <float.h>
-#endif
-//
-// __int64:
-//
-#if (__BORLANDC__ >= 0x530) && !defined(__STRICT_ANSI__)
-#  define BOOST_HAS_MS_INT64
-#endif
-//
-// check for exception handling support:
-//
-#if !defined(_CPPUNWIND) && !defined(BOOST_CPPUNWIND) && !defined(__EXCEPTIONS)
-#  define BOOST_NO_EXCEPTIONS
-#endif
-//
-// all versions have a <dirent.h>:
-//
-#ifndef __STRICT_ANSI__
-#  define BOOST_HAS_DIRENT_H
-#endif
-//
-// all versions support __declspec:
-//
-#ifndef __STRICT_ANSI__
-#  define BOOST_HAS_DECLSPEC
-#endif
-//
-// ABI fixing headers:
-//
-#if __BORLANDC__ < 0x600 // not implemented for version 6 compiler yet
-#ifndef BOOST_ABI_PREFIX
-#  define BOOST_ABI_PREFIX "boost/config/abi/borland_prefix.hpp"
-#endif
-#ifndef BOOST_ABI_SUFFIX
-#  define BOOST_ABI_SUFFIX "boost/config/abi/borland_suffix.hpp"
-#endif
-#endif
-//
-// Disable Win32 support in ANSI mode:
-//
-#if __BORLANDC__ < 0x600
-#  pragma defineonoption BOOST_DISABLE_WIN32 -A
-#elif defined(__STRICT_ANSI__)
-#  define BOOST_DISABLE_WIN32
-#endif
-//
-// MSVC compatibility mode does some nasty things:
-//
-#if defined(_MSC_VER) && (_MSC_VER <= 1200)
-#  define BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
-#  define BOOST_NO_VOID_RETURNS
-#endif
-
-#define BOOST_COMPILER "Borland C++ version " BOOST_STRINGIZE(__BORLANDC__)
-
-//
-// versions check:
-// we don't support Borland prior to version 5.4:
-#if __BORLANDC__ < 0x540
-#  error "Compiler not supported or configured - please reconfigure"
-#endif
-//
-// last known and checked version is 1536 (Builder X preview):
-#if (__BORLANDC__ > 1536)
-#  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
-
-
-
-
-
-
-
-
diff --git a/indexlib/boost-compat/config/compiler/comeau.hpp b/indexlib/boost-compat/config/compiler/comeau.h
index 16a1b93c..16a1b93c 100644
--- a/indexlib/boost-compat/config/compiler/comeau.hpp
+++ b/indexlib/boost-compat/config/compiler/comeau.h
diff --git a/indexlib/boost-compat/config/compiler/common_edg.hpp b/indexlib/boost-compat/config/compiler/common_edg.h
index c7c0b56e..28b164a8 100644
--- a/indexlib/boost-compat/config/compiler/common_edg.hpp
+++ b/indexlib/boost-compat/config/compiler/common_edg.h
@@ -34,7 +34,7 @@
 #   define BOOST_NO_TEMPLATE_TEMPLATES
 #endif 
 
-// See also kai.hpp which checks a Kai-specific symbol for EH
+// See also kai.h which checks a Kai-specific symbol for EH
 # if !defined(__KCC) && !defined(__EXCEPTIONS)
 #     define BOOST_NO_EXCEPTIONS
 # endif
diff --git a/indexlib/boost-compat/config/compiler/compaq_cxx.hpp b/indexlib/boost-compat/config/compiler/compaq_cxx.h
index 3c0c6b7f..3c0c6b7f 100644
--- a/indexlib/boost-compat/config/compiler/compaq_cxx.hpp
+++ b/indexlib/boost-compat/config/compiler/compaq_cxx.h
diff --git a/indexlib/boost-compat/config/compiler/digitalmars.hpp b/indexlib/boost-compat/config/compiler/digitalmars.h
index 32fc71fa..32fc71fa 100644
--- a/indexlib/boost-compat/config/compiler/digitalmars.hpp
+++ b/indexlib/boost-compat/config/compiler/digitalmars.h
diff --git a/indexlib/boost-compat/config/compiler/gcc.hpp b/indexlib/boost-compat/config/compiler/gcc.h
index 4dc3f608..4be7f408 100644
--- a/indexlib/boost-compat/config/compiler/gcc.hpp
+++ b/indexlib/boost-compat/config/compiler/gcc.h
@@ -13,10 +13,6 @@
 
 //  GNU C++ compiler setup:
 
-#   if __GNUC__ == 2 && __GNUC_MINOR__ == 91
-       // egcs 1.1 won't parse shared_ptr.hpp without this:
-#      define BOOST_NO_AUTO_PTR
-#   endif
 #   if __GNUC__ == 2 && __GNUC_MINOR__ < 95
       //
       // Prior to gcc 2.95 member templates only partly
diff --git a/indexlib/boost-compat/config/compiler/greenhills.hpp b/indexlib/boost-compat/config/compiler/greenhills.h
index 038b6b2b..038b6b2b 100644
--- a/indexlib/boost-compat/config/compiler/greenhills.hpp
+++ b/indexlib/boost-compat/config/compiler/greenhills.h
diff --git a/indexlib/boost-compat/config/compiler/hp_acc.hpp b/indexlib/boost-compat/config/compiler/hp_acc.h
index b5c587ab..b5c587ab 100644
--- a/indexlib/boost-compat/config/compiler/hp_acc.hpp
+++ b/indexlib/boost-compat/config/compiler/hp_acc.h
diff --git a/indexlib/boost-compat/config/compiler/intel.hpp b/indexlib/boost-compat/config/compiler/intel.h
index 060338bc..060338bc 100644
--- a/indexlib/boost-compat/config/compiler/intel.hpp
+++ b/indexlib/boost-compat/config/compiler/intel.h
diff --git a/indexlib/boost-compat/config/compiler/kai.hpp b/indexlib/boost-compat/config/compiler/kai.h
index de16f1a6..fefda9ce 100644
--- a/indexlib/boost-compat/config/compiler/kai.hpp
+++ b/indexlib/boost-compat/config/compiler/kai.h
@@ -16,7 +16,7 @@
 #     define BOOST_NO_STDC_NAMESPACE
 #   endif
 
-// see also common_edg.hpp which needs a special check for __KCC
+// see also common_edg.h which needs a special check for __KCC
 # if !defined(_EXCEPTIONS)
 #     define BOOST_NO_EXCEPTIONS
 # endif
diff --git a/indexlib/boost-compat/config/compiler/metrowerks.hpp b/indexlib/boost-compat/config/compiler/metrowerks.hpp
deleted file mode 100644
index a74cadef..00000000
--- a/indexlib/boost-compat/config/compiler/metrowerks.hpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//  (C) Copyright John Maddock 2001. 
-//  (C) Copyright Darin Adler 2001. 
-//  (C) Copyright Peter Dimov 2001. 
-//  (C) Copyright David Abrahams 2001 - 2002. 
-//  (C) Copyright Beman Dawes 2001 - 2003. 
-//  (C) Copyright Stefan Slapeta 2004. 
-//  Use, modification and distribution are subject to the 
-//  Boost Software License, Version 1.0. (See accompanying file 
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org for most recent version.
-
-//  Metrowerks C++ compiler setup:
-
-// locale support is disabled when linking with the dynamic runtime
-#   ifdef _MSL_NO_LOCALE
-#     define BOOST_NO_STD_LOCALE
-#   endif 
-
-#   if __MWERKS__ <= 0x2301  // 5.3
-#     define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-#     define BOOST_NO_POINTER_TO_MEMBER_CONST
-#     define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
-#     define BOOST_NO_MEMBER_TEMPLATE_KEYWORD
-#   endif
-
-#   if __MWERKS__ <= 0x2401  // 6.2
-//#     define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-#   endif
-
-#   if(__MWERKS__ <= 0x2407)  // 7.x
-#     define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
-#     define BOOST_NO_UNREACHABLE_RETURN_DETECTION
-#   endif
-
-#   if(__MWERKS__ <= 0x3003)  // 8.x
-#     define BOOST_NO_SFINAE
-#    endif
-
-#   if(__MWERKS__ <= 0x3204)  // 9.3
-#     define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
-#    endif
-
-#if !__option(wchar_type)
-#   define BOOST_NO_INTRINSIC_WCHAR_T
-#endif
-
-#if !__option(exceptions)
-#   define BOOST_NO_EXCEPTIONS
-#endif
-
-#if (__INTEL__ && _WIN32) || (__POWERPC__ && macintosh)
-#   if __MWERKS__ == 0x3000
-#     define BOOST_COMPILER_VERSION 8.0
-#   elif __MWERKS__ == 0x3001
-#     define BOOST_COMPILER_VERSION 8.1
-#   elif __MWERKS__ == 0x3002
-#     define BOOST_COMPILER_VERSION 8.2
-#   elif __MWERKS__ == 0x3003
-#     define BOOST_COMPILER_VERSION 8.3
-#   elif __MWERKS__ == 0x3200
-#     define BOOST_COMPILER_VERSION 9.0
-#   elif __MWERKS__ == 0x3201
-#     define BOOST_COMPILER_VERSION 9.1
-#   elif __MWERKS__ == 0x3202
-#     define BOOST_COMPILER_VERSION 9.2
-#   elif __MWERKS__ == 0x3204
-#     define BOOST_COMPILER_VERSION 9.3
-#   else
-#     define BOOST_COMPILER_VERSION __MWERKS__
-#   endif
-#else
-#  define BOOST_COMPILER_VERSION __MWERKS__
-#endif
-
-#define BOOST_COMPILER "Metrowerks CodeWarrior C++ version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)
-
-//
-// versions check:
-// we don't support Metrowerks prior to version 5.3:
-#if __MWERKS__ < 0x2301
-#  error "Compiler not supported or configured - please reconfigure"
-#endif
-//
-// last known and checked version:
-#if (__MWERKS__ > 0x3204)
-#  if defined(BOOST_ASSERT_CONFIG)
-#     error "Unknown compiler version - please run the configure tests and report the results"
-#  endif
-#endif
-
-
-
-
-
-
-
diff --git a/indexlib/boost-compat/config/compiler/mpw.hpp b/indexlib/boost-compat/config/compiler/mpw.h
index 8ab2aacb..8ab2aacb 100644
--- a/indexlib/boost-compat/config/compiler/mpw.hpp
+++ b/indexlib/boost-compat/config/compiler/mpw.h
diff --git a/indexlib/boost-compat/config/compiler/sgi_mipspro.hpp b/indexlib/boost-compat/config/compiler/sgi_mipspro.h
index 689b67ee..689b67ee 100644
--- a/indexlib/boost-compat/config/compiler/sgi_mipspro.hpp
+++ b/indexlib/boost-compat/config/compiler/sgi_mipspro.h
diff --git a/indexlib/boost-compat/config/compiler/sunpro_cc.hpp b/indexlib/boost-compat/config/compiler/sunpro_cc.h
index 8a61199f..80dc3913 100644
--- a/indexlib/boost-compat/config/compiler/sunpro_cc.hpp
+++ b/indexlib/boost-compat/config/compiler/sunpro_cc.h
@@ -38,7 +38,7 @@
        // Requesting debug info (-g) with Boost.Python results
        // in an internal compiler error for "static const"
        // initialized in-class.
-       //    >> Assertion:   (../links/dbg_cstabs.cc, line 611)
+       //    >> Assertion:   (../links/dbg_cstabs.cpp, line 611)
        //         while processing ../test.cpp at line 0.
        // (Jens Maurer according to Gottfried Ganßauge 04 Mar 2002)
 #      define BOOST_NO_INCLASS_MEMBER_INITIALIZATION
diff --git a/indexlib/boost-compat/config/compiler/vacpp.hpp b/indexlib/boost-compat/config/compiler/vacpp.h
index 4cf0de7c..4cf0de7c 100644
--- a/indexlib/boost-compat/config/compiler/vacpp.hpp
+++ b/indexlib/boost-compat/config/compiler/vacpp.h
diff --git a/indexlib/boost-compat/config/compiler/visualc.hpp b/indexlib/boost-compat/config/compiler/visualc.h
index 32353260..32353260 100644
--- a/indexlib/boost-compat/config/compiler/visualc.hpp
+++ b/indexlib/boost-compat/config/compiler/visualc.h
diff --git a/indexlib/boost-compat/config/platform/aix.hpp b/indexlib/boost-compat/config/platform/aix.h
index 894ef42c..894ef42c 100644
--- a/indexlib/boost-compat/config/platform/aix.hpp
+++ b/indexlib/boost-compat/config/platform/aix.h
diff --git a/indexlib/boost-compat/config/platform/amigaos.hpp b/indexlib/boost-compat/config/platform/amigaos.h
index 34bcf412..34bcf412 100644
--- a/indexlib/boost-compat/config/platform/amigaos.hpp
+++ b/indexlib/boost-compat/config/platform/amigaos.h
diff --git a/indexlib/boost-compat/config/platform/beos.hpp b/indexlib/boost-compat/config/platform/beos.h
index 48c3d8dc..48c3d8dc 100644
--- a/indexlib/boost-compat/config/platform/beos.hpp
+++ b/indexlib/boost-compat/config/platform/beos.h
diff --git a/indexlib/boost-compat/config/platform/bsd.hpp b/indexlib/boost-compat/config/platform/bsd.h
index 4f04ed2a..4f04ed2a 100644
--- a/indexlib/boost-compat/config/platform/bsd.hpp
+++ b/indexlib/boost-compat/config/platform/bsd.h
diff --git a/indexlib/boost-compat/config/platform/cygwin.hpp b/indexlib/boost-compat/config/platform/cygwin.h
index 0fd2ebe2..0fd2ebe2 100644
--- a/indexlib/boost-compat/config/platform/cygwin.hpp
+++ b/indexlib/boost-compat/config/platform/cygwin.h
diff --git a/indexlib/boost-compat/config/platform/hpux.hpp b/indexlib/boost-compat/config/platform/hpux.h
index 21049059..21049059 100644
--- a/indexlib/boost-compat/config/platform/hpux.hpp
+++ b/indexlib/boost-compat/config/platform/hpux.h
diff --git a/indexlib/boost-compat/config/platform/irix.hpp b/indexlib/boost-compat/config/platform/irix.h
index aeae49c8..aeae49c8 100644
--- a/indexlib/boost-compat/config/platform/irix.hpp
+++ b/indexlib/boost-compat/config/platform/irix.h
diff --git a/indexlib/boost-compat/config/platform/linux.hpp b/indexlib/boost-compat/config/platform/linux.h
index 51ae1334..51ae1334 100644
--- a/indexlib/boost-compat/config/platform/linux.hpp
+++ b/indexlib/boost-compat/config/platform/linux.h
diff --git a/indexlib/boost-compat/config/platform/macos.hpp b/indexlib/boost-compat/config/platform/macos.h
index 3a5f4130..3a5f4130 100644
--- a/indexlib/boost-compat/config/platform/macos.hpp
+++ b/indexlib/boost-compat/config/platform/macos.h
diff --git a/indexlib/boost-compat/config/platform/solaris.hpp b/indexlib/boost-compat/config/platform/solaris.h
index 700dc3ce..700dc3ce 100644
--- a/indexlib/boost-compat/config/platform/solaris.hpp
+++ b/indexlib/boost-compat/config/platform/solaris.h
diff --git a/indexlib/boost-compat/config/platform/win32.hpp b/indexlib/boost-compat/config/platform/win32.h
index 548bff28..548bff28 100644
--- a/indexlib/boost-compat/config/platform/win32.hpp
+++ b/indexlib/boost-compat/config/platform/win32.h
diff --git a/indexlib/boost-compat/config/posix_features.hpp b/indexlib/boost-compat/config/posix_features.h
index 4afb476b..4afb476b 100644
--- a/indexlib/boost-compat/config/posix_features.hpp
+++ b/indexlib/boost-compat/config/posix_features.h
diff --git a/indexlib/boost-compat/config/requires_threads.hpp b/indexlib/boost-compat/config/requires_threads.h
index cfaff230..ffa75e9d 100644
--- a/indexlib/boost-compat/config/requires_threads.hpp
+++ b/indexlib/boost-compat/config/requires_threads.h
@@ -4,10 +4,10 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 
-#ifndef BOOST_CONFIG_REQUIRES_THREADS_HPP
-#define BOOST_CONFIG_REQUIRES_THREADS_HPP
+#ifndef BOOST_CONFIG_REQUIRES_THREADS_H
+#define BOOST_CONFIG_REQUIRES_THREADS_H
 
-#ifndef BOOST_CONFIG_HPP
+#ifndef BOOST_CONFIG_H
 #  include <boost/config.hpp>
 #endif
 
@@ -50,18 +50,6 @@
 //  SGI MIPSpro C++
 #   error "Compiler threading support is not turned on. Please set the correct command line options for threading: -D_SGI_MP_SOURCE"
 
-#elif defined __DECCXX
-//  Compaq Tru64 Unix cxx
-#   error "Compiler threading support is not turned on. Please set the correct command line options for threading: -pthread"
-
-#elif defined __BORLANDC__
-//  Borland
-#   error "Compiler threading support is not turned on. Please set the correct command line options for threading: -tWM"
-
-#elif defined  __MWERKS__
-//  Metrowerks CodeWarrior
-#   error "Compiler threading support is not turned on. Please set the correct command line options for threading: either -runtime sm, -runtime smd, -runtime dm, or -runtime dmd"
-
 #elif defined  __SUNPRO_CC
 //  Sun Workshop Compiler C++
 #   error "Compiler threading support is not turned on. Please set the correct command line options for threading: -mt"
@@ -77,8 +65,7 @@
 #elif defined _MSC_VER
 //  Microsoft Visual C++
 //
-//  Must remain the last #elif since some other vendors (Metrowerks, for
-//  example) also #define _MSC_VER
+//  Must remain the last #elif since some other vendors may also #define _MSC_VER
 #  error "Compiler threading support is not turned on. Please set the correct command line options for threading: either /MT /MTd /MD or /MDd"
 
 #else
@@ -89,4 +76,4 @@
 
 #endif // BOOST_HAS_THREADS
 
-#endif // BOOST_CONFIG_REQUIRES_THREADS_HPP
+#endif // BOOST_CONFIG_REQUIRES_THREADS_H
diff --git a/indexlib/boost-compat/config/select_compiler_config.hpp b/indexlib/boost-compat/config/select_compiler_config.h
index 3453f1a3..00b4de96 100644
--- a/indexlib/boost-compat/config/select_compiler_config.hpp
+++ b/indexlib/boost-compat/config/select_compiler_config.h
@@ -36,22 +36,10 @@
 //  SGI MIPSpro C++
 #   define BOOST_COMPILER_CONFIG "boost/config/compiler/sgi_mipspro.hpp"
 
-#elif defined __DECCXX
-//  Compaq Tru64 Unix cxx
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/compaq_cxx.hpp"
-
 #elif defined __ghs
 //  Greenhills C++
 #   define BOOST_COMPILER_CONFIG "boost/config/compiler/greenhills.hpp"
 
-#elif defined __BORLANDC__
-//  Borland
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/borland.hpp"
-
-#elif defined  __MWERKS__
-//  Metrowerks CodeWarrior
-#   define BOOST_COMPILER_CONFIG "boost/config/compiler/metrowerks.hpp"
-
 #elif defined  __SUNPRO_CC
 //  Sun Workshop Compiler C++
 #   define BOOST_COMPILER_CONFIG "boost/config/compiler/sunpro_cc.hpp"
@@ -71,8 +59,7 @@
 #elif defined _MSC_VER
 //  Microsoft Visual C++
 //
-//  Must remain the last #elif since some other vendors (Metrowerks, for
-//  example) also #define _MSC_VER
+//  Must remain the last #elif since some other vendors may also #define _MSC_VER
 #   define BOOST_COMPILER_CONFIG "boost/config/compiler/visualc.hpp"
 
 #elif defined (BOOST_ASSERT_CONFIG)
diff --git a/indexlib/boost-compat/config/select_platform_config.hpp b/indexlib/boost-compat/config/select_platform_config.h
index 5699b2a2..5699b2a2 100644
--- a/indexlib/boost-compat/config/select_platform_config.hpp
+++ b/indexlib/boost-compat/config/select_platform_config.h
diff --git a/indexlib/boost-compat/config/select_stdlib_config.hpp b/indexlib/boost-compat/config/select_stdlib_config.h
index b7bf5914..a061c5be 100644
--- a/indexlib/boost-compat/config/select_stdlib_config.hpp
+++ b/indexlib/boost-compat/config/select_stdlib_config.h
@@ -41,10 +41,6 @@
 // generic SGI STL
 #  define BOOST_STDLIB_CONFIG "boost/config/stdlib/sgi.hpp"
 
-#elif defined(__MSL_CPP__)
-// MSL standard lib:
-#  define BOOST_STDLIB_CONFIG "boost/config/stdlib/msl.hpp"
-
 #elif defined(__IBMCPP__)
 // take the default VACPP std lib
 #  define BOOST_STDLIB_CONFIG "boost/config/stdlib/vacpp.hpp"
diff --git a/indexlib/boost-compat/config/stdlib/dinkumware.hpp b/indexlib/boost-compat/config/stdlib/dinkumware.h
index aa214fc1..a3c4f091 100644
--- a/indexlib/boost-compat/config/stdlib/dinkumware.hpp
+++ b/indexlib/boost-compat/config/stdlib/dinkumware.h
@@ -22,7 +22,7 @@
 #if defined(_CPPLIB_VER) && (_CPPLIB_VER >= 306)
    // full dinkumware 3.06 and above
    // fully conforming provided the compiler supports it:
-#  if !(defined(_GLOBAL_USING) && (_GLOBAL_USING+0 > 0)) && !defined(__BORLANDC__) && !defined(_STD) && !(defined(__ICC) && (__ICC >= 700))   // can be defined in yvals.h
+#  if !(defined(_GLOBAL_USING) && (_GLOBAL_USING+0 > 0)) && !defined(_STD) && !(defined(__ICC) && (__ICC >= 700))   // can be defined in yvals.h
 #     define BOOST_NO_STDC_NAMESPACE
 #  endif
 #  if !(defined(_HAS_MEMBER_TEMPLATES_REBIND) && (_HAS_MEMBER_TEMPLATES_REBIND+0 > 0)) && !(defined(_MSC_VER) && (_MSC_VER > 1300)) && defined(BOOST_MSVC)
@@ -66,12 +66,12 @@
 // the same applies to other compilers that sit on top
 // of vc7.1 (Intel and Comeau):
 //
-#if defined(_MSC_VER) && (_MSC_VER >= 1310) && !defined(__BORLANDC__)
+#if defined(_MSC_VER) && (_MSC_VER >= 1310)
 #  define BOOST_STD_EXTENSION_NAMESPACE stdext
 #endif
 
 
-#if (defined(_MSC_VER) && (_MSC_VER <= 1300) && !defined(__BORLANDC__)) || !defined(_CPPLIB_VER) || (_CPPLIB_VER < 306)
+#if (defined(_MSC_VER) && (_MSC_VER <= 1300)) || !defined(_CPPLIB_VER) || (_CPPLIB_VER < 306)
    // if we're using a dinkum lib that's
    // been configured for VC6/7 then there is
    // no iterator traits (true even for icl)
diff --git a/indexlib/boost-compat/config/stdlib/libcomo.hpp b/indexlib/boost-compat/config/stdlib/libcomo.h
index b2c8e440..b2c8e440 100644
--- a/indexlib/boost-compat/config/stdlib/libcomo.hpp
+++ b/indexlib/boost-compat/config/stdlib/libcomo.h
diff --git a/indexlib/boost-compat/config/stdlib/libstdcpp3.hpp b/indexlib/boost-compat/config/stdlib/libstdcpp3.h
index 9774e876..bbf29559 100644
--- a/indexlib/boost-compat/config/stdlib/libstdcpp3.hpp
+++ b/indexlib/boost-compat/config/stdlib/libstdcpp3.h
@@ -22,12 +22,6 @@
 #  define BOOST_NO_STD_WSTREAMBUF
 #endif
 
-#if defined(__osf__) && !defined(_REENTRANT) && defined(_GLIBCXX_HAVE_GTHR_DEFAULT)
-// GCC 3.4 on Tru64 forces the definition of _REENTRANT when any std lib header
-// file is included, therefore for consistency we define it here as well.
-#  define _REENTRANT
-#endif
-
 #ifdef __GLIBCXX__ // gcc 3.4 and greater:
 #  ifdef _GLIBCXX_HAVE_GTHR_DEFAULT
       // 
@@ -45,7 +39,7 @@
 #if !defined(_GLIBCPP_USE_LONG_LONG) \
     && !defined(_GLIBCXX_USE_LONG_LONG)\
     && defined(BOOST_HAS_LONG_LONG)
-// May have been set by compiler/*.hpp, but "long long" without library
+// May have been set by compiler/*.h, but "long long" without library
 // support is useless.
 #  undef BOOST_HAS_LONG_LONG
 #endif
diff --git a/indexlib/boost-compat/config/stdlib/modena.hpp b/indexlib/boost-compat/config/stdlib/modena.h
index 61e31b7d..61e31b7d 100644
--- a/indexlib/boost-compat/config/stdlib/modena.hpp
+++ b/indexlib/boost-compat/config/stdlib/modena.h
diff --git a/indexlib/boost-compat/config/stdlib/msl.hpp b/indexlib/boost-compat/config/stdlib/msl.hpp
deleted file mode 100644
index f8ad3d9a..00000000
--- a/indexlib/boost-compat/config/stdlib/msl.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-//  (C) Copyright John Maddock 2001. 
-//  (C) Copyright Darin Adler 2001. 
-//  Use, modification and distribution are subject to the 
-//  Boost Software License, Version 1.0. (See accompanying file 
-//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-//  See http://www.boost.org for most recent version.
-
-//  Metrowerks standard library:
-
-#ifndef __MSL_CPP__
-#  include <utility>
-#  ifndef __MSL_CPP__
-#     error This is not the MSL standard library!
-#  endif
-#endif
-
-#if __MSL_CPP__ >= 0x6000  // Pro 6
-#  define BOOST_HAS_HASH
-#  define BOOST_STD_EXTENSION_NAMESPACE Metrowerks
-#endif
-#define BOOST_HAS_SLIST
-
-#if __MSL_CPP__ < 0x6209
-#  define BOOST_NO_STD_MESSAGES
-#endif
-
-// check C lib version for <stdint.h>
-#include <cstddef>
-
-#if defined(__MSL__) && (__MSL__ >= 0x5000)
-#  define BOOST_HAS_STDINT_H
-#  if !defined(__PALMOS_TRAPS__)
-#    define BOOST_HAS_UNISTD_H
-#  endif
-   // boilerplate code:
-#  include <boost/config/posix_features.hpp>
-#endif
-
-#if defined(_MWMT) || _MSL_THREADSAFE
-#  define BOOST_HAS_THREADS
-#endif
-
-
-#define BOOST_STDLIB "Metrowerks Standard Library version " BOOST_STRINGIZE(__MSL_CPP__)
-
-
-
-
-
-
-
-
-
diff --git a/indexlib/boost-compat/config/stdlib/roguewave.hpp b/indexlib/boost-compat/config/stdlib/roguewave.h
index ec3d881b..2e116ff1 100644
--- a/indexlib/boost-compat/config/stdlib/roguewave.hpp
+++ b/indexlib/boost-compat/config/stdlib/roguewave.h
@@ -48,13 +48,6 @@
 # endif
 
 //
-// Borland version of numeric_limits lacks __int64 specialisation:
-//
-#ifdef __BORLANDC__
-#  define BOOST_NO_MS_INT64_NUMERIC_LIMITS
-#endif
-
-//
 // No std::iterator if it can't figure out default template args:
 //
 #if defined(_RWSTD_NO_SIMPLE_DEFAULT_TEMPLATES) || defined(RWSTD_NO_SIMPLE_DEFAULT_TEMPLATES) || (BOOST_RWSTD_VER < 0x020000)
@@ -73,7 +66,6 @@
 // new-style iostreams, and no conformant std::allocator:
 //
 #if (BOOST_RWSTD_VER < 0x020000)
-#  define BOOST_NO_AUTO_PTR
 #  define BOOST_NO_STRINGSTREAM
 #  define BOOST_NO_STD_ALLOCATOR
 #  define BOOST_NO_STD_LOCALE
diff --git a/indexlib/boost-compat/config/stdlib/sgi.hpp b/indexlib/boost-compat/config/stdlib/sgi.h
index 67f7a0a4..67f7a0a4 100644
--- a/indexlib/boost-compat/config/stdlib/sgi.hpp
+++ b/indexlib/boost-compat/config/stdlib/sgi.h
diff --git a/indexlib/boost-compat/config/stdlib/stlport.hpp b/indexlib/boost-compat/config/stdlib/stlport.h
index 4843ea59..8bc5c1d0 100644
--- a/indexlib/boost-compat/config/stdlib/stlport.hpp
+++ b/indexlib/boost-compat/config/stdlib/stlport.h
@@ -52,11 +52,11 @@
 // then the io stream facets are not available in namespace std::
 //
 #ifdef _STLPORT_VERSION
-#  if !defined(_STLP_OWN_IOSTREAMS) && defined(_STLP_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE) && !defined(__BORLANDC__)
+#  if !defined(_STLP_OWN_IOSTREAMS) && defined(_STLP_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE)
 #     define BOOST_NO_STD_LOCALE
 #  endif
 #else
-#  if !defined(__SGI_STL_OWN_IOSTREAMS) && defined(__STL_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE) && !defined(__BORLANDC__)
+#  if !defined(__SGI_STL_OWN_IOSTREAMS) && defined(__STL_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE)
 #     define BOOST_NO_STD_LOCALE
 #  endif
 #endif
@@ -106,13 +106,7 @@
 // but doesn't always get them all, define BOOST_NO_STDC_NAMESPACE, since our
 // workaround does not conflict with STLports:
 //
-//
-// Harold Howe says:
-// Borland switched to STLport in BCB6. Defining BOOST_NO_STDC_NAMESPACE with
-// BCB6 does cause problems. If we detect C++ Builder, then don't define 
-// BOOST_NO_STDC_NAMESPACE
-//
-#if !defined(__BORLANDC__) && !defined(__DMC__)
+#if !defined(__DMC__)
 //
 // If STLport is using it's own namespace, and the real names are in
 // the global namespace, then we duplicate STLport's using declarations
@@ -127,21 +121,6 @@
 #     define BOOST_NO_STDC_NAMESPACE
 #     define BOOST_NO_EXCEPTION_STD_NAMESPACE
 #  endif
-#elif defined(__BORLANDC__) && __BORLANDC__ < 0x560
-// STLport doesn't import std::abs correctly:
-#include <stdlib.h>
-namespace std { using ::abs; }
-// and strcmp/strcpy don't get imported either ('cos they are macros)
-#include <string.h>
-#ifdef strcpy
-#  undef strcpy
-#endif
-#ifdef strcmp
-#  undef strcmp
-#endif
-#ifdef _STLP_VENDOR_CSTD
-namespace std{ using _STLP_VENDOR_CSTD::strcmp; using _STLP_VENDOR_CSTD::strcpy; }
-#endif
 #endif
 
 //
@@ -173,14 +152,6 @@ namespace std{ using _STLP_VENDOR_CSTD::strcmp; using _STLP_VENDOR_CSTD::strcpy;
 #endif
 
 //
-// Borland ships a version of STLport with C++ Builder 6 that lacks
-// hashtables and the like:
-//
-#if defined(__BORLANDC__) && (__BORLANDC__ == 0x560)
-#  undef BOOST_HAS_HASH
-#endif
-
-//
 // gcc-2.95.3/STLPort does not like the using declarations we use to get ADL with std::min/max
 //
 #if defined(__GNUC__) && (__GNUC__ < 3)
diff --git a/indexlib/boost-compat/config/stdlib/vacpp.hpp b/indexlib/boost-compat/config/stdlib/vacpp.h
index 8321ee0c..8321ee0c 100644
--- a/indexlib/boost-compat/config/stdlib/vacpp.hpp
+++ b/indexlib/boost-compat/config/stdlib/vacpp.h
diff --git a/indexlib/boost-compat/config/suffix.hpp b/indexlib/boost-compat/config/suffix.h
index 77d9deca..db64f87a 100644
--- a/indexlib/boost-compat/config/suffix.hpp
+++ b/indexlib/boost-compat/config/suffix.h
@@ -1,4 +1,4 @@
-//  Boost config.hpp configuration header file  ------------------------------//
+//  Boost config.h configuration header file  ------------------------------//
 
 //  (C) Copyright John Maddock 2001 - 2003. 
 //  (C) Copyright Darin Adler 2001. 
@@ -14,15 +14,15 @@
 
 //  See http://www.boost.org for most recent version.
 
-//  Boost config.hpp policy and rationale documentation has been moved to
+//  Boost config.h policy and rationale documentation has been moved to
 //  http://www.boost.org/libs/config
 //
 //  This file is intended to be stable, and relatively unchanging.
 //  It should contain boilerplate code only - no compiler specific
 //  code unless it is unavoidable - no changes unless unavoidable.
 
-#ifndef BOOST_CONFIG_SUFFIX_HPP
-#define BOOST_CONFIG_SUFFIX_HPP
+#ifndef BOOST_CONFIG_SUFFIX_H
+#define BOOST_CONFIG_SUFFIX_H
 
 //
 // look for long long by looking for the appropriate macros in <limits.h>.
@@ -31,8 +31,8 @@
 // no namespace issues from this.
 //
 #include <limits.h>
-# if !defined(BOOST_HAS_LONG_LONG)                                              \
-   && !(defined(BOOST_MSVC) && BOOST_MSVC <=1300) && !defined(__BORLANDC__)     \
+# if !defined(BOOST_HAS_LONG_LONG)                   \
+   && !(defined(BOOST_MSVC) && BOOST_MSVC <=1300)    \
    && (defined(ULLONG_MAX) || defined(ULONG_LONG_MAX) || defined(ULONGLONG_MAX))
 #  define BOOST_HAS_LONG_LONG
 #endif
diff --git a/indexlib/boost-compat/config/user.hpp b/indexlib/boost-compat/config/user.h
index 5a4a9d47..14b02c67 100644
--- a/indexlib/boost-compat/config/user.hpp
+++ b/indexlib/boost-compat/config/user.h
@@ -1,4 +1,4 @@
-//  boost/config/user.hpp  ---------------------------------------------------//
+//  boost/config/user.h  ---------------------------------------------------//
 
 //  (C) Copyright John Maddock 2001. 
 //  Use, modification and distribution are subject to the 
diff --git a/indexlib/boost-compat/intrusive_ptr.hpp b/indexlib/boost-compat/intrusive_ptr.h
index 7efbadee..a2af559b 100644
--- a/indexlib/boost-compat/intrusive_ptr.hpp
+++ b/indexlib/boost-compat/intrusive_ptr.h
@@ -1,8 +1,8 @@
-#ifndef BOOST_INTRUSIVE_PTR_HPP_INCLUDED
-#define BOOST_INTRUSIVE_PTR_HPP_INCLUDED
+#ifndef BOOST_INTRUSIVE_PTR_H_INCLUDED
+#define BOOST_INTRUSIVE_PTR_H_INCLUDED
 
 //
-//  intrusive_ptr.hpp
+//  intrusive_ptr.h
 //
 //  Copyright (c) 2001, 2002 Peter Dimov
 //
@@ -127,14 +127,6 @@ public:
         return p_ != 0;
     }
 
-#elif defined(__MWERKS__) && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003))
-    typedef T * (this_type::*unspecified_bool_type)() const;
-    
-    operator unspecified_bool_type() const // never throws
-    {
-        return p_ == 0? 0: &this_type::get;
-    }
-
 #else 
 
     typedef T * this_type::*unspecified_bool_type;
@@ -146,7 +138,6 @@ public:
 
 #endif
 
-    // operator! is a Borland-specific workaround
     bool operator! () const
     {
         return p_ == 0;
@@ -269,4 +260,4 @@ template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::
 # pragma warning(pop)
 #endif    
 
-#endif  // #ifndef BOOST_INTRUSIVE_PTR_HPP_INCLUDED
+#endif  // #ifndef BOOST_INTRUSIVE_PTR_H_INCLUDED
diff --git a/indexlib/boost-compat/next_prior.hpp b/indexlib/boost-compat/next_prior.h
index e1d2e428..cdacf29c 100644
--- a/indexlib/boost-compat/next_prior.hpp
+++ b/indexlib/boost-compat/next_prior.h
@@ -1,4 +1,4 @@
-//  Boost next_prior.hpp header file  ---------------------------------------//
+//  Boost next_prior.h header file  ---------------------------------------//
 
 //  (C) Copyright Dave Abrahams and Daniel Walker 1999-2003. Distributed under the Boost
 //  Software License, Version 1.0. (See accompanying file
@@ -9,8 +9,8 @@
 //  Revision History
 //  13 Dec 2003  Added next(x, n) and prior(x, n) (Daniel Walker)
 
-#ifndef BOOST_NEXT_PRIOR_HPP_INCLUDED
-#define BOOST_NEXT_PRIOR_HPP_INCLUDED
+#ifndef BOOST_NEXT_PRIOR_H_INCLUDED
+#define BOOST_NEXT_PRIOR_H_INCLUDED
 
 #include <iterator>
 
@@ -48,4 +48,4 @@ inline T prior(T x, Distance n)
 
 } // namespace boost
 
-#endif  // BOOST_NEXT_PRIOR_HPP_INCLUDED
+#endif  // BOOST_NEXT_PRIOR_H_INCLUDED
diff --git a/indexlib/boost-compat/noncopyable.hpp b/indexlib/boost-compat/noncopyable.h
index 7770bdbd..0d94ea6a 100644
--- a/indexlib/boost-compat/noncopyable.hpp
+++ b/indexlib/boost-compat/noncopyable.h
@@ -1,4 +1,4 @@
-//  Boost noncopyable.hpp header file  --------------------------------------//
+//  Boost noncopyable.h header file  --------------------------------------//
 
 //  (C) Copyright Beman Dawes 1999-2003. Distributed under the Boost
 //  Software License, Version 1.0. (See accompanying file
@@ -6,8 +6,8 @@
 
 //  See http://www.boost.org/libs/utility for documentation.
 
-#ifndef BOOST_NONCOPYABLE_HPP_INCLUDED
-#define BOOST_NONCOPYABLE_HPP_INCLUDED
+#ifndef BOOST_NONCOPYABLE_H_INCLUDED
+#define BOOST_NONCOPYABLE_H_INCLUDED
 
 namespace boost {
 
@@ -33,4 +33,4 @@ typedef noncopyable_::noncopyable noncopyable;
 
 } // namespace boost
 
-#endif  // BOOST_NONCOPYABLE_HPP_INCLUDED
+#endif  // BOOST_NONCOPYABLE_H_INCLUDED
diff --git a/indexlib/boost-compat/remove_cv.hpp b/indexlib/boost-compat/remove_cv.h
index ec7c1a95..c59970a8 100644
--- a/indexlib/boost-compat/remove_cv.hpp
+++ b/indexlib/boost-compat/remove_cv.h
@@ -1,7 +1,7 @@
-#ifndef BOOST_TT_REMOVE_CV_HPP_INCLUDED
-#define BOOST_TT_REMOVE_CV_HPP_INCLUDED
-#ifndef BOOST_TT_DETAIL_CV_TRAITS_IMPL_HPP_INCLUDED
-#define BOOST_TT_DETAIL_CV_TRAITS_IMPL_HPP_INCLUDED
+#ifndef BOOST_TT_REMOVE_CV_H_INCLUDED
+#define BOOST_TT_REMOVE_CV_H_INCLUDED
+#ifndef BOOST_TT_DETAIL_CV_TRAITS_IMPL_H_INCLUDED
+#define BOOST_TT_DETAIL_CV_TRAITS_IMPL_H_INCLUDED
 // ADAPTED (TAKEN) FROM BOOST
 //
 //  (C) Copyright Dave Abrahams, Steve Cleary, Beman Dawes, Howard
diff --git a/indexlib/boost-compat/scoped_ptr.hpp b/indexlib/boost-compat/scoped_ptr.h
index 1260066a..41d4f9b8 100644
--- a/indexlib/boost-compat/scoped_ptr.hpp
+++ b/indexlib/boost-compat/scoped_ptr.h
@@ -1,5 +1,5 @@
-#ifndef BOOST_SCOPED_PTR_HPP_INCLUDED
-#define BOOST_SCOPED_PTR_HPP_INCLUDED
+#ifndef BOOST_SCOPED_PTR_H_INCLUDED
+#define BOOST_SCOPED_PTR_H_INCLUDED
 
 // ADAPTED FOR indexlib
 
@@ -13,9 +13,9 @@
 //  http://www.boost.org/libs/smart_ptr/scoped_ptr.htm
 //
 
-#include "checked_delete.hpp"
+#include "checked_delete.h"
 
-#include <memory>          // for std::auto_ptr
+#include <memory>
 #include <assert.h>
 
 namespace boost
@@ -25,7 +25,7 @@ namespace boost
 //  scoped_ptr mimics a built-in pointer except that it guarantees deletion
 //  of the object pointed to, either on destruction of the scoped_ptr or via
 //  an explicit reset(). scoped_ptr is a simple solution for simple needs;
-//  use shared_ptr or std::auto_ptr if your needs are more complex.
+//  use shared_ptr or std::unique_ptr if your needs are more complex.
 
 template<class T> class scoped_ptr // noncopyable
 {
@@ -46,11 +46,6 @@ public:
     {
     }
 
-
-    explicit scoped_ptr(std::auto_ptr<T> p): ptr(p.release()) // never throws
-    {
-    }
-
     ~scoped_ptr() // never throws
     {
         boost::checked_delete(ptr);
@@ -115,4 +110,4 @@ template<class T> inline T * get_pointer(scoped_ptr<T> const & p)
 
 } // namespace boost
 
-#endif // #ifndef BOOST_SCOPED_PTR_HPP_INCLUDED
+#endif // #ifndef BOOST_SCOPED_PTR_H_INCLUDED
diff --git a/indexlib/boost-compat/shared_ptr.hpp b/indexlib/boost-compat/shared_ptr.h
index 0a3bf6d8..a369dc0f 100644
--- a/indexlib/boost-compat/shared_ptr.hpp
+++ b/indexlib/boost-compat/shared_ptr.h
@@ -1,8 +1,8 @@
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
-#define BOOST_SHARED_PTR_HPP_INCLUDED
+#ifndef BOOST_SHARED_PTR_H_INCLUDED
+#define BOOST_SHARED_PTR_H_INCLUDED
 
 //
-//  shared_ptr.hpp
+//  shared_ptr.h
 //
 //  (C) Copyright Greg Colvin and Beman Dawes 1998, 1999.
 //  Copyright (c) 2001, 2002, 2003 Peter Dimov
@@ -26,11 +26,11 @@
 #include <boost/detail/shared_count.hpp>
 #include <boost/detail/workaround.hpp>
 
-#include <memory>               // for std::auto_ptr
-#include <algorithm>            // for std::swap
-#include <functional>           // for std::less
-#include <typeinfo>             // for std::bad_cast
-#include <iosfwd>               // for std::basic_ostream
+#include <memory>
+#include <algorithm>
+#include <functional>
+#include <typeinfo>
+#include <iosfwd>
 
 #ifdef BOOST_MSVC  // moved here to work around VC++ compiler crash
 # pragma warning(push)
@@ -106,7 +106,6 @@ template<class T> class shared_ptr
 {
 private:
 
-    // Borland 5.5.1 specific workaround
     typedef shared_ptr<T> this_type;
 
 public:
@@ -139,8 +138,8 @@ public:
 
 //  generated copy constructor, assignment, destructor are fine...
 
-//  except that Borland C++ has a bug, and g++ with -Wsynth warns
-#if defined(__BORLANDC__) || defined(__GNUC__)
+//  except that g++ with -Wsynth warns
+#if defined(__GNUC__)
 
     shared_ptr & operator=(shared_ptr const & r) // never throws
     {
@@ -191,18 +190,6 @@ public:
         }
     }
 
-#ifndef BOOST_NO_AUTO_PTR
-
-    template<class Y>
-    explicit shared_ptr(std::auto_ptr<Y> & r): px(r.get()), pn()
-    {
-        Y * tmp = r.get();
-        pn = detail::shared_count(r);
-        detail::sp_enable_shared_from_this( pn, tmp, tmp );
-    }
-
-#endif
-
 #if !defined(BOOST_MSVC) || (BOOST_MSVC > 1200)
 
     template<class Y>
@@ -215,17 +202,6 @@ public:
 
 #endif
 
-#ifndef BOOST_NO_AUTO_PTR
-
-    template<class Y>
-    shared_ptr & operator=(std::auto_ptr<Y> & r)
-    {
-        this_type(r).swap(*this);
-        return *this;
-    }
-
-#endif
-
     void reset() // never throws in 1.30+
     {
         this_type().swap(*this);
@@ -268,14 +244,6 @@ public:
         return px != 0;
     }
 
-#elif defined(__MWERKS__) && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003))
-    typedef T * (this_type::*unspecified_bool_type)() const;
-    
-    operator unspecified_bool_type() const // never throws
-    {
-        return px == 0? 0: &this_type::get;
-    }
-
 #else 
 
     typedef T * this_type::*unspecified_bool_type;
@@ -470,4 +438,4 @@ template<class D, class T> D * get_deleter(shared_ptr<T> const & p)
 
 #endif  // #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES)
 
-#endif  // #ifndef BOOST_SHARED_PTR_HPP_INCLUDED
+#endif  // #ifndef BOOST_SHARED_PTR_H_INCLUDED
diff --git a/indexlib/boost-compat/smart_ptr.hpp b/indexlib/boost-compat/smart_ptr.h
index c10de457..578a48e4 100644
--- a/indexlib/boost-compat/smart_ptr.hpp
+++ b/indexlib/boost-compat/smart_ptr.h
@@ -1,8 +1,8 @@
-#ifndef LPC_SMART_PTR_HPP1119293317_INCLUDE_GUARD_
-#define LPC_SMART_PTR_HPP1119293317_INCLUDE_GUARD_
+#ifndef LPC_SMART_PTR_H1119293317_INCLUDE_GUARD_
+#define LPC_SMART_PTR_H1119293317_INCLUDE_GUARD_
 
 //
-//  smart_ptr.hpp
+//  smart_ptr.h
 //
 //  For convenience, this header includes the rest of the smart
 //  pointer library headers.
@@ -28,4 +28,4 @@
 #endif
 
 
-#endif /* LPC_SMART_PTR_HPP1119293317_INCLUDE_GUARD_ */
+#endif /* LPC_SMART_PTR_H1119293317_INCLUDE_GUARD_ */
diff --git a/indexlib/boost-compat/static_assert.h b/indexlib/boost-compat/static_assert.h
new file mode 100644
index 00000000..1d020c9f
--- /dev/null
+++ b/indexlib/boost-compat/static_assert.h
@@ -0,0 +1,11 @@
+#ifndef LPC_STATIC_ASSERT_H1119293317_INCLUDE_GUARD_
+#define LPC_STATIC_ASSERT_H1119293317_INCLUDE_GUARD_
+
+#ifdef HAVE_BOOST
+#include <boost/static_assert.hpp>
+#elif !defined( BOOST_STATIC_ASSERT )
+#define BOOST_STATIC_ASSERT( x )
+#endif
+
+
+#endif /* LPC_STATIC_ASSERT_H1119293317_INCLUDE_GUARD_ */
diff --git a/indexlib/boost-compat/static_assert.hpp b/indexlib/boost-compat/static_assert.hpp
deleted file mode 100644
index 76de9c49..00000000
--- a/indexlib/boost-compat/static_assert.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef LPC_STATIC_ASSERT_HPP1119293317_INCLUDE_GUARD_
-#define LPC_STATIC_ASSERT_HPP1119293317_INCLUDE_GUARD_
-
-#ifdef HAVE_BOOST
-#include <boost/static_assert.hpp>
-#elif !defined( BOOST_STATIC_ASSERT )
-#define BOOST_STATIC_ASSERT( x )
-#endif
-
-
-#endif /* LPC_STATIC_ASSERT_HPP1119293317_INCLUDE_GUARD_ */
diff --git a/indexlib/boost-compat/weak_ptr.hpp b/indexlib/boost-compat/weak_ptr.h
index c2385007..56d7ad6b 100644
--- a/indexlib/boost-compat/weak_ptr.hpp
+++ b/indexlib/boost-compat/weak_ptr.h
@@ -1,8 +1,8 @@
-#ifndef BOOST_WEAK_PTR_HPP_INCLUDED
-#define BOOST_WEAK_PTR_HPP_INCLUDED
+#ifndef BOOST_WEAK_PTR_H_INCLUDED
+#define BOOST_WEAK_PTR_H_INCLUDED
 
 //
-//  weak_ptr.hpp
+//  weak_ptr.h
 //
 //  Copyright (c) 2001, 2002, 2003 Peter Dimov
 //
@@ -27,7 +27,6 @@ template<class T> class weak_ptr
 {
 private:
 
-    // Borland 5.5.1 specific workarounds
     typedef weak_ptr<T> this_type;
 
 public:
@@ -189,4 +188,4 @@ template<class T> shared_ptr<T> make_shared(weak_ptr<T> const & r)
 # pragma warning(pop)
 #endif    
 
-#endif  // #ifndef BOOST_WEAK_PTR_HPP_INCLUDED
+#endif  // #ifndef BOOST_WEAK_PTR_H_INCLUDED