This commit was manufactured by cvs2svn to create tag

'Version_1_33_1'.

[SVN r31916]

config.htm

@@ -1235,31 +1235,35 @@ void g() { return f(); }</pre>
          ABI, that at least in theory there 3200 combinations, and that's without 
          considering runtime library variations.&nbsp; Fortunately these variations can 
          be managed by #pragma's that tell the compiler what ABI to use for the types 
-         declared in your library, in order to avoid sprinkling #pragma's all over the 
-         boost headers, there are some prefix and suffix headers that do the job, 
-         typical usage would be:</P>
+         declared in your library. In order to avoid sprinkling #pragma's all over the 
+         boost headers, there are some prefix and suffix headers that do the job. 
+      Typical usage is:</P>
+      <P><b>my_library.cpp</b></P>
+      <blockquote>
       <PRE>#ifndef MY_INCLUDE_GUARD
 #define MY_INCLUDE_GUARD
 
 // all includes go here:
-#include &lt;boost/config.hpp&gt;
+<b>#include &lt;boost/config.hpp&gt;</b>
 #include &lt;whatever&gt;
 
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
+<b>#include &lt;boost/config/abi_prefix.hpp&gt;  // must be the last #include</b>
 
 namespace boost{
 // your code goes here
 } 
 
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
+<b>#include &lt;boost/config/abi_suffix.hpp&gt;  // pops abi_prefix.hpp pragmas</b>
 
 #endif // include guard
 </PRE>
+      </blockquote>
+      <P><b>my_library.cpp</b></P>
+      <blockquote>
+        <pre>...
+<b>// nothing special need be done in the implementation file</b>
+...</pre>
+      </blockquote>
       <P>The user can disable this mechanism by defining BOOST_DISABLE_ABI_HEADERS, or 
          they can define BOOST_ABI_PREFIX and/or BOOST_ABI_SUFFIX to point to their own 
          prefix/suffix headers if they so wish.</P>
@@ -1280,7 +1284,6 @@ namespace boost{
          search path, and the compiler and linker do the rest.&nbsp; Boost.config 
          supports this via the header &lt;boost/config/auto_link.hpp&gt;, before 
          including this header one or more of the following macros need to be defined:</P>
-      <P>
          <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="1">
             <TR>
                <TD>BOOST_LIB_NAME</TD>
@@ -1298,25 +1301,39 @@ namespace boost{
                   (useful for debugging).</TD>
             </TR>
          </TABLE>
-      </P>
       <P>If the compiler supports this mechanism, then it will be told to link against 
          the appropriately named library, the actual algorithm used to mangle the name 
          of the library is documented inside &lt;boost/config/auto_link.hpp&gt; and has 
          to match that used to create the libraries via bjam 's install rules.</P>
-      <P>Typical usage would be:</P>
-      <PRE>//
-// Don't include auto-linking code if the user has disabled it by
-// defining BOOST_WHATEVER_NO_LIB, or if this is one of our own
-// source files (signified by BOOST_WHATEVER_SOURCE):
+      <P>Typical usage is:</P>
+      <P><b>my_library.hpp</b></P>
+      <blockquote>
+      <PRE>...
 //
-#if !defined(BOOST_WHATEVER_NO_LIB) &amp;&amp; !defined(BOOST_WHATEVER_SOURCE)
-#  define BOOST_LIB_NAME boost_whatever
-#  ifdef BOOST_WHATEVER_DYN_LINK
+// Don't include auto-linking code if the user has disabled it by
+// defining BOOST_ALL_NO_LIB, or BOOST_MY_LIBRARY_NO_LIB, or if this 
+// is one of our own source files (signified by BOOST_MY_LIBRARY_SOURCE):
+//
+<b>#if !defined(BOOST_ALL_NO_LIB) &amp;&amp; !defined(BOOST_MY_LIBRARY_NO_LIB) &amp;&amp; !defined(BOOST_MY_LIBRARY_SOURCE)
+#  define BOOST_LIB_NAME boost_my_library
+#  ifdef BOOST_MY_LIBRARY_DYN_LINK
 #     define BOOST_DYN_LINK
 #  endif
 #  include &lt;boost/config/auto_link.hpp&gt;
 #endif
+</b>...
 </PRE>
+      </blockquote>
+      <p><b>my_library.cpp</b></p>
+      <blockquote>
+        <pre>// define BOOST_MY_LIBRARY_SOURCE so that the header knows that the
+// library is being built (possibly exporting rather than importing code)
+//
+<b>#define BOOST_MY_LIBRARY_SOURCE</b> 
+
+<b>#include &lt;boost/my_library/my_library.hpp&gt;</b>
+...</pre>
+      </blockquote>
       <H2>Guidelines for Boost Authors</H2>
       <p>The <a href="../../boost/config.hpp">boost/config.hpp</a> header is used to 
          pass configuration information to other boost files, allowing them to cope with 

configure

@@ -1304,6 +1304,17 @@ echo "${ECHO_T}Info : .cpp used as extension for tests" >&6
 
 fi;
 
+
+if test -f /bin/sed ; then
+   SED=/bin/sed
+else
+   if test -f /usr/bin/sed ; then
+      SED=/usr/bin/sed
+   else
+      SED=sed
+   fi
+fi
+
 echo "$as_me:$LINENO: checking for boost main tree" >&5
 echo $ECHO_N "checking for boost main tree... $ECHO_C" >&6
 boost_base=
@@ -1315,7 +1326,7 @@ if test "${with_boost+set}" = set; then
   #echo "--with boost is set"
   if test "x$withval" != "x"; then
     if test "x$withval" != no; then
-      boost_base=`echo "$withval" | sed 's,//*,/,g' | sed 's,/$,,'`
+      boost_base=`echo "$withval" | $SED 's,//*,/,g' | $SED 's,/$,,'`
       #echo boost_base=$boost_base
       if test -f "$boost_base/boost/config.hpp"; then
         if test -f "$boost_base/libs/config/configure"; then :; else
@@ -2171,9 +2182,9 @@ fi
 #
 for file in $boost_base/libs/config/test/boost_no*.ipp; do
 
-   basename=`echo $file | sed 's/.*boost_\(.*\)\.ipp/\1/'`
-   macroname=`cat $file | grep '^//[]    []*MACRO:' | sed 's/.*MACRO:[]    []*\([]_A-Z0-9[]*\).*/\1/'`
-   title=`cat $file | grep '^//[]  []*TITLE:' | sed 's/.*TITLE:[]    []*\([]^  [].*\)/\1/'`
+   basename=`echo $file | $SED 's/.*boost_\(.*\)\.ipp/\1/'`
+   macroname=`cat $file | grep '^//[ 	]*MACRO:' | $SED 's/.*MACRO:[ 	]*\([_A-Z0-9]*\).*/\1/'`
+   title=`cat $file | grep '^//[ 	]*TITLE:' | $SED 's/.*TITLE:[ 	]*\([^ 	].*\)/\1/'`
    namespace=`echo $macroname | tr [A-Z] [a-z]`
 
 #echo file      = $file
@@ -2312,9 +2323,9 @@ done
 #
 for file in $boost_base/libs/config/test/boost_has*.ipp; do
 
-   basename=`echo $file | sed 's/.*boost_\(.*\)\.ipp/\1/'`
-   macroname=`cat $file | grep '^//[]    []*MACRO:' | sed 's/.*MACRO:[]    []*\([]_A-Z0-9[]*\).*/\1/'`
-   title=`cat $file | grep '^//[]  []*TITLE:' | sed 's/.*TITLE:[]    []*\([]^  [].*\)/\1/'`
+   basename=`echo $file | $SED 's/.*boost_\(.*\)\.ipp/\1/'`
+   macroname=`cat $file | grep '^//[ 	]*MACRO:' | $SED 's/.*MACRO:[ 	]*\([_A-Z0-9]*\).*/\1/'`
+   title=`cat $file | grep '^//[ 	]*TITLE:' | $SED 's/.*TITLE:[ 	]*\([^ 	].*\)/\1/'`
    namespace=`echo $macroname | tr [A-Z] [a-z]`
 
 #  echo $file
@@ -2663,9 +2674,10 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_i=`echo "$ac_i" |
 	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -3339,5 +3351,6 @@ fi
 
 
 
+
 
 

include/boost/config/auto_link.hpp

@@ -321,9 +321,11 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 #if defined(BOOST_LIB_NAME)
 #  undef BOOST_LIB_NAME
 #endif
-#if defined(BOOST_LIB_TOOLSET)
-#  undef BOOST_LIB_TOOLSET
-#endif
+// Don't undef this one: it can be set by the user and should be the 
+// same for all libraries:
+//#if defined(BOOST_LIB_TOOLSET)
+//#  undef BOOST_LIB_TOOLSET
+//#endif
 #if defined(BOOST_LIB_THREAD_OPT)
 #  undef BOOST_LIB_THREAD_OPT
 #endif
@@ -352,3 +354,4 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 
 
 
+

include/boost/config/compiler/intel.hpp

@@ -88,6 +88,15 @@
 #  endif
 #endif
 
+#if defined(__GNUC__) && !defined(BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL)
+//
+// Figure out when Intel is emulating this gcc bug:
+//
+#  if ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 2)) || (BOOST_INTEL <= 900)
+#     define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
+#  endif
+#endif
+
 //
 // Verify that we have actually got BOOST_NO_INTRINSIC_WCHAR_T
 // set correctly, if we don't do this now, we will get errors later

include/boost/config/compiler/visualc.hpp

@@ -17,8 +17,8 @@
 // turn off the warnings before we #include anything
 #pragma warning( disable : 4503 ) // warning: decorated name length exceeded
 
-#if _MSC_VER < 1300  // 1200 == VC++ 6.0, 1201 == EVC4.2
-#pragma warning( disable : 4786 ) // ident trunc to '255' chars in debug info
+#if _MSC_VER < 1300  // 1200 == VC++ 6.0, 1200-1202 == eVC++4
+#  pragma warning( disable : 4786 ) // ident trunc to '255' chars in debug info
 #  define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
 #  define BOOST_NO_VOID_RETURNS
 #  define BOOST_NO_EXCEPTION_STD_NAMESPACE
@@ -28,9 +28,9 @@
 
 #if (_MSC_VER <= 1300)  // 1300 == VC++ 7.0
 
-#if !defined(_MSC_EXTENSIONS) && !defined(BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS)      // VC7 bug with /Za
-#  define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
-#endif
+#  if !defined(_MSC_EXTENSIONS) && !defined(BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS)      // VC7 bug with /Za
+#    define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
+#  endif
 
 #  define BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
 #  define BOOST_NO_INCLASS_MEMBER_INITIALIZATION
@@ -56,6 +56,7 @@
 #  define BOOST_NO_SFINAE
 #  define BOOST_NO_POINTER_TO_MEMBER_TEMPLATE_PARAMETERS
 #  define BOOST_NO_IS_ABSTRACT
+// TODO: what version is meant here? Have there really been any fixes in cl 12.01 (as e.g. shipped with eVC4)?
 #  if (_MSC_VER > 1200)
 #     define BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS
 #  endif
@@ -116,16 +117,36 @@
 #  define BOOST_ABI_SUFFIX "boost/config/abi/msvc_suffix.hpp"
 #endif
 
-# if _MSC_VER == 1200
-#   define BOOST_COMPILER_VERSION 6.0
-# elif _MSC_VER == 1300
-#   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
+// TODO:
+// these things are mostly bogus. 1200 means version 12.0 of the compiler. The 
+// artificial versions assigned to them only refer to the versions of some IDE
+// these compilers have been shipped with, and even that is not all of it. Some
+// were shipped with freely downloadable SDKs, others as crosscompilers in eVC.
+// IOW, you can't use these 'versions' in any sensible way. Sorry.
+# if defined(UNDER_CE)
+#   if _MSC_VER < 1200
+      // Note: these are so far off, they are not really supported
+#   elif _MSC_VER < 1300 // eVC++ 4 comes with 1200-1202
+#     define BOOST_COMPILER_VERSION evc4.0
+#     error unknown CE compiler
+#   else
+#     error unknown CE compiler
+#   endif
 # else
-#   define BOOST_COMPILER_VERSION _MSC_VER
+#   if _MSC_VER < 1200
+      // Note: these are so far off, they are not really supported
+#     define BOOST_COMPILER_VERSION 5.0
+#   elif _MSC_VER < 1300
+#       define BOOST_COMPILER_VERSION 6.0
+#   elif _MSC_VER == 1300
+#     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
 # endif
 
 #define BOOST_COMPILER "Microsoft Visual C++ version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)
@@ -137,7 +158,7 @@
 #error "Compiler not supported or configured - please reconfigure"
 #endif
 //
-// last known and checked version is 1310:
+// last known and checked version is 1400 (VC8):
 #if (_MSC_VER > 1400)
 #  if defined(BOOST_ASSERT_CONFIG)
 #     error "Unknown compiler version - please run the configure tests and report the results"

include/boost/config/platform/bsd.hpp

@@ -9,7 +9,7 @@
 
 //  generic BSD config options:
 
-#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
 #error "This platform is not BSD"
 #endif
 
@@ -19,6 +19,8 @@
 #define BOOST_PLATFORM "NetBSD " BOOST_STRINGIZE(__NetBSD__)
 #elif defined(__OpenBSD__)
 #define BOOST_PLATFORM "OpenBSD " BOOST_STRINGIZE(__OpenBSD__)
+#elif defined(__DragonFly__)
+#define BOOST_PLATFORM "DragonFly " BOOST_STRINGIZE(__DragonFly__)
 #endif
 
 //
@@ -26,7 +28,7 @@
 // FreeBSD has <nl_types.h> but does not
 // advertise the fact in <unistd.h>:
 //
-#if defined(__FreeBSD__) && (__FreeBSD__ >= 3)
+#if (defined(__FreeBSD__) && (__FreeBSD__ >= 3)) || defined(__DragonFly__)
 #  define BOOST_HAS_NL_TYPES_H
 #endif
 

include/boost/config/platform/win32.hpp

@@ -1,6 +1,7 @@
 //  (C) Copyright John Maddock 2001 - 2003. 
 //  (C) Copyright Bill Kempf 2001. 
 //  (C) Copyright Aleksey Gurtovoy 2003. 
+//  (C) Copyright Rene Rivera 2005.
 //  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)
@@ -11,6 +12,11 @@
 
 #define BOOST_PLATFORM "Win32"
 
+//  Get the information about the MinGW runtime, i.e. __MINGW32_*VERSION.
+#if defined(__MINGW32__)
+#  include <_mingw.h>
+#endif
+
 #if defined(__GNUC__) && !defined(BOOST_NO_SWPRINTF)
 #  define BOOST_NO_SWPRINTF
 #endif
@@ -19,9 +25,11 @@
 #  define BOOST_HAS_DECLSPEC
 #endif
 
-#if defined(__MINGW32__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 2)))
+#if defined(__MINGW32__) && ((__MINGW32_MAJOR_VERSION > 2) || ((__MINGW32_MAJOR_VERSION == 2) && (__MINGW32_MINOR_VERSION >= 0)))
 #  define BOOST_HAS_STDINT_H
 #  define __STDC_LIMIT_MACROS
+#  define BOOST_HAS_DIRENT_H
+#  define BOOST_HAS_UNISTD_H
 #endif
 
 //

include/boost/config/select_platform_config.hpp

@@ -17,7 +17,7 @@
 // linux:
 #  define BOOST_PLATFORM_CONFIG "boost/config/platform/linux.hpp"
 
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 // BSD:
 #  define BOOST_PLATFORM_CONFIG "boost/config/platform/bsd.hpp"
 

include/boost/config/stdlib/libstdcpp3.hpp

@@ -1,7 +1,7 @@
-//  (C) Copyright John Maddock 2001. 
-//  (C) Copyright Jens Maurer 2001. 
-//  Use, modification and distribution are subject to the 
-//  Boost Software License, Version 1.0. (See accompanying file 
+//  (C) Copyright John Maddock 2001.
+//  (C) Copyright Jens Maurer 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.
@@ -30,28 +30,31 @@
 #endif
 
 #ifdef __GLIBCXX__ // gcc 3.4 and greater:
-#  ifdef _GLIBCXX_HAVE_GTHR_DEFAULT
-      // 
+#  if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
+        || defined(_GLIBCXX__PTHREADS)
+      //
       // If the std lib has thread support turned on, then turn it on in Boost
       // as well.  We do this because some gcc-3.4 std lib headers define _REENTANT
       // while others do not...
-      // 
+      //
 #     define BOOST_HAS_THREADS
 #  else
 #     define BOOST_DISABLE_THREADS
 #  endif
-#elif defined(__GLIBCPP__) && !defined(_GLIBCPP_HAVE_GTHR_DEFAULT)
+#elif defined(__GLIBCPP__) \
+        && !defined(_GLIBCPP_HAVE_GTHR_DEFAULT) \
+        && !defined(_GLIBCPP__PTHREADS)
    // disable thread support if the std lib was built single threaded:
 #  define BOOST_DISABLE_THREADS
 #endif
 
 #if (defined(linux) || defined(__linux) || defined(__linux__)) && defined(__arm__) && defined(_GLIBCPP_HAVE_GTHR_DEFAULT)
-// linux on arm apparently doesn't define _REENTRANT 
+// linux on arm apparently doesn't define _REENTRANT
 // so just turn on threading support whenever the std lib is thread safe:
 #  define BOOST_HAS_THREADS
 #endif
 
- 
+
 #if !defined(_GLIBCPP_USE_LONG_LONG) \
     && !defined(_GLIBCXX_USE_LONG_LONG)\
     && defined(BOOST_HAS_LONG_LONG)

include/boost/config/stdlib/stlport.hpp

@@ -52,7 +52,7 @@
 // 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 !(_STLPORT_VERSION >= 0x500) && !defined(_STLP_OWN_IOSTREAMS) && defined(_STLP_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE) && !defined(__BORLANDC__)
 #     define BOOST_NO_STD_LOCALE
 #  endif
 #else
@@ -74,7 +74,7 @@
 //
 #define BOOST_HAS_PARTIAL_STD_ALLOCATOR
 
-#if !defined(_STLP_MEMBER_TEMPLATE_CLASSES)
+#if !defined(_STLP_MEMBER_TEMPLATE_CLASSES) || defined(_STLP_DONT_SUPPORT_REBIND_MEMBER_TEMPLATE)
 #  define BOOST_NO_STD_ALLOCATOR
 #endif
 

include/boost/version.hpp

@@ -19,7 +19,7 @@
 //  BOOST_VERSION / 100 % 1000 is the minor version
 //  BOOST_VERSION / 100000 is the major version
 
-#define BOOST_VERSION 103300
+#define BOOST_VERSION 103301
 
 //
 //  BOOST_LIB_VERSION must be defined to be the same as BOOST_VERSION
@@ -27,7 +27,9 @@
 //  number and y is the minor version number.  This is used by 
 //  <config/auto_link.hpp> to select which library version to link to.
 
-#define BOOST_LIB_VERSION "1_33"
+#define BOOST_LIB_VERSION "1_33_1"
 
 #endif
 
+
+

tools/configure.in

@@ -65,6 +65,19 @@ esac
 ]
 )
 
+dnl figure out which version of sed to use, on some platforms
+dnl the version in the path is not Unix conforming (MacOS X ? )
+
+if test -f /bin/sed ; then
+   SED=/bin/sed
+else
+   if test -f /usr/bin/sed ; then
+      SED=/usr/bin/sed
+   else
+      SED=sed
+   fi
+fi
+
 dnl Set the boost main directory.
 AC_MSG_CHECKING(for boost main tree)
 boost_base=
@@ -74,7 +87,7 @@ AC_ARG_WITH(boost,
   #echo "--with boost is set"
   if test "x$withval" != "x"; then
     if test "x$withval" != no; then
-      boost_base=`echo "$withval" | sed 's,//*,/,g' | sed 's,/$,,'`
+      boost_base=`echo "$withval" | $SED 's,//*,/,g' | $SED 's,/$,,'`
       #echo boost_base=$boost_base
       if test -f "$boost_base/boost/config.hpp"; then
         if test -f "$boost_base/libs/config/configure"; then :; else
@@ -146,9 +159,9 @@ AC_CHECK_LIB(rt, clock)
 #
 for file in $boost_base/libs/config/test/boost_no*.ipp; do
 
-   basename=`echo $file | sed 's/.*boost_\(.*\)\.ipp/\1/'`
-   macroname=`cat $file | grep '^//[[]    []]*MACRO:' | sed 's/.*MACRO:[[]    []]*\([[]_A-Z0-9[]]*\).*/\1/'`
-   title=`cat $file | grep '^//[[]  []]*TITLE:' | sed 's/.*TITLE:[[]    []]*\([[]^  []].*\)/\1/'`
+   basename=`echo $file | $SED 's/.*boost_\(.*\)\.ipp/\1/'`
+   macroname=`cat $file | grep '^//[[ 	]]*MACRO:' | $SED 's/.*MACRO:[[ 	]]*\([[_A-Z0-9]]*\).*/\1/'`
+   title=`cat $file | grep '^//[[ 	]]*TITLE:' | $SED 's/.*TITLE:[[ 	]]*\([[^ 	]].*\)/\1/'`
    namespace=`echo $macroname | tr [[A-Z]] [[a-z]]`
 
 #echo file      = $file
@@ -214,9 +227,9 @@ done
 #
 for file in $boost_base/libs/config/test/boost_has*.ipp; do
 
-   basename=`echo $file | sed 's/.*boost_\(.*\)\.ipp/\1/'`
-   macroname=`cat $file | grep '^//[[]    []]*MACRO:' | sed 's/.*MACRO:[[]    []]*\([[]_A-Z0-9[]]*\).*/\1/'`
-   title=`cat $file | grep '^//[[]  []]*TITLE:' | sed 's/.*TITLE:[[]    []]*\([[]^  []].*\)/\1/'`
+   basename=`echo $file | $SED 's/.*boost_\(.*\)\.ipp/\1/'`
+   macroname=`cat $file | grep '^//[[ 	]]*MACRO:' | $SED 's/.*MACRO:[[ 	]]*\([[_A-Z0-9]]*\).*/\1/'`
+   title=`cat $file | grep '^//[[ 	]]*TITLE:' | $SED 's/.*TITLE:[[ 	]]*\([[^ 	]].*\)/\1/'`
    namespace=`echo $macroname | tr [[A-Z]] [[a-z]]`
 
 #  echo $file
@@ -440,5 +453,6 @@ fi
 
 
 
+