diff --git a/appendix.htm b/appendix.htm
index 36e02eb1..bf56c458 100644
--- a/appendix.htm
+++ b/appendix.htm
@@ -13,7 +13,7 @@
 <H3><IMG SRC="../../c++boost.gif" WIDTH=276 HEIGHT=86 ALT="C++ Boost"></H3></TD>
 <TD WIDTH="50%" VALIGN="TOP">
 <H3 ALIGN="CENTER">Regex++, Appendices.</H3>
-<I><P ALIGN="CENTER">(version 3.11, 18 April 2000)</I> </P>
+<I><P ALIGN="CENTER">(version 3.12, 18 April 2000)</I> </P>
 <I><PRE>Copyright (c) 1998-2000
 Dr John Maddock
 
diff --git a/configure b/configure
index 33f1220e..49b4d997 100644
--- a/configure
+++ b/configure
@@ -32,8 +32,6 @@ ac_help="$ac_help
 ac_help="$ac_help
 --disable-template-returns turns off support for templates specialised by return type"
 ac_help="$ac_help
---disable-int64 turns off support for 64-bit integer types"
-ac_help="$ac_help
 --disable-messages turns off support for POSIX message categories, when available."
 ac_help="$ac_help
 --disable-fastcall turns off use __fastcall and __stdcall."
@@ -623,7 +621,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:627: checking for $ac_word" >&5
+echo "configure:625: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -654,7 +652,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:658: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:656: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -664,11 +662,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L
 cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 668 "configure"
+#line 666 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -694,12 +692,12 @@ if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:698: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:696: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:703: checking whether we are using GNU C++" >&5
+echo "configure:701: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -708,7 +706,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -723,7 +721,7 @@ if test $ac_cv_prog_gxx = yes; then
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS=
   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:727: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:725: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -762,7 +760,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 ac_ext=$use_ac_ext
 
 echo $ac_n "checking for object file extention""... $ac_c" 1>&6
-echo "configure:766: checking for object file extention" >&5
+echo "configure:764: checking for object file extention" >&5
 cat > "xyqtcz.$ac_ext" << EOF
 
 int main()
@@ -786,7 +784,7 @@ ac_obj_ext='.o'
 fi
 
 echo $ac_n "checking for executable file extention""... $ac_c" 1>&6
-echo "configure:790: checking for executable file extention" >&5
+echo "configure:788: checking for executable file extention" >&5
 ac_exe_ext=""
 for file in /bin/sh.*
 do
@@ -813,7 +811,7 @@ echo forced cross compilation mode turned on
 fi
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:817: checking size of short" >&5
+echo "configure:815: checking size of short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -821,7 +819,7 @@ else
   ac_cv_sizeof_short="$enable_sizeof_short"
 else
   cat > conftest.$ac_ext <<EOF
-#line 825 "configure"
+#line 823 "configure"
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
@@ -835,7 +833,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -856,7 +854,7 @@ EOF
 
 ac_ext=$use_ac_ext
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:860: checking size of int" >&5
+echo "configure:858: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -864,7 +862,7 @@ else
   ac_cv_sizeof_int="$enable_sizeof_int"
 else
   cat > conftest.$ac_ext <<EOF
-#line 868 "configure"
+#line 866 "configure"
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
@@ -878,7 +876,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -899,7 +897,7 @@ EOF
 
 ac_ext=$use_ac_ext
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:903: checking size of long" >&5
+echo "configure:901: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -907,7 +905,7 @@ else
   ac_cv_sizeof_long="$enable_sizeof_long"
 else
   cat > conftest.$ac_ext <<EOF
-#line 911 "configure"
+#line 909 "configure"
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
@@ -921,7 +919,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -960,9 +958,9 @@ EOF
 ac_ext=$use_ac_ext
 
 echo $ac_n "checking for basic template compatibility""... $ac_c" 1>&6
-echo "configure:964: checking for basic template compatibility" >&5
+echo "configure:962: checking for basic template compatibility" >&5
 cat > conftest.$ac_ext <<EOF
-#line 966 "configure"
+#line 964 "configure"
 #include "confdefs.h"
 
 template <class Arg1, class Arg2, class Result>
@@ -994,7 +992,7 @@ i = p(k, j);
 
 ; return 0; }
 EOF
-if { (eval echo configure:998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_compat="yes"
 else
@@ -1009,9 +1007,9 @@ rm -f conftest*
 echo "$ac_t""$ac_cv_compat" 1>&6
 
 echo $ac_n "checking for exception support""... $ac_c" 1>&6
-echo "configure:1013: checking for exception support" >&5
+echo "configure:1011: checking for exception support" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1015 "configure"
+#line 1013 "configure"
 #include "confdefs.h"
  
 #include <stdlib.h>
@@ -1042,7 +1040,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -1056,9 +1054,9 @@ rm -f conftest*
 
 
 echo $ac_n "checking for default template parameter support""... $ac_c" 1>&6
-echo "configure:1060: checking for default template parameter support" >&5
+echo "configure:1058: checking for default template parameter support" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1062 "configure"
+#line 1060 "configure"
 #include "confdefs.h"
  
 #include <stdlib.h>
@@ -1079,7 +1077,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -1091,9 +1089,9 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for derived default template parameter support""... $ac_c" 1>&6
-echo "configure:1095: checking for derived default template parameter support" >&5
+echo "configure:1093: checking for derived default template parameter support" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1097 "configure"
+#line 1095 "configure"
 #include "confdefs.h"
  
 #include <stdlib.h>
@@ -1121,7 +1119,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -1134,9 +1132,9 @@ rm -f conftest*
 
 
 echo $ac_n "checking for function template partial ordering""... $ac_c" 1>&6
-echo "configure:1138: checking for function template partial ordering" >&5
+echo "configure:1136: checking for function template partial ordering" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1140 "configure"
+#line 1138 "configure"
 #include "confdefs.h"
  
 #include <stdlib.h>
@@ -1167,7 +1165,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -1197,9 +1195,9 @@ fi
 if test "$enable_ms_windows" != "no"; then
 
 echo $ac_n "checking for MS Windows""... $ac_c" 1>&6
-echo "configure:1201: checking for MS Windows" >&5
+echo "configure:1199: checking for MS Windows" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1203 "configure"
+#line 1201 "configure"
 #include "confdefs.h"
  
 #include <windows.h>
@@ -1216,7 +1214,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   iswin="true"
 echo "$ac_t""yes" 1>&6
@@ -1233,9 +1231,9 @@ fi
 
 if test "$enable_ms_windows" != "no"; then
 echo $ac_n "checking for MS Win32""... $ac_c" 1>&6
-echo "configure:1237: checking for MS Win32" >&5
+echo "configure:1235: checking for MS Win32" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1239 "configure"
+#line 1237 "configure"
 #include "confdefs.h"
  
 #include <windows.h>
@@ -1251,7 +1249,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -1269,7 +1267,7 @@ if test "$enable_ms_windows" != "no"; then
 
 if test "$CXX" != "cl"; then
 echo $ac_n "checking for main in -luser32""... $ac_c" 1>&6
-echo "configure:1273: checking for main in -luser32" >&5
+echo "configure:1271: checking for main in -luser32" >&5
 ac_lib_var=`echo user32'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1277,14 +1275,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-luser32  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1281 "configure"
+#line 1279 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1305,7 +1303,7 @@ else
 fi
 
 echo $ac_n "checking for main in -lkernel32""... $ac_c" 1>&6
-echo "configure:1309: checking for main in -lkernel32" >&5
+echo "configure:1307: checking for main in -lkernel32" >&5
 ac_lib_var=`echo kernel32'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1313,14 +1311,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lkernel32  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1317 "configure"
+#line 1315 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1343,7 +1341,7 @@ fi
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 1347 "configure"
+#line 1345 "configure"
 #include "confdefs.h"
  
 #include <windows.h>
@@ -1362,13 +1360,13 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   
 if test "enable_threads" != "no"; then
 # turn on threading support:
 echo $ac_n "checking for mult-thread support""... $ac_c" 1>&6
-echo "configure:1372: checking for mult-thread support" >&5
+echo "configure:1370: checking for mult-thread support" >&5
 echo "$ac_t"""yes"" 1>&6
 cat >> confdefs.h <<\EOF
 #define BOOST_RE_THREADS 
@@ -1405,9 +1403,9 @@ fi
 
 
 echo $ac_n "checking for bool support""... $ac_c" 1>&6
-echo "configure:1409: checking for bool support" >&5
+echo "configure:1407: checking for bool support" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1411 "configure"
+#line 1409 "configure"
 #include "confdefs.h"
  
 
@@ -1417,7 +1415,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -1448,9 +1446,9 @@ EOF
 else
 
 echo $ac_n "checking for <cwchar>""... $ac_c" 1>&6
-echo "configure:1452: checking for <cwchar>" >&5
+echo "configure:1450: checking for <cwchar>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1454 "configure"
+#line 1452 "configure"
 #include "confdefs.h"
  
 #include <cwchar>
@@ -1460,7 +1458,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -1485,9 +1483,9 @@ EOF
 else
 
 echo $ac_n "checking for <cwctype>""... $ac_c" 1>&6
-echo "configure:1489: checking for <cwctype>" >&5
+echo "configure:1487: checking for <cwctype>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1491 "configure"
+#line 1489 "configure"
 #include "confdefs.h"
  
 #include <cwctype>
@@ -1497,7 +1495,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -1523,9 +1521,9 @@ EOF
 else
 
 echo $ac_n "checking for wide string functions""... $ac_c" 1>&6
-echo "configure:1527: checking for wide string functions" >&5
+echo "configure:1525: checking for wide string functions" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1529 "configure"
+#line 1527 "configure"
 #include "confdefs.h"
 
 #include "confdefs.h"
@@ -1557,7 +1555,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 enable_wstring="yes"
@@ -1577,9 +1575,9 @@ fi
 
 if test "$enable_wstring" != "no"; then
 echo $ac_n "checking for swprintf support""... $ac_c" 1>&6
-echo "configure:1581: checking for swprintf support" >&5
+echo "configure:1579: checking for swprintf support" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1583 "configure"
+#line 1581 "configure"
 #include "confdefs.h"
  
 #include "confdefs.h"
@@ -1599,7 +1597,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -1631,9 +1629,9 @@ EOF
 else
 
 echo $ac_n "checking for member template classes and functions""... $ac_c" 1>&6
-echo "configure:1635: checking for member template classes and functions" >&5
+echo "configure:1633: checking for member template classes and functions" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1637 "configure"
+#line 1635 "configure"
 #include "confdefs.h"
  
 
@@ -1670,7 +1668,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -1701,9 +1699,9 @@ EOF
 else
 
 echo $ac_n "checking for parameterised function returns""... $ac_c" 1>&6
-echo "configure:1705: checking for parameterised function returns" >&5
+echo "configure:1703: checking for parameterised function returns" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1707 "configure"
+#line 1705 "configure"
 #include "confdefs.h"
  
 template <class T>
@@ -1717,7 +1715,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -1734,148 +1732,6 @@ rm -f conftest*
 fi
 
 
-# Check whether --enable-int64 or --disable-int64 was given.
-if test "${enable_int64+set}" = set; then
-  enableval="$enable_int64"
-  :
-fi
-
-if test "$enable_int64" = "no"; then
-cat >> confdefs.h <<\EOF
-#define BOOST_RE_INT64_T_0 1
-EOF
-
-else
-
-echo $ac_n "checking for 64-bit integral type""... $ac_c" 1>&6
-echo "configure:1752: checking for 64-bit integral type" >&5
-
-if test "$ac_cv_sizeof_short" -eq 8; then
-cat >> confdefs.h <<\EOF
-#define BOOST_RE_INT64_T_1 1
-EOF
-
-echo "$ac_t""yes - short" 1>&6
-have_int64="true"
-fi
-if test "$ac_cv_sizeof_int" -eq 8 && test "$have_int64" != "true"; then
-cat >> confdefs.h <<\EOF
-#define BOOST_RE_INT64_T_2 1
-EOF
-
-echo "$ac_t""yes - int" 1>&6
-have_int64="true"
-fi
-if test "$ac_cv_sizeof_long" -eq 8 && test "$have_int64" != "true"; then
-cat >> confdefs.h <<\EOF
-#define BOOST_RE_INT64_T_3 1
-EOF
-
-echo "$ac_t""yes - long" 1>&6
-have_int64="true"
-fi
-if test "$have_int64" != "true"; then
-cat > conftest.$ac_ext <<EOF
-#line 1780 "configure"
-#include "confdefs.h"
- 
-#include <inttypes.h>
-
-int64_t i = INT64_C(0x100000000);
-
-int main() {
-
-
-; return 0; }
-EOF
-if { (eval echo configure:1792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  echo "$ac_t""yes - int64_t" 1>&6
-have_int64="true"
-cat >> confdefs.h <<\EOF
-#define BOOST_RE_INT64_T_4 1
-EOF
-
-
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-fi
-
-if test "$have_int64" != "true"; then
-
-cat > conftest.$ac_ext <<EOF
-#line 1811 "configure"
-#include "confdefs.h"
- 
-#include <stdlib.h>
-
-long long i = 0x100000000LL;
-
-int main() {
-
-
-; return 0; }
-EOF
-if { (eval echo configure:1823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  echo "$ac_t""yes - long long" 1>&6
-have_int64="true"
-cat >> confdefs.h <<\EOF
-#define BOOST_RE_INT64_T_5 1
-EOF
-
-
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-fi
-
-if test "$have_int64" != "true"; then
-
-cat > conftest.$ac_ext <<EOF
-#line 1843 "configure"
-#include "confdefs.h"
- 
-#include <stdlib.h>
-
-__int64 i = 0x100000000i64;
-
-int main() {
-
-
-; return 0; }
-EOF
-if { (eval echo configure:1855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  echo "$ac_t""yes - __int64" 1>&6
-have_int64="true"
-cat >> confdefs.h <<\EOF
-#define BOOST_RE_INT64_T_6 1
-EOF
-
-
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-fi
-if test "$have_int64" != "true"; then
-cat >> confdefs.h <<\EOF
-#define BOOST_RE_INT64_T 0
-EOF
-
-echo "$ac_t""no" 1>&6
-fi
-fi
-
-
 # Check whether --enable-messages or --disable-messages was given.
 if test "${enable_messages+set}" = set; then
   enableval="$enable_messages"
@@ -1890,7 +1746,7 @@ EOF
 else
 
 echo $ac_n "checking for catopen in -lnl_types""... $ac_c" 1>&6
-echo "configure:1894: checking for catopen in -lnl_types" >&5
+echo "configure:1750: checking for catopen in -lnl_types" >&5
 ac_lib_var=`echo nl_types'_'catopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1898,7 +1754,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnl_types  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1902 "configure"
+#line 1758 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -1912,7 +1768,7 @@ int main() {
 catopen()
 ; return 0; }
 EOF
-if { (eval echo configure:1916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1940,7 +1796,7 @@ else
 fi
 
 echo $ac_n "checking for catopen in -lposix""... $ac_c" 1>&6
-echo "configure:1944: checking for catopen in -lposix" >&5
+echo "configure:1800: checking for catopen in -lposix" >&5
 ac_lib_var=`echo posix'_'catopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1948,7 +1804,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1952 "configure"
+#line 1808 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -1962,7 +1818,7 @@ int main() {
 catopen()
 ; return 0; }
 EOF
-if { (eval echo configure:1966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1991,9 +1847,9 @@ fi
 
 
 echo $ac_n "checking for POSIX message categories""... $ac_c" 1>&6
-echo "configure:1995: checking for POSIX message categories" >&5
+echo "configure:1851: checking for POSIX message categories" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1997 "configure"
+#line 1853 "configure"
 #include "confdefs.h"
  
 #include <nl_types.h>
@@ -2007,7 +1863,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -2027,7 +1883,7 @@ fi
 if test "$enable_threads" != "no" && test "$enable_ms_windows" = "no"; then
 
 echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6
-echo "configure:2031: checking for pthread_mutex_init in -lpthread" >&5
+echo "configure:1887: checking for pthread_mutex_init in -lpthread" >&5
 ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2035,7 +1891,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2039 "configure"
+#line 1895 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -2049,7 +1905,7 @@ int main() {
 pthread_mutex_init()
 ; return 0; }
 EOF
-if { (eval echo configure:2053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2077,7 +1933,7 @@ else
 fi
 
 echo $ac_n "checking for pthread_mutex_init in -lposix""... $ac_c" 1>&6
-echo "configure:2081: checking for pthread_mutex_init in -lposix" >&5
+echo "configure:1937: checking for pthread_mutex_init in -lposix" >&5
 ac_lib_var=`echo posix'_'pthread_mutex_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2085,7 +1941,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2089 "configure"
+#line 1945 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -2099,7 +1955,7 @@ int main() {
 pthread_mutex_init()
 ; return 0; }
 EOF
-if { (eval echo configure:2103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2128,9 +1984,9 @@ fi
 
 
 echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6
-echo "configure:2132: checking for POSIX threads" >&5
+echo "configure:1988: checking for POSIX threads" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2134 "configure"
+#line 1990 "configure"
 #include "confdefs.h"
  
 #include <pthread.h>
@@ -2147,7 +2003,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 cat >> confdefs.h <<\EOF
@@ -2183,9 +2039,9 @@ EOF
 else
 
 echo $ac_n "checking for __fastcall and __stdcall""... $ac_c" 1>&6
-echo "configure:2187: checking for __fastcall and __stdcall" >&5
+echo "configure:2043: checking for __fastcall and __stdcall" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2189 "configure"
+#line 2045 "configure"
 #include "confdefs.h"
  
 void __fastcall f1(int)
@@ -2204,7 +2060,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 cat >> confdefs.h <<\EOF
@@ -2238,9 +2094,9 @@ fi
 
 
 echo $ac_n "checking for standard library namespace""... $ac_c" 1>&6
-echo "configure:2242: checking for standard library namespace" >&5
+echo "configure:2098: checking for standard library namespace" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2244 "configure"
+#line 2100 "configure"
 #include "confdefs.h"
  
 #include <stddef.h>
@@ -2264,7 +2120,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes - std" 1>&6
 have_std_namespace="yes"
@@ -2280,9 +2136,9 @@ rm -f conftest*
 
 
 echo $ac_n "checking for <memory>""... $ac_c" 1>&6
-echo "configure:2284: checking for <memory>" >&5
+echo "configure:2140: checking for <memory>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2286 "configure"
+#line 2142 "configure"
 #include "confdefs.h"
  
 #include <memory>
@@ -2311,7 +2167,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 
@@ -2331,9 +2187,9 @@ rm -f conftest*
 
 if test "$enable_stl" != "no"; then
 echo $ac_n "checking for <string>""... $ac_c" 1>&6
-echo "configure:2335: checking for <string>" >&5
+echo "configure:2191: checking for <string>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2337 "configure"
+#line 2193 "configure"
 #include "confdefs.h"
  
 #include <string>
@@ -2348,7 +2204,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 
@@ -2366,9 +2222,9 @@ fi
 
 if test "$enable_stl" != "no"; then
 echo $ac_n "checking for std::basic_string default arguments""... $ac_c" 1>&6
-echo "configure:2370: checking for std::basic_string default arguments" >&5
+echo "configure:2226: checking for std::basic_string default arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2372 "configure"
+#line 2228 "configure"
 #include "confdefs.h"
  
 #include <string>
@@ -2383,7 +2239,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 
@@ -2405,9 +2261,9 @@ fi
 ac_have_locale='no'
 if test "$enable_stl" != "no"; then
 echo $ac_n "checking for <locale>""... $ac_c" 1>&6
-echo "configure:2409: checking for <locale>" >&5
+echo "configure:2265: checking for <locale>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2411 "configure"
+#line 2267 "configure"
 #include "confdefs.h"
  
 #include <locale>
@@ -2425,10 +2281,14 @@ std::map<std::string, std::string> m;
 
 int main() {
 
+if(std::has_facet<std::ctype<char> >(l))
+{
+	const std::ctype<char>& ct = std::use_facet<std::ctype<char> >(l);
+}
 
 ; return 0; }
 EOF
-if { (eval echo configure:2432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 ac_have_locale='yes'
@@ -2450,9 +2310,9 @@ fi
 
 if test "$enable_stl" != "no"; then
 echo $ac_n "checking for <iostream>""... $ac_c" 1>&6
-echo "configure:2454: checking for <iostream>" >&5
+echo "configure:2314: checking for <iostream>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2456 "configure"
+#line 2316 "configure"
 #include "confdefs.h"
  
 #include <iostream>
@@ -2468,7 +2328,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 
@@ -2488,9 +2348,9 @@ rm -f conftest*
 fi
 
 echo $ac_n "checking for std::distance""... $ac_c" 1>&6
-echo "configure:2492: checking for std::distance" >&5
+echo "configure:2352: checking for std::distance" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2494 "configure"
+#line 2354 "configure"
 #include "confdefs.h"
  
 #include <iterator>
@@ -2504,67 +2364,31 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
-cat >> confdefs.h <<\EOF
-#define BOOST_RE_DISTANCE_T_1 1
-EOF
-
-have_dist="yes"
-
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-
-if test "$enable_stl" != "no" && test "$have_dist" != "yes"; then
-cat > conftest.$ac_ext <<EOF
-#line 2525 "configure"
-#include "confdefs.h"
- 
-#include <iterator>
-#include "confdefs.h"
-
-
-int main() {
-
- int i, *j, *k;
- std::distance(j, k, i);
-
-; return 0; }
-EOF
-if { (eval echo configure:2539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  echo "$ac_t""yes" 1>&6
-cat >> confdefs.h <<\EOF
-#define BOOST_RE_DISTANCE_T_2 1
-EOF
-
 have_dist="yes"
 
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  echo "$ac_t""no" 1>&6
+  
+echo "$ac_t""no" 1>&6
 cat >> confdefs.h <<\EOF
-#define BOOST_RE_DISTANCE_T_0 1
+#define BOOST_NO_STD_DISTANCE 1
 EOF
 
-have_dist="yes"
-fi
-rm -f conftest*
 
 fi
+rm -f conftest*
 
 
 if test "$enable_stl" != "no"; then
 echo $ac_n "checking for output iterator assignment""... $ac_c" 1>&6
-echo "configure:2566: checking for output iterator assignment" >&5
+echo "configure:2390: checking for output iterator assignment" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2568 "configure"
+#line 2392 "configure"
 #include "confdefs.h"
  
 #include "confdefs.h"
@@ -2599,7 +2423,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 
@@ -2735,9 +2559,9 @@ old_libs="$LIBS"
 LIBS="conf2.cpp $old_libs"
 
 echo $ac_n "checking for link time template merging""... $ac_c" 1>&6
-echo "configure:2739: checking for link time template merging" >&5
+echo "configure:2563: checking for link time template merging" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2741 "configure"
+#line 2565 "configure"
 #include "confdefs.h"
 
 #include "conf2.h"
@@ -2750,7 +2574,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -2774,9 +2598,9 @@ if eval "$CXX $CXXFLAGS -c conf2.cpp" && eval "ar -rc libconf2.a conf2$ac_obj_ex
 LIBS="-L./ -lconf2 $old_libs"
 
 echo $ac_n "checking for link time template merging from archive files""... $ac_c" 1>&6
-echo "configure:2778: checking for link time template merging from archive files" >&5
+echo "configure:2602: checking for link time template merging from archive files" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2780 "configure"
+#line 2604 "configure"
 #include "confdefs.h"
 
 #include "conf2.h"
@@ -2789,7 +2613,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -2918,9 +2742,9 @@ old_libs="$LIBS"
 LIBS="conf2.cpp $old_libs"
 
 echo $ac_n "checking for link time template merging of switch statements""... $ac_c" 1>&6
-echo "configure:2922: checking for link time template merging of switch statements" >&5
+echo "configure:2746: checking for link time template merging of switch statements" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2924 "configure"
+#line 2748 "configure"
 #include "confdefs.h"
 
 #include "conf2.h"
@@ -2933,7 +2757,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -3316,6 +3140,8 @@ rm -f jm_opt.out
 
 
 
+
+
 
 
 
diff --git a/example/jgrep/jgrep.cpp b/example/jgrep/jgrep.cpp
index 25e377e2..04d064c8 100644
--- a/example/jgrep/jgrep.cpp
+++ b/example/jgrep/jgrep.cpp
@@ -15,7 +15,7 @@
  
  /*
   *   FILE     jgrep.cpp
-  *   VERSION  3.11
+  *   VERSION  3.12
   */
 
 #include <stdio.h>
diff --git a/example/jgrep/jgrep.h b/example/jgrep/jgrep.h
index db0cb772..9eb8687d 100644
--- a/example/jgrep/jgrep.h
+++ b/example/jgrep/jgrep.h
@@ -15,7 +15,7 @@
  
  /*
   *   FILE     jgrep.h
-  *   VERSION  3.11
+  *   VERSION  3.12
   */
 
 #ifndef _JGREP_H
diff --git a/example/jgrep/main.cpp b/example/jgrep/main.cpp
index 5bf335aa..05048584 100644
--- a/example/jgrep/main.cpp
+++ b/example/jgrep/main.cpp
@@ -15,7 +15,7 @@
  
  /*
   *   FILE     main.cpp
-  *   VERSION  3.11
+  *   VERSION  3.12
   */
 
 
diff --git a/faq.htm b/faq.htm
index c8c3a0e9..23413ec5 100644
--- a/faq.htm
+++ b/faq.htm
@@ -13,7 +13,7 @@
 <H3><IMG SRC="../../c++boost.gif" WIDTH=276 HEIGHT=86 ALT="C++ Boost"></H3></TD>
 <TD WIDTH="50%" VALIGN="TOP">
 <H3 ALIGN="CENTER">Regex++, FAQ.</H3>
-<I><P ALIGN="CENTER">(version 3.11, 18 April 2000)</I> </P>
+<I><P ALIGN="CENTER">(version 3.12, 18 April 2000)</I> </P>
 <I><PRE>Copyright (c) 1998-2000
 Dr John Maddock
 
diff --git a/format_string.htm b/format_string.htm
index d2f18c05..0e1a8be5 100644
--- a/format_string.htm
+++ b/format_string.htm
@@ -20,7 +20,7 @@
 <H3> Regex++, Format String Reference.</H3>
 </CENTER>
 <CENTER>
-<I>(version 3.11, 18 April 2000)</I>
+<I>(version 3.12, 18 April 2000)</I>
 </CENTER>
 <PRE><I>Copyright (c) 1998-2000
 Dr John Maddock
diff --git a/hl_ref.htm b/hl_ref.htm
index 0d8f4bda..7f1b1996 100644
--- a/hl_ref.htm
+++ b/hl_ref.htm
@@ -21,7 +21,7 @@ content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
         </td>
         <td valign="top" width="50%"><h3 align="center">Regex++,
         RegEx Class Reference. </h3>
-        <p><i>(version 3.11, 18 April 2000)</i> </p>
+        <p><i>(version 3.12, 18 April 2000)</i> </p>
         <pre><i>Copyright (c) 1998-2000
 Dr John Maddock
 
diff --git a/include/boost/cregex.hpp b/include/boost/cregex.hpp
index 6f46e46d..34f9ae8d 100644
--- a/include/boost/cregex.hpp
+++ b/include/boost/cregex.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         cregex.cpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: Declares POSIX API functions
   *                + boost::RegEx high level wrapper.
   */
diff --git a/include/boost/regex.h b/include/boost/regex.h
index 0970ffb6..359115fb 100644
--- a/include/boost/regex.h
+++ b/include/boost/regex.h
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex.h
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: Declares POSIX API functions
   */
 
diff --git a/include/boost/regex.hpp b/include/boost/regex.hpp
index 62e0c78e..86526ff5 100644
--- a/include/boost/regex.hpp
+++ b/include/boost/regex.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex.cpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: Declares boost::reg_expression<> and associated
   *                functions and classes. This header is the main
   *                entry point for the template regex code.
diff --git a/include/boost/regex/detail/fileiter.hpp b/include/boost/regex/detail/fileiter.hpp
index 50a8a44f..0fb27807 100644
--- a/include/boost/regex/detail/fileiter.hpp
+++ b/include/boost/regex/detail/fileiter.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         fileiter.hpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: Declares various platform independent file and
   *                directory iterators, plus binary file input in
   *                the form of class map_file.
diff --git a/include/boost/regex/detail/regex_compile.hpp b/include/boost/regex/detail/regex_compile.hpp
index 8f7515a6..d0bf003e 100644
--- a/include/boost/regex/detail/regex_compile.hpp
+++ b/include/boost/regex/detail/regex_compile.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_compile.hpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: Declares reg_expression<> member functions.  This is
   *                an internal header file, do not include directly.
   */
diff --git a/include/boost/regex/detail/regex_config.hpp b/include/boost/regex/detail/regex_config.hpp
index a0b6fc6a..3f27dd52 100644
--- a/include/boost/regex/detail/regex_config.hpp
+++ b/include/boost/regex/detail/regex_config.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_config.hpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: auto-configure options for regular expression code.
   */
 
diff --git a/include/boost/regex/detail/regex_cstring.hpp b/include/boost/regex/detail/regex_cstring.hpp
index 7525db53..24e4e365 100644
--- a/include/boost/regex/detail/regex_cstring.hpp
+++ b/include/boost/regex/detail/regex_cstring.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_cstring.hpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: This is an internal header file, do not include directly.
   *                String support and helper functions, for regular
   *                expression library.
diff --git a/include/boost/regex/detail/regex_format.hpp b/include/boost/regex/detail/regex_format.hpp
index 5fa3a563..84ba3281 100644
--- a/include/boost/regex/detail/regex_format.hpp
+++ b/include/boost/regex/detail/regex_format.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_format.hpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: Provides formatting output routines for search and replace
   *                operations.  Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
diff --git a/include/boost/regex/detail/regex_kmp.hpp b/include/boost/regex/detail/regex_kmp.hpp
index 500f58ac..2802e9dc 100644
--- a/include/boost/regex/detail/regex_kmp.hpp
+++ b/include/boost/regex/detail/regex_kmp.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_kmp.hpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: Provides Knuth Morris Pratt search operations.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
diff --git a/include/boost/regex/detail/regex_library_include.hpp b/include/boost/regex/detail/regex_library_include.hpp
index 24e9dde4..ac56cb89 100644
--- a/include/boost/regex/detail/regex_library_include.hpp
+++ b/include/boost/regex/detail/regex_library_include.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_libary_include.hpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: Automatic library inclusion for Borland/Microsoft compilers.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
diff --git a/include/boost/regex/detail/regex_match.hpp b/include/boost/regex/detail/regex_match.hpp
index 79e8738b..245229a1 100644
--- a/include/boost/regex/detail/regex_match.hpp
+++ b/include/boost/regex/detail/regex_match.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_match.hpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: Regular expression matching algorithms.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
@@ -1158,7 +1158,9 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
    
    // depending on what the first record is we may be able to
    // optimise the search:
-   type = (flags & match_continuous) ? regbase::restart_continue : access::restart_type(e);
+   type = (flags & match_continuous) ? 
+      static_cast<unsigned int>(regbase::restart_continue) 
+         : static_cast<unsigned int>(access::restart_type(e));
 
    if(type == regbase::restart_buf)
       return cmatches;
diff --git a/include/boost/regex/detail/regex_options.hpp b/include/boost/regex/detail/regex_options.hpp
index d3573a68..7c90a21e 100644
--- a/include/boost/regex/detail/regex_options.hpp
+++ b/include/boost/regex/detail/regex_options.hpp
@@ -111,14 +111,13 @@
 /* BOOST_RE_OLD_IOSTREAM           If the new iostreamm classes are not available */
 /* #define BOOST_RE_OLD_IOSTREAM */
 
-/* BOOST_NO_STD_DISTANCE             If std::distance is not present or non-standard */
+/* BOOST_NO_STD_DISTANCE             If there is no std::distance. */
 /* #define BOOST_NO_STD_DISTANCE */
 
 /* BOOST_RE_NO_OI_ASSIGN           If output iterators ostream_iterator<>, back_insert_iterator<> and 
                              front_insert_iterator<> do not have assignment operators */
 /* #define BOOST_RE_NO_OI_ASSIGN */
 
-
 #include <stdexcept>
 
 #ifndef BOOST_RE_NO_ITERATOR_H
diff --git a/include/boost/regex/detail/regex_raw_buffer.hpp b/include/boost/regex/detail/regex_raw_buffer.hpp
index 6818eb2a..55cfc4a2 100644
--- a/include/boost/regex/detail/regex_raw_buffer.hpp
+++ b/include/boost/regex/detail/regex_raw_buffer.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_raw_buffer.hpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: Raw character buffer for regex code.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
diff --git a/include/boost/regex/detail/regex_split.hpp b/include/boost/regex/detail/regex_split.hpp
index eb699a28..cd5b906a 100644
--- a/include/boost/regex/detail/regex_split.hpp
+++ b/include/boost/regex/detail/regex_split.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_split.hpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: Implements regex_split and associated functions.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
diff --git a/include/boost/regex/detail/regex_stack.hpp b/include/boost/regex/detail/regex_stack.hpp
index e8dbef07..f1ac9e7a 100644
--- a/include/boost/regex/detail/regex_stack.hpp
+++ b/include/boost/regex/detail/regex_stack.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_stack.hpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: Implements customised internal regex stacks.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
diff --git a/include/boost/regex/detail/regex_synch.hpp b/include/boost/regex/detail/regex_synch.hpp
index a5eb5ce7..8f9d729d 100644
--- a/include/boost/regex/detail/regex_synch.hpp
+++ b/include/boost/regex/detail/regex_synch.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_synch.hpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: Thread synchronisation for regex code.
   *                Note this is an internal header file included
   *                by regex.hpp, do not include on its own.
diff --git a/include/boost/regex/pattern_except.hpp b/include/boost/regex/pattern_except.hpp
index 90c65494..5ec979fd 100644
--- a/include/boost/regex/pattern_except.hpp
+++ b/include/boost/regex/pattern_except.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         pattern_except.cpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: Declares pattern-matching exception classes.
   */
 
diff --git a/include/boost/regex/regex_traits.hpp b/include/boost/regex/regex_traits.hpp
index 254817de..c6104af9 100644
--- a/include/boost/regex/regex_traits.hpp
+++ b/include/boost/regex/regex_traits.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex.cpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: Declares regular expression traits classes.
   */
 
diff --git a/index.htm b/index.htm
index b408e9b3..231f589f 100644
--- a/index.htm
+++ b/index.htm
@@ -23,7 +23,7 @@ content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
         </td>
         <td valign="top" width="50%"><h3 align="center">Regex++,
         Index.</h3>
-        <p><i>(version 3.11, 18 April 2000)</i> </p>
+        <p><i>(version 3.12, 18 April 2000)</i> </p>
         <pre><i>Copyright (c) 1998-2000
 Dr John Maddock
 
diff --git a/introduction.htm b/introduction.htm
index 0e026a80..d3e69a72 100644
--- a/introduction.htm
+++ b/introduction.htm
@@ -23,7 +23,7 @@ content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
         </td>
         <td valign="top" width="50%"><h3 align="center">Regex++,
         Introduction.</h3>
-        <p><i>(version 3.11, 18 April 2000)</i> </p>
+        <p><i>(version 3.12, 18 April 2000)</i> </p>
         <pre><i>Copyright (c) 1998-2000
 Dr John Maddock
 
@@ -410,7 +410,7 @@ run one of the makefiles described above.</p>
 
 <p><b>Sun Workshop 6.1</b></p>
 
-<p>There is a makefile for the sun (6.1) compiler (C++ version 3.11).
+<p>There is a makefile for the sun (6.1) compiler (C++ version 3.12).
 From the command prompt change to the &lt;boost&gt;/libs/regex/build
 directory and type: </p>
 
diff --git a/posix_ref.htm b/posix_ref.htm
index 35c30c9e..7e5d4320 100644
--- a/posix_ref.htm
+++ b/posix_ref.htm
@@ -20,7 +20,7 @@
 <H3> Regex++, POSIX API Reference.</H3>
 </CENTER>
 <CENTER>
-<I>(version 3.11, 18 April 2000)</I> 
+<I>(version 3.12, 18 April 2000)</I> 
 </CENTER>
 <PRE><I>Copyright (c) 1998-2000
 Dr John Maddock
diff --git a/src/c_regex_traits.cpp b/src/c_regex_traits.cpp
index 80ac6862..fca78582 100644
--- a/src/c_regex_traits.cpp
+++ b/src/c_regex_traits.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         c_regex_traits.cpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: Implements the c_regex_traits<charT> traits class
   */
 
diff --git a/src/c_regex_traits_common.cpp b/src/c_regex_traits_common.cpp
index c2eaf8ce..a2be4d84 100644
--- a/src/c_regex_traits_common.cpp
+++ b/src/c_regex_traits_common.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        c_regex_traits_common.cpp
-  *   VERSION:     3.11
+  *   VERSION:     3.12
   *   DESCRIPTION: Implements common code and data for the
   *                c_regex_traits<charT> traits classes.
   */
diff --git a/src/cpp_regex_traits.cpp b/src/cpp_regex_traits.cpp
index f56a2037..1a894864 100644
--- a/src/cpp_regex_traits.cpp
+++ b/src/cpp_regex_traits.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        c_regex_traits.cpp
-  *   VERSION:     3.11
+  *   VERSION:     3.12
   *   DESCRIPTION: Implements the cpp_regex_traits<charT> traits class
   */
 #include <clocale>
diff --git a/src/cregex.cpp b/src/cregex.cpp
index 56fcae70..b9329832 100644
--- a/src/cregex.cpp
+++ b/src/cregex.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        cregex.cpp
-  *   VERSION:     3.11
+  *   VERSION:     3.12
   *   DESCRIPTION: Implements high level class boost::RexEx
   */
 #include <boost/cregex.hpp>
diff --git a/src/fileiter.cpp b/src/fileiter.cpp
index d7e19a45..ab72f921 100644
--- a/src/fileiter.cpp
+++ b/src/fileiter.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        fileiter.cpp
-  *   VERSION:     3.11
+  *   VERSION:     3.12
   *   DESCRIPTION: Implements file io primitives + directory searching for class boost::RegEx.
   */
 
diff --git a/src/posix_api.cpp b/src/posix_api.cpp
index c1567af7..d81a3784 100644
--- a/src/posix_api.cpp
+++ b/src/posix_api.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        posix_api.cpp
-  *   VERSION:     3.11
+  *   VERSION:     3.12
   *   DESCRIPTION: Implements the Posix API wrappers.
   */
 
diff --git a/src/primary_transform.hpp b/src/primary_transform.hpp
index 9537e7b6..e9447fb2 100644
--- a/src/primary_transform.hpp
+++ b/src/primary_transform.hpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        primary_transform.hpp
-  *   VERSION:     3.11
+  *   VERSION:     3.12
   *   DESCRIPTION: Heuristically determines the sort string format in use
   *                by the current locale.
   */
diff --git a/src/regex.cpp b/src/regex.cpp
index 889bdc87..8321c063 100644
--- a/src/regex.cpp
+++ b/src/regex.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        regex.cpp
-  *   VERSION:     3.11
+  *   VERSION:     3.12
   *   DESCRIPTION: Misc boost::regbase member funnctions.
   */
 
diff --git a/src/regex_debug.cpp b/src/regex_debug.cpp
index 6e1e8f8e..d1fb185c 100644
--- a/src/regex_debug.cpp
+++ b/src/regex_debug.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        regex_debug.cpp
-  *   VERSION:     3.11
+  *   VERSION:     3.12
   *   DESCRIPTION: Misc. debugging helpers.
   */
 
diff --git a/src/regex_synch.cpp b/src/regex_synch.cpp
index 74889a23..84a64909 100644
--- a/src/regex_synch.cpp
+++ b/src/regex_synch.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        regex_synch.cpp
-  *   VERSION:     3.11
+  *   VERSION:     3.12
   *   DESCRIPTION: Thread synch helper functions, for regular
   *                expression library.
   */
diff --git a/src/w32_regex_traits.cpp b/src/w32_regex_traits.cpp
index 4bc1b65f..f2c8d907 100644
--- a/src/w32_regex_traits.cpp
+++ b/src/w32_regex_traits.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        w32_regex_traits.cpp
-  *   VERSION:     3.11
+  *   VERSION:     3.12
   *   DESCRIPTION: Implements the w32_regex_traits<charT> traits class
   */
 
diff --git a/src/wide_posix_api.cpp b/src/wide_posix_api.cpp
index b52b861a..8f10b6f4 100644
--- a/src/wide_posix_api.cpp
+++ b/src/wide_posix_api.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE:        wide_posix_api.cpp
-  *   VERSION:     3.11
+  *   VERSION:     3.12
   *   DESCRIPTION: Implements the wide character POSIX API wrappers.
   */
 
diff --git a/syntax.htm b/syntax.htm
index dc0d0243..45b260eb 100644
--- a/syntax.htm
+++ b/syntax.htm
@@ -20,7 +20,7 @@
 <H3> Regex++, Regular Expression Syntax.</H3>
 </CENTER>
 <CENTER>
-<I>(version 3.11, 18 April 2000)</I>
+<I>(version 3.12, 18 April 2000)</I>
 </CENTER>
 <PRE><I>Copyright (c) 1998-2000
 Dr John Maddock
diff --git a/template_class_ref.htm b/template_class_ref.htm
index 4ed3f83b..8992707c 100644
--- a/template_class_ref.htm
+++ b/template_class_ref.htm
@@ -21,7 +21,7 @@ content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
         </td>
         <td valign="top" width="50%"><h2 align="center">Regex++,
         Template Class and Algorithm Reference.</h2>
-        <p><i>(version 3.11, 18 April 2000)</i> </p>
+        <p><i>(version 3.12, 18 April 2000)</i> </p>
         <pre><i>Copyright (c) 1998-9
 Dr John Maddock
 
diff --git a/test/regress/parse.cpp b/test/regress/parse.cpp
index d8129935..1424f5c0 100644
--- a/test/regress/parse.cpp
+++ b/test/regress/parse.cpp
@@ -16,7 +16,7 @@
  /*
   *
   *   FILE     parse.cpp
-  *   VERSION  3.11
+  *   VERSION  3.12
   *
   * Input parsing functions for regress.
   *
diff --git a/test/regress/regex_test.cpp b/test/regress/regex_test.cpp
index 4423a809..36f85d97 100644
--- a/test/regress/regex_test.cpp
+++ b/test/regress/regex_test.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_test.cpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: Builds regression test program with default
   *                locale and narrow character tests.  Also
   *                instantiates all the templates in the library
diff --git a/test/regress/regress.cpp b/test/regress/regress.cpp
index 029388af..341f0ff9 100644
--- a/test/regress/regress.cpp
+++ b/test/regress/regress.cpp
@@ -16,7 +16,7 @@
  /*
   *
   *   FILE     regress.cpp
-  *   VERSION  3.11
+  *   VERSION  3.12
   *
   * main() and associated code for regress.
   *
diff --git a/test/regress/regress.h b/test/regress/regress.h
index af1df360..c38f41e8 100644
--- a/test/regress/regress.h
+++ b/test/regress/regress.h
@@ -16,7 +16,7 @@
  /*
   *
   *   FILE     regress.h
-  *   VERSION  3.11
+  *   VERSION  3.12
   *
   * Function and data declarations for regress.
   *
diff --git a/test/regress/tests.cpp b/test/regress/tests.cpp
index 36e42f97..91204ed0 100644
--- a/test/regress/tests.cpp
+++ b/test/regress/tests.cpp
@@ -16,7 +16,7 @@
  /*
   *
   *   FILE     tests.cpp
-  *   VERSION  3.11
+  *   VERSION  3.12
   *
   * the actual tests conducted by regress.
   *
diff --git a/test/regress/wregex_test.cpp b/test/regress/wregex_test.cpp
index 100a4a43..a7d84fb9 100644
--- a/test/regress/wregex_test.cpp
+++ b/test/regress/wregex_test.cpp
@@ -16,7 +16,7 @@
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_test.cpp
-  *   VERSION      3.11
+  *   VERSION      3.12
   *   DESCRIPTION: Builds regression test program with default
   *                locale and wide character tests.  Also
   *                instantiates all the templates in the library
diff --git a/traits_class_ref.htm b/traits_class_ref.htm
index b6ae1a99..cb364dfc 100644
--- a/traits_class_ref.htm
+++ b/traits_class_ref.htm
@@ -19,7 +19,7 @@
 HEIGHT="86" ALT="C++ Boost"> </H3>
 </TD>
 <TD VALIGN="top" WIDTH="50%"><H3 ALIGN="center">Regex++, Traits Class
-Reference. <I>(version 3.11, 18 April 2000)</I>&nbsp; </H3>
+Reference. <I>(version 3.12, 18 April 2000)</I>&nbsp; </H3>
 <PRE>
 <I>Copyright (c) 1998-2000
 Dr John Maddock