diff --git a/build/bcb6.mak b/build/bcb6.mak
index 2da46050..ddee982b 100644
--- a/build/bcb6.mak
+++ b/build/bcb6.mak
@@ -35,7 +35,7 @@ BCROOT=$(MAKEDIR)\..
 !endif
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : bcb bcb\libboost_regex-bcb-s-1_31 bcb\libboost_regex-bcb-s-1_31.lib bcb\libboost_regex-bcb-mt-s-1_31 bcb\libboost_regex-bcb-mt-s-1_31.lib bcb\boost_regex-bcb-mt-1_31 bcb\boost_regex-bcb-mt-1_31.lib bcb\boost_regex-bcb-1_31 bcb\boost_regex-bcb-1_31.lib bcb\libboost_regex-bcb-mt-1_31 bcb\libboost_regex-bcb-mt-1_31.lib bcb\libboost_regex-bcb-1_31 bcb\libboost_regex-bcb-1_31.lib bcb\libboost_regex-bcb-sd-1_31 bcb\libboost_regex-bcb-sd-1_31.lib bcb\libboost_regex-bcb-mt-sd-1_31 bcb\libboost_regex-bcb-mt-sd-1_31.lib bcb\boost_regex-bcb-mt-d-1_31 bcb\boost_regex-bcb-mt-d-1_31.lib bcb\boost_regex-bcb-d-1_31 bcb\boost_regex-bcb-d-1_31.lib bcb\libboost_regex-bcb-mt-d-1_31 bcb\libboost_regex-bcb-mt-d-1_31.lib bcb\libboost_regex-bcb-d-1_31 bcb\libboost_regex-bcb-d-1_31.lib
 
@@ -77,11 +77,6 @@ bcb\libboost_regex-bcb-s-1_31\c_regex_traits.obj: ../src/c_regex_traits.cpp $(AL
 -c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_31\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_31\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_31\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-s-1_31\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_31\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -117,9 +112,19 @@ bcb\libboost_regex-bcb-s-1_31\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEAD
 -c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_31\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_31\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_31\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_31\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_31\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-s-1_31\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_31\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-s-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
 bcb\libboost_regex-bcb-s-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -127,6 +132,11 @@ bcb\libboost_regex-bcb-s-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp
 -c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-s-1_31\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_31\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-s-1_31\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_31\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -146,10 +156,10 @@ libboost_regex-bcb-s-1_31_clean :
 	del bcb\libboost_regex-bcb-s-1_31\*.csm
 	del bcb\libboost_regex-bcb-s-1_31\*.tds
 
-bcb\libboost_regex-bcb-s-1_31.lib : bcb\libboost_regex-bcb-s-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-s-1_31\c_regex_traits_common.obj bcb\libboost_regex-bcb-s-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-s-1_31\cregex.obj bcb\libboost_regex-bcb-s-1_31\fileiter.obj bcb\libboost_regex-bcb-s-1_31\instances.obj bcb\libboost_regex-bcb-s-1_31\posix_api.obj bcb\libboost_regex-bcb-s-1_31\regex.obj bcb\libboost_regex-bcb-s-1_31\regex_debug.obj bcb\libboost_regex-bcb-s-1_31\regex_synch.obj bcb\libboost_regex-bcb-s-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-s-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-s-1_31\winstances.obj
+bcb\libboost_regex-bcb-s-1_31.lib : bcb\libboost_regex-bcb-s-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-s-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-s-1_31\cregex.obj bcb\libboost_regex-bcb-s-1_31\fileiter.obj bcb\libboost_regex-bcb-s-1_31\instances.obj bcb\libboost_regex-bcb-s-1_31\posix_api.obj bcb\libboost_regex-bcb-s-1_31\regex.obj bcb\libboost_regex-bcb-s-1_31\regex_debug.obj bcb\libboost_regex-bcb-s-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-s-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-s-1_31\static_mutex.obj bcb\libboost_regex-bcb-s-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-s-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-s-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-s-1_31\winstances.obj
 	if exist bcb\libboost_regex-bcb-s-1_31.lib del bcb\libboost_regex-bcb-s-1_31.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-s-1_31.lib"  +"bcb\libboost_regex-bcb-s-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_31\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-s-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_31\cregex.obj" +"bcb\libboost_regex-bcb-s-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-s-1_31\instances.obj" +"bcb\libboost_regex-bcb-s-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-s-1_31\regex.obj" +"bcb\libboost_regex-bcb-s-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-s-1_31\regex_synch.obj" +"bcb\libboost_regex-bcb-s-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-s-1_31\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-s-1_31.lib"  +"bcb\libboost_regex-bcb-s-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_31\cregex.obj" +"bcb\libboost_regex-bcb-s-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-s-1_31\instances.obj" +"bcb\libboost_regex-bcb-s-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-s-1_31\regex.obj" +"bcb\libboost_regex-bcb-s-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-s-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-s-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-s-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-s-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-s-1_31\winstances.obj"
 |
 
 ########################################################
@@ -162,11 +172,6 @@ bcb\libboost_regex-bcb-mt-s-1_31\c_regex_traits.obj: ../src/c_regex_traits.cpp $
 -c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_31\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_31\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_31\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-mt-s-1_31\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_31\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -202,9 +207,19 @@ bcb\libboost_regex-bcb-mt-s-1_31\regex_debug.obj: ../src/regex_debug.cpp $(ALL_H
 -c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_31\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_31\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_31\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_31\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_31\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-mt-s-1_31\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_31\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-mt-s-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
 bcb\libboost_regex-bcb-mt-s-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -212,6 +227,11 @@ bcb\libboost_regex-bcb-mt-s-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.c
 -c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-mt-s-1_31\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_31\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-mt-s-1_31\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_31\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -231,10 +251,10 @@ libboost_regex-bcb-mt-s-1_31_clean :
 	del bcb\libboost_regex-bcb-mt-s-1_31\*.csm
 	del bcb\libboost_regex-bcb-mt-s-1_31\*.tds
 
-bcb\libboost_regex-bcb-mt-s-1_31.lib : bcb\libboost_regex-bcb-mt-s-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_31\c_regex_traits_common.obj bcb\libboost_regex-bcb-mt-s-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_31\cregex.obj bcb\libboost_regex-bcb-mt-s-1_31\fileiter.obj bcb\libboost_regex-bcb-mt-s-1_31\instances.obj bcb\libboost_regex-bcb-mt-s-1_31\posix_api.obj bcb\libboost_regex-bcb-mt-s-1_31\regex.obj bcb\libboost_regex-bcb-mt-s-1_31\regex_debug.obj bcb\libboost_regex-bcb-mt-s-1_31\regex_synch.obj bcb\libboost_regex-bcb-mt-s-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-mt-s-1_31\winstances.obj
+bcb\libboost_regex-bcb-mt-s-1_31.lib : bcb\libboost_regex-bcb-mt-s-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_31\cregex.obj bcb\libboost_regex-bcb-mt-s-1_31\fileiter.obj bcb\libboost_regex-bcb-mt-s-1_31\instances.obj bcb\libboost_regex-bcb-mt-s-1_31\posix_api.obj bcb\libboost_regex-bcb-mt-s-1_31\regex.obj bcb\libboost_regex-bcb-mt-s-1_31\regex_debug.obj bcb\libboost_regex-bcb-mt-s-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-s-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-s-1_31\static_mutex.obj bcb\libboost_regex-bcb-mt-s-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-mt-s-1_31\winstances.obj
 	if exist bcb\libboost_regex-bcb-mt-s-1_31.lib del bcb\libboost_regex-bcb-mt-s-1_31.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-s-1_31.lib"  +"bcb\libboost_regex-bcb-mt-s-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\cregex.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\instances.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\regex.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\regex_synch.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-s-1_31.lib"  +"bcb\libboost_regex-bcb-mt-s-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\cregex.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\instances.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\regex.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\winstances.obj"
 |
 
 ########################################################
@@ -247,11 +267,6 @@ bcb\boost_regex-bcb-mt-1_31\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_31\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_31\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_31\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\boost_regex-bcb-mt-1_31\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_31\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -287,9 +302,19 @@ bcb\boost_regex-bcb-mt-1_31\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_31\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_31\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_31\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_31\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_31\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\boost_regex-bcb-mt-1_31\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_31\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\boost_regex-bcb-mt-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
 bcb\boost_regex-bcb-mt-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -297,6 +322,11 @@ bcb\boost_regex-bcb-mt-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\boost_regex-bcb-mt-1_31\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_31\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\boost_regex-bcb-mt-1_31\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_31\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -317,9 +347,9 @@ boost_regex-bcb-mt-1_31_clean :
 	del bcb\boost_regex-bcb-mt-1_31\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-mt-1_31.lib : bcb\boost_regex-bcb-mt-1_31\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\c_regex_traits_common.obj bcb\boost_regex-bcb-mt-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\cregex.obj bcb\boost_regex-bcb-mt-1_31\fileiter.obj bcb\boost_regex-bcb-mt-1_31\instances.obj bcb\boost_regex-bcb-mt-1_31\posix_api.obj bcb\boost_regex-bcb-mt-1_31\regex.obj bcb\boost_regex-bcb-mt-1_31\regex_debug.obj bcb\boost_regex-bcb-mt-1_31\regex_synch.obj bcb\boost_regex-bcb-mt-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_31\winstances.obj
+bcb\boost_regex-bcb-mt-1_31.lib : bcb\boost_regex-bcb-mt-1_31\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\cregex.obj bcb\boost_regex-bcb-mt-1_31\fileiter.obj bcb\boost_regex-bcb-mt-1_31\instances.obj bcb\boost_regex-bcb-mt-1_31\posix_api.obj bcb\boost_regex-bcb-mt-1_31\regex.obj bcb\boost_regex-bcb-mt-1_31\regex_debug.obj bcb\boost_regex-bcb-mt-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-1_31\static_mutex.obj bcb\boost_regex-bcb-mt-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_31\winstances.obj
 	bcc32 @&&|
--lw-dup -lw-dpl -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-mt-1_31.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-1_31\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\c_regex_traits_common.obj bcb\boost_regex-bcb-mt-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\cregex.obj bcb\boost_regex-bcb-mt-1_31\fileiter.obj bcb\boost_regex-bcb-mt-1_31\instances.obj bcb\boost_regex-bcb-mt-1_31\posix_api.obj bcb\boost_regex-bcb-mt-1_31\regex.obj bcb\boost_regex-bcb-mt-1_31\regex_debug.obj bcb\boost_regex-bcb-mt-1_31\regex_synch.obj bcb\boost_regex-bcb-mt-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_31\winstances.obj $(LIBS)
+-lw-dup -lw-dpl -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-mt-1_31.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-1_31\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\cregex.obj bcb\boost_regex-bcb-mt-1_31\fileiter.obj bcb\boost_regex-bcb-mt-1_31\instances.obj bcb\boost_regex-bcb-mt-1_31\posix_api.obj bcb\boost_regex-bcb-mt-1_31\regex.obj bcb\boost_regex-bcb-mt-1_31\regex_debug.obj bcb\boost_regex-bcb-mt-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-1_31\static_mutex.obj bcb\boost_regex-bcb-mt-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_31\winstances.obj $(LIBS)
 |
 	implib -w bcb\boost_regex-bcb-mt-1_31.lib bcb\boost_regex-bcb-mt-1_31.dll
 
@@ -333,11 +363,6 @@ bcb\boost_regex-bcb-1_31\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEA
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_31\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-1_31\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_31\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\boost_regex-bcb-1_31\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_31\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -373,9 +398,19 @@ bcb\boost_regex-bcb-1_31\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_31\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\boost_regex-bcb-1_31\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_31\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_31\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_31\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\boost_regex-bcb-1_31\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_31\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\boost_regex-bcb-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
 bcb\boost_regex-bcb-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -383,6 +418,11 @@ bcb\boost_regex-bcb-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\boost_regex-bcb-1_31\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_31\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\boost_regex-bcb-1_31\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_31\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -403,9 +443,9 @@ boost_regex-bcb-1_31_clean :
 	del bcb\boost_regex-bcb-1_31\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-1_31.lib : bcb\boost_regex-bcb-1_31\c_regex_traits.obj bcb\boost_regex-bcb-1_31\c_regex_traits_common.obj bcb\boost_regex-bcb-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-1_31\cregex.obj bcb\boost_regex-bcb-1_31\fileiter.obj bcb\boost_regex-bcb-1_31\instances.obj bcb\boost_regex-bcb-1_31\posix_api.obj bcb\boost_regex-bcb-1_31\regex.obj bcb\boost_regex-bcb-1_31\regex_debug.obj bcb\boost_regex-bcb-1_31\regex_synch.obj bcb\boost_regex-bcb-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-1_31\wide_posix_api.obj bcb\boost_regex-bcb-1_31\winstances.obj
+bcb\boost_regex-bcb-1_31.lib : bcb\boost_regex-bcb-1_31\c_regex_traits.obj bcb\boost_regex-bcb-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-1_31\cregex.obj bcb\boost_regex-bcb-1_31\fileiter.obj bcb\boost_regex-bcb-1_31\instances.obj bcb\boost_regex-bcb-1_31\posix_api.obj bcb\boost_regex-bcb-1_31\regex.obj bcb\boost_regex-bcb-1_31\regex_debug.obj bcb\boost_regex-bcb-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-1_31\static_mutex.obj bcb\boost_regex-bcb-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-1_31\wide_posix_api.obj bcb\boost_regex-bcb-1_31\winstances.obj
 	bcc32 @&&|
--lw-dup -lw-dpl -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-1_31.dll $(XLFLAGS)  bcb\boost_regex-bcb-1_31\c_regex_traits.obj bcb\boost_regex-bcb-1_31\c_regex_traits_common.obj bcb\boost_regex-bcb-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-1_31\cregex.obj bcb\boost_regex-bcb-1_31\fileiter.obj bcb\boost_regex-bcb-1_31\instances.obj bcb\boost_regex-bcb-1_31\posix_api.obj bcb\boost_regex-bcb-1_31\regex.obj bcb\boost_regex-bcb-1_31\regex_debug.obj bcb\boost_regex-bcb-1_31\regex_synch.obj bcb\boost_regex-bcb-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-1_31\wide_posix_api.obj bcb\boost_regex-bcb-1_31\winstances.obj $(LIBS)
+-lw-dup -lw-dpl -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-1_31.dll $(XLFLAGS)  bcb\boost_regex-bcb-1_31\c_regex_traits.obj bcb\boost_regex-bcb-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-1_31\cregex.obj bcb\boost_regex-bcb-1_31\fileiter.obj bcb\boost_regex-bcb-1_31\instances.obj bcb\boost_regex-bcb-1_31\posix_api.obj bcb\boost_regex-bcb-1_31\regex.obj bcb\boost_regex-bcb-1_31\regex_debug.obj bcb\boost_regex-bcb-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-1_31\static_mutex.obj bcb\boost_regex-bcb-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-1_31\wide_posix_api.obj bcb\boost_regex-bcb-1_31\winstances.obj $(LIBS)
 |
 	implib -w bcb\boost_regex-bcb-1_31.lib bcb\boost_regex-bcb-1_31.dll
 
@@ -419,11 +459,6 @@ bcb\libboost_regex-bcb-mt-1_31\c_regex_traits.obj: ../src/c_regex_traits.cpp $(A
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_31\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_31\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_31\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-mt-1_31\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_31\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -459,9 +494,19 @@ bcb\libboost_regex-bcb-mt-1_31\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEA
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_31\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_31\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_31\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_31\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_31\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-mt-1_31\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_31\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-mt-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
 bcb\libboost_regex-bcb-mt-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -469,6 +514,11 @@ bcb\libboost_regex-bcb-mt-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-mt-1_31\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_31\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-mt-1_31\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_31\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -488,10 +538,10 @@ libboost_regex-bcb-mt-1_31_clean :
 	del bcb\libboost_regex-bcb-mt-1_31\*.csm
 	del bcb\libboost_regex-bcb-mt-1_31\*.tds
 
-bcb\libboost_regex-bcb-mt-1_31.lib : bcb\libboost_regex-bcb-mt-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-mt-1_31\c_regex_traits_common.obj bcb\libboost_regex-bcb-mt-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-1_31\cregex.obj bcb\libboost_regex-bcb-mt-1_31\fileiter.obj bcb\libboost_regex-bcb-mt-1_31\instances.obj bcb\libboost_regex-bcb-mt-1_31\posix_api.obj bcb\libboost_regex-bcb-mt-1_31\regex.obj bcb\libboost_regex-bcb-mt-1_31\regex_debug.obj bcb\libboost_regex-bcb-mt-1_31\regex_synch.obj bcb\libboost_regex-bcb-mt-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-mt-1_31\winstances.obj
+bcb\libboost_regex-bcb-mt-1_31.lib : bcb\libboost_regex-bcb-mt-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-mt-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-1_31\cregex.obj bcb\libboost_regex-bcb-mt-1_31\fileiter.obj bcb\libboost_regex-bcb-mt-1_31\instances.obj bcb\libboost_regex-bcb-mt-1_31\posix_api.obj bcb\libboost_regex-bcb-mt-1_31\regex.obj bcb\libboost_regex-bcb-mt-1_31\regex_debug.obj bcb\libboost_regex-bcb-mt-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-1_31\static_mutex.obj bcb\libboost_regex-bcb-mt-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-mt-1_31\winstances.obj
 	if exist bcb\libboost_regex-bcb-mt-1_31.lib del bcb\libboost_regex-bcb-mt-1_31.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-1_31.lib"  +"bcb\libboost_regex-bcb-mt-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_31\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-mt-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_31\cregex.obj" +"bcb\libboost_regex-bcb-mt-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-mt-1_31\instances.obj" +"bcb\libboost_regex-bcb-mt-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_31\regex.obj" +"bcb\libboost_regex-bcb-mt-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-1_31\regex_synch.obj" +"bcb\libboost_regex-bcb-mt-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_31\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-1_31.lib"  +"bcb\libboost_regex-bcb-mt-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_31\cregex.obj" +"bcb\libboost_regex-bcb-mt-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-mt-1_31\instances.obj" +"bcb\libboost_regex-bcb-mt-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_31\regex.obj" +"bcb\libboost_regex-bcb-mt-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_31\winstances.obj"
 |
 
 ########################################################
@@ -504,11 +554,6 @@ bcb\libboost_regex-bcb-1_31\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_31\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-1_31\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_31\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-1_31\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_31\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -544,9 +589,19 @@ bcb\libboost_regex-bcb-1_31\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_31\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-1_31\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_31\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_31\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_31\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-1_31\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_31\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
 bcb\libboost_regex-bcb-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -554,6 +609,11 @@ bcb\libboost_regex-bcb-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-1_31\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_31\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-1_31\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_31\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -573,10 +633,10 @@ libboost_regex-bcb-1_31_clean :
 	del bcb\libboost_regex-bcb-1_31\*.csm
 	del bcb\libboost_regex-bcb-1_31\*.tds
 
-bcb\libboost_regex-bcb-1_31.lib : bcb\libboost_regex-bcb-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-1_31\c_regex_traits_common.obj bcb\libboost_regex-bcb-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-1_31\cregex.obj bcb\libboost_regex-bcb-1_31\fileiter.obj bcb\libboost_regex-bcb-1_31\instances.obj bcb\libboost_regex-bcb-1_31\posix_api.obj bcb\libboost_regex-bcb-1_31\regex.obj bcb\libboost_regex-bcb-1_31\regex_debug.obj bcb\libboost_regex-bcb-1_31\regex_synch.obj bcb\libboost_regex-bcb-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-1_31\winstances.obj
+bcb\libboost_regex-bcb-1_31.lib : bcb\libboost_regex-bcb-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-1_31\cregex.obj bcb\libboost_regex-bcb-1_31\fileiter.obj bcb\libboost_regex-bcb-1_31\instances.obj bcb\libboost_regex-bcb-1_31\posix_api.obj bcb\libboost_regex-bcb-1_31\regex.obj bcb\libboost_regex-bcb-1_31\regex_debug.obj bcb\libboost_regex-bcb-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-1_31\static_mutex.obj bcb\libboost_regex-bcb-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-1_31\winstances.obj
 	if exist bcb\libboost_regex-bcb-1_31.lib del bcb\libboost_regex-bcb-1_31.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-1_31.lib"  +"bcb\libboost_regex-bcb-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-1_31\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-1_31\cregex.obj" +"bcb\libboost_regex-bcb-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-1_31\instances.obj" +"bcb\libboost_regex-bcb-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-1_31\regex.obj" +"bcb\libboost_regex-bcb-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-1_31\regex_synch.obj" +"bcb\libboost_regex-bcb-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-1_31\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-1_31.lib"  +"bcb\libboost_regex-bcb-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-1_31\cregex.obj" +"bcb\libboost_regex-bcb-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-1_31\instances.obj" +"bcb\libboost_regex-bcb-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-1_31\regex.obj" +"bcb\libboost_regex-bcb-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-1_31\winstances.obj"
 |
 
 ########################################################
@@ -589,11 +649,6 @@ bcb\libboost_regex-bcb-sd-1_31\c_regex_traits.obj: ../src/c_regex_traits.cpp $(A
 -c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_31\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_31\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_31\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-sd-1_31\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_31\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -629,9 +684,19 @@ bcb\libboost_regex-bcb-sd-1_31\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEA
 -c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_31\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_31\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_31\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_31\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_31\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-sd-1_31\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_31\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-sd-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
 bcb\libboost_regex-bcb-sd-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -639,6 +704,11 @@ bcb\libboost_regex-bcb-sd-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp
 -c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-sd-1_31\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_31\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-sd-1_31\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_31\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -658,10 +728,10 @@ libboost_regex-bcb-sd-1_31_clean :
 	del bcb\libboost_regex-bcb-sd-1_31\*.csm
 	del bcb\libboost_regex-bcb-sd-1_31\*.tds
 
-bcb\libboost_regex-bcb-sd-1_31.lib : bcb\libboost_regex-bcb-sd-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-sd-1_31\c_regex_traits_common.obj bcb\libboost_regex-bcb-sd-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-sd-1_31\cregex.obj bcb\libboost_regex-bcb-sd-1_31\fileiter.obj bcb\libboost_regex-bcb-sd-1_31\instances.obj bcb\libboost_regex-bcb-sd-1_31\posix_api.obj bcb\libboost_regex-bcb-sd-1_31\regex.obj bcb\libboost_regex-bcb-sd-1_31\regex_debug.obj bcb\libboost_regex-bcb-sd-1_31\regex_synch.obj bcb\libboost_regex-bcb-sd-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-sd-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-sd-1_31\winstances.obj
+bcb\libboost_regex-bcb-sd-1_31.lib : bcb\libboost_regex-bcb-sd-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-sd-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-sd-1_31\cregex.obj bcb\libboost_regex-bcb-sd-1_31\fileiter.obj bcb\libboost_regex-bcb-sd-1_31\instances.obj bcb\libboost_regex-bcb-sd-1_31\posix_api.obj bcb\libboost_regex-bcb-sd-1_31\regex.obj bcb\libboost_regex-bcb-sd-1_31\regex_debug.obj bcb\libboost_regex-bcb-sd-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-sd-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-sd-1_31\static_mutex.obj bcb\libboost_regex-bcb-sd-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-sd-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-sd-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-sd-1_31\winstances.obj
 	if exist bcb\libboost_regex-bcb-sd-1_31.lib del bcb\libboost_regex-bcb-sd-1_31.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-sd-1_31.lib"  +"bcb\libboost_regex-bcb-sd-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_31\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-sd-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_31\cregex.obj" +"bcb\libboost_regex-bcb-sd-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-sd-1_31\instances.obj" +"bcb\libboost_regex-bcb-sd-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_31\regex.obj" +"bcb\libboost_regex-bcb-sd-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-sd-1_31\regex_synch.obj" +"bcb\libboost_regex-bcb-sd-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_31\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-sd-1_31.lib"  +"bcb\libboost_regex-bcb-sd-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_31\cregex.obj" +"bcb\libboost_regex-bcb-sd-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-sd-1_31\instances.obj" +"bcb\libboost_regex-bcb-sd-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_31\regex.obj" +"bcb\libboost_regex-bcb-sd-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-sd-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-sd-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-sd-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-sd-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_31\winstances.obj"
 |
 
 ########################################################
@@ -674,11 +744,6 @@ bcb\libboost_regex-bcb-mt-sd-1_31\c_regex_traits.obj: ../src/c_regex_traits.cpp
 -c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_31\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_31\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_31\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-mt-sd-1_31\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_31\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -714,9 +779,19 @@ bcb\libboost_regex-bcb-mt-sd-1_31\regex_debug.obj: ../src/regex_debug.cpp $(ALL_
 -c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_31\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_31\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_31\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_31\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_31\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-mt-sd-1_31\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_31\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-mt-sd-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
 bcb\libboost_regex-bcb-mt-sd-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -724,6 +799,11 @@ bcb\libboost_regex-bcb-mt-sd-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.
 -c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-mt-sd-1_31\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_31\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-mt-sd-1_31\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_31\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -743,10 +823,10 @@ libboost_regex-bcb-mt-sd-1_31_clean :
 	del bcb\libboost_regex-bcb-mt-sd-1_31\*.csm
 	del bcb\libboost_regex-bcb-mt-sd-1_31\*.tds
 
-bcb\libboost_regex-bcb-mt-sd-1_31.lib : bcb\libboost_regex-bcb-mt-sd-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_31\c_regex_traits_common.obj bcb\libboost_regex-bcb-mt-sd-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_31\cregex.obj bcb\libboost_regex-bcb-mt-sd-1_31\fileiter.obj bcb\libboost_regex-bcb-mt-sd-1_31\instances.obj bcb\libboost_regex-bcb-mt-sd-1_31\posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_31\regex.obj bcb\libboost_regex-bcb-mt-sd-1_31\regex_debug.obj bcb\libboost_regex-bcb-mt-sd-1_31\regex_synch.obj bcb\libboost_regex-bcb-mt-sd-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_31\winstances.obj
+bcb\libboost_regex-bcb-mt-sd-1_31.lib : bcb\libboost_regex-bcb-mt-sd-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_31\cregex.obj bcb\libboost_regex-bcb-mt-sd-1_31\fileiter.obj bcb\libboost_regex-bcb-mt-sd-1_31\instances.obj bcb\libboost_regex-bcb-mt-sd-1_31\posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_31\regex.obj bcb\libboost_regex-bcb-mt-sd-1_31\regex_debug.obj bcb\libboost_regex-bcb-mt-sd-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-sd-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-sd-1_31\static_mutex.obj bcb\libboost_regex-bcb-mt-sd-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_31\winstances.obj
 	if exist bcb\libboost_regex-bcb-mt-sd-1_31.lib del bcb\libboost_regex-bcb-mt-sd-1_31.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-sd-1_31.lib"  +"bcb\libboost_regex-bcb-mt-sd-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\cregex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\instances.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\regex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\regex_synch.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-sd-1_31.lib"  +"bcb\libboost_regex-bcb-mt-sd-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\cregex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\instances.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\regex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\winstances.obj"
 |
 
 ########################################################
@@ -759,11 +839,6 @@ bcb\boost_regex-bcb-mt-d-1_31\c_regex_traits.obj: ../src/c_regex_traits.cpp $(AL
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_31\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_31\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_31\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\boost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -799,9 +874,19 @@ bcb\boost_regex-bcb-mt-d-1_31\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEAD
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_31\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_31\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_31\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_31\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_31\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\boost_regex-bcb-mt-d-1_31\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_31\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\boost_regex-bcb-mt-d-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
 bcb\boost_regex-bcb-mt-d-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -809,6 +894,11 @@ bcb\boost_regex-bcb-mt-d-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\boost_regex-bcb-mt-d-1_31\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_31\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\boost_regex-bcb-mt-d-1_31\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_31\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -829,9 +919,9 @@ boost_regex-bcb-mt-d-1_31_clean :
 	del bcb\boost_regex-bcb-mt-d-1_31\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-mt-d-1_31.lib : bcb\boost_regex-bcb-mt-d-1_31\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\c_regex_traits_common.obj bcb\boost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\cregex.obj bcb\boost_regex-bcb-mt-d-1_31\fileiter.obj bcb\boost_regex-bcb-mt-d-1_31\instances.obj bcb\boost_regex-bcb-mt-d-1_31\posix_api.obj bcb\boost_regex-bcb-mt-d-1_31\regex.obj bcb\boost_regex-bcb-mt-d-1_31\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_31\regex_synch.obj bcb\boost_regex-bcb-mt-d-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_31\winstances.obj
+bcb\boost_regex-bcb-mt-d-1_31.lib : bcb\boost_regex-bcb-mt-d-1_31\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\cregex.obj bcb\boost_regex-bcb-mt-d-1_31\fileiter.obj bcb\boost_regex-bcb-mt-d-1_31\instances.obj bcb\boost_regex-bcb-mt-d-1_31\posix_api.obj bcb\boost_regex-bcb-mt-d-1_31\regex.obj bcb\boost_regex-bcb-mt-d-1_31\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-d-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-d-1_31\static_mutex.obj bcb\boost_regex-bcb-mt-d-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_31\winstances.obj
 	bcc32 @&&|
--lw-dup -lw-dpl -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-mt-d-1_31.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-d-1_31\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\c_regex_traits_common.obj bcb\boost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\cregex.obj bcb\boost_regex-bcb-mt-d-1_31\fileiter.obj bcb\boost_regex-bcb-mt-d-1_31\instances.obj bcb\boost_regex-bcb-mt-d-1_31\posix_api.obj bcb\boost_regex-bcb-mt-d-1_31\regex.obj bcb\boost_regex-bcb-mt-d-1_31\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_31\regex_synch.obj bcb\boost_regex-bcb-mt-d-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_31\winstances.obj $(LIBS)
+-lw-dup -lw-dpl -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-mt-d-1_31.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-d-1_31\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\cregex.obj bcb\boost_regex-bcb-mt-d-1_31\fileiter.obj bcb\boost_regex-bcb-mt-d-1_31\instances.obj bcb\boost_regex-bcb-mt-d-1_31\posix_api.obj bcb\boost_regex-bcb-mt-d-1_31\regex.obj bcb\boost_regex-bcb-mt-d-1_31\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-d-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-d-1_31\static_mutex.obj bcb\boost_regex-bcb-mt-d-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_31\winstances.obj $(LIBS)
 |
 	implib -w bcb\boost_regex-bcb-mt-d-1_31.lib bcb\boost_regex-bcb-mt-d-1_31.dll
 
@@ -845,11 +935,6 @@ bcb\boost_regex-bcb-d-1_31\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_H
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_31\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-d-1_31\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_31\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\boost_regex-bcb-d-1_31\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_31\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -885,9 +970,19 @@ bcb\boost_regex-bcb-d-1_31\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_31\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\boost_regex-bcb-d-1_31\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_31\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_31\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_31\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\boost_regex-bcb-d-1_31\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_31\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\boost_regex-bcb-d-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
 bcb\boost_regex-bcb-d-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -895,6 +990,11 @@ bcb\boost_regex-bcb-d-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(A
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\boost_regex-bcb-d-1_31\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_31\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\boost_regex-bcb-d-1_31\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_31\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -915,9 +1015,9 @@ boost_regex-bcb-d-1_31_clean :
 	del bcb\boost_regex-bcb-d-1_31\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-d-1_31.lib : bcb\boost_regex-bcb-d-1_31\c_regex_traits.obj bcb\boost_regex-bcb-d-1_31\c_regex_traits_common.obj bcb\boost_regex-bcb-d-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_31\cregex.obj bcb\boost_regex-bcb-d-1_31\fileiter.obj bcb\boost_regex-bcb-d-1_31\instances.obj bcb\boost_regex-bcb-d-1_31\posix_api.obj bcb\boost_regex-bcb-d-1_31\regex.obj bcb\boost_regex-bcb-d-1_31\regex_debug.obj bcb\boost_regex-bcb-d-1_31\regex_synch.obj bcb\boost_regex-bcb-d-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_31\wide_posix_api.obj bcb\boost_regex-bcb-d-1_31\winstances.obj
+bcb\boost_regex-bcb-d-1_31.lib : bcb\boost_regex-bcb-d-1_31\c_regex_traits.obj bcb\boost_regex-bcb-d-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_31\cregex.obj bcb\boost_regex-bcb-d-1_31\fileiter.obj bcb\boost_regex-bcb-d-1_31\instances.obj bcb\boost_regex-bcb-d-1_31\posix_api.obj bcb\boost_regex-bcb-d-1_31\regex.obj bcb\boost_regex-bcb-d-1_31\regex_debug.obj bcb\boost_regex-bcb-d-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-d-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-d-1_31\static_mutex.obj bcb\boost_regex-bcb-d-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-d-1_31\wide_posix_api.obj bcb\boost_regex-bcb-d-1_31\winstances.obj
 	bcc32 @&&|
--lw-dup -lw-dpl -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-d-1_31.dll $(XLFLAGS)  bcb\boost_regex-bcb-d-1_31\c_regex_traits.obj bcb\boost_regex-bcb-d-1_31\c_regex_traits_common.obj bcb\boost_regex-bcb-d-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_31\cregex.obj bcb\boost_regex-bcb-d-1_31\fileiter.obj bcb\boost_regex-bcb-d-1_31\instances.obj bcb\boost_regex-bcb-d-1_31\posix_api.obj bcb\boost_regex-bcb-d-1_31\regex.obj bcb\boost_regex-bcb-d-1_31\regex_debug.obj bcb\boost_regex-bcb-d-1_31\regex_synch.obj bcb\boost_regex-bcb-d-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_31\wide_posix_api.obj bcb\boost_regex-bcb-d-1_31\winstances.obj $(LIBS)
+-lw-dup -lw-dpl -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-d-1_31.dll $(XLFLAGS)  bcb\boost_regex-bcb-d-1_31\c_regex_traits.obj bcb\boost_regex-bcb-d-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_31\cregex.obj bcb\boost_regex-bcb-d-1_31\fileiter.obj bcb\boost_regex-bcb-d-1_31\instances.obj bcb\boost_regex-bcb-d-1_31\posix_api.obj bcb\boost_regex-bcb-d-1_31\regex.obj bcb\boost_regex-bcb-d-1_31\regex_debug.obj bcb\boost_regex-bcb-d-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-d-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-d-1_31\static_mutex.obj bcb\boost_regex-bcb-d-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-d-1_31\wide_posix_api.obj bcb\boost_regex-bcb-d-1_31\winstances.obj $(LIBS)
 |
 	implib -w bcb\boost_regex-bcb-d-1_31.lib bcb\boost_regex-bcb-d-1_31.dll
 
@@ -931,11 +1031,6 @@ bcb\libboost_regex-bcb-mt-d-1_31\c_regex_traits.obj: ../src/c_regex_traits.cpp $
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_31\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_31\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_31\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -971,9 +1066,19 @@ bcb\libboost_regex-bcb-mt-d-1_31\regex_debug.obj: ../src/regex_debug.cpp $(ALL_H
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_31\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_31\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_31\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_31\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_31\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-mt-d-1_31\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_31\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-mt-d-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
 bcb\libboost_regex-bcb-mt-d-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -981,6 +1086,11 @@ bcb\libboost_regex-bcb-mt-d-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.c
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-mt-d-1_31\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_31\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-mt-d-1_31\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_31\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -1000,10 +1110,10 @@ libboost_regex-bcb-mt-d-1_31_clean :
 	del bcb\libboost_regex-bcb-mt-d-1_31\*.csm
 	del bcb\libboost_regex-bcb-mt-d-1_31\*.tds
 
-bcb\libboost_regex-bcb-mt-d-1_31.lib : bcb\libboost_regex-bcb-mt-d-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_31\c_regex_traits_common.obj bcb\libboost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_31\cregex.obj bcb\libboost_regex-bcb-mt-d-1_31\fileiter.obj bcb\libboost_regex-bcb-mt-d-1_31\instances.obj bcb\libboost_regex-bcb-mt-d-1_31\posix_api.obj bcb\libboost_regex-bcb-mt-d-1_31\regex.obj bcb\libboost_regex-bcb-mt-d-1_31\regex_debug.obj bcb\libboost_regex-bcb-mt-d-1_31\regex_synch.obj bcb\libboost_regex-bcb-mt-d-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-mt-d-1_31\winstances.obj
+bcb\libboost_regex-bcb-mt-d-1_31.lib : bcb\libboost_regex-bcb-mt-d-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_31\cregex.obj bcb\libboost_regex-bcb-mt-d-1_31\fileiter.obj bcb\libboost_regex-bcb-mt-d-1_31\instances.obj bcb\libboost_regex-bcb-mt-d-1_31\posix_api.obj bcb\libboost_regex-bcb-mt-d-1_31\regex.obj bcb\libboost_regex-bcb-mt-d-1_31\regex_debug.obj bcb\libboost_regex-bcb-mt-d-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-d-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-d-1_31\static_mutex.obj bcb\libboost_regex-bcb-mt-d-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-mt-d-1_31\winstances.obj
 	if exist bcb\libboost_regex-bcb-mt-d-1_31.lib del bcb\libboost_regex-bcb-mt-d-1_31.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-d-1_31.lib"  +"bcb\libboost_regex-bcb-mt-d-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\cregex.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\instances.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\regex.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\regex_synch.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-d-1_31.lib"  +"bcb\libboost_regex-bcb-mt-d-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\cregex.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\instances.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\regex.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\winstances.obj"
 |
 
 ########################################################
@@ -1016,11 +1126,6 @@ bcb\libboost_regex-bcb-d-1_31\c_regex_traits.obj: ../src/c_regex_traits.cpp $(AL
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_31\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_31\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_31\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-d-1_31\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_31\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -1056,9 +1161,19 @@ bcb\libboost_regex-bcb-d-1_31\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEAD
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_31\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_31\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_31\regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_31\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_31\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-d-1_31\regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_31\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-d-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
 bcb\libboost_regex-bcb-d-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -1066,6 +1181,11 @@ bcb\libboost_regex-bcb-d-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-d-1_31\wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_31\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-d-1_31\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_31\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -1085,9 +1205,9 @@ libboost_regex-bcb-d-1_31_clean :
 	del bcb\libboost_regex-bcb-d-1_31\*.csm
 	del bcb\libboost_regex-bcb-d-1_31\*.tds
 
-bcb\libboost_regex-bcb-d-1_31.lib : bcb\libboost_regex-bcb-d-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-d-1_31\c_regex_traits_common.obj bcb\libboost_regex-bcb-d-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-d-1_31\cregex.obj bcb\libboost_regex-bcb-d-1_31\fileiter.obj bcb\libboost_regex-bcb-d-1_31\instances.obj bcb\libboost_regex-bcb-d-1_31\posix_api.obj bcb\libboost_regex-bcb-d-1_31\regex.obj bcb\libboost_regex-bcb-d-1_31\regex_debug.obj bcb\libboost_regex-bcb-d-1_31\regex_synch.obj bcb\libboost_regex-bcb-d-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-d-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-d-1_31\winstances.obj
+bcb\libboost_regex-bcb-d-1_31.lib : bcb\libboost_regex-bcb-d-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-d-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-d-1_31\cregex.obj bcb\libboost_regex-bcb-d-1_31\fileiter.obj bcb\libboost_regex-bcb-d-1_31\instances.obj bcb\libboost_regex-bcb-d-1_31\posix_api.obj bcb\libboost_regex-bcb-d-1_31\regex.obj bcb\libboost_regex-bcb-d-1_31\regex_debug.obj bcb\libboost_regex-bcb-d-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-d-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-d-1_31\static_mutex.obj bcb\libboost_regex-bcb-d-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-d-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-d-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-d-1_31\winstances.obj
 	if exist bcb\libboost_regex-bcb-d-1_31.lib del bcb\libboost_regex-bcb-d-1_31.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-d-1_31.lib"  +"bcb\libboost_regex-bcb-d-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_31\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-d-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_31\cregex.obj" +"bcb\libboost_regex-bcb-d-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-d-1_31\instances.obj" +"bcb\libboost_regex-bcb-d-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-d-1_31\regex.obj" +"bcb\libboost_regex-bcb-d-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-d-1_31\regex_synch.obj" +"bcb\libboost_regex-bcb-d-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-d-1_31\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-d-1_31.lib"  +"bcb\libboost_regex-bcb-d-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_31\cregex.obj" +"bcb\libboost_regex-bcb-d-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-d-1_31\instances.obj" +"bcb\libboost_regex-bcb-d-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-d-1_31\regex.obj" +"bcb\libboost_regex-bcb-d-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-d-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-d-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-d-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-d-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-d-1_31\winstances.obj"
 |
 
diff --git a/build/gcc-shared.mak b/build/gcc-shared.mak
index 173c426f..61769f2e 100644
--- a/build/gcc-shared.mak
+++ b/build/gcc-shared.mak
@@ -29,7 +29,7 @@ C1=-c -O2 -I../../../ -fPIC
 C2=-c -g -I../../../ -fPIC
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : gcc  gcc gcc/boost_regex-gcc-1_31_shared ./gcc/libboost_regex-gcc-1_31.so gcc gcc/boost_regex-gcc-d-1_31_shared ./gcc/libboost_regex-gcc-d-1_31.so
 
@@ -50,9 +50,6 @@ install : all
 gcc/boost_regex-gcc-1_31_shared/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31_shared/c_regex_traits.o $(C1) $(CXXFLAGS) ../src/c_regex_traits.cpp
 
-gcc/boost_regex-gcc-1_31_shared/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31_shared/c_regex_traits_common.o $(C1) $(CXXFLAGS) ../src/c_regex_traits_common.cpp
-
 gcc/boost_regex-gcc-1_31_shared/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31_shared/cpp_regex_traits.o $(C1) $(CXXFLAGS) ../src/cpp_regex_traits.cpp
 
@@ -74,12 +71,21 @@ gcc/boost_regex-gcc-1_31_shared/regex.o: ../src/regex.cpp $(ALL_HEADER)
 gcc/boost_regex-gcc-1_31_shared/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31_shared/regex_debug.o $(C1) $(CXXFLAGS) ../src/regex_debug.cpp
 
-gcc/boost_regex-gcc-1_31_shared/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31_shared/regex_synch.o $(C1) $(CXXFLAGS) ../src/regex_synch.cpp
+gcc/boost_regex-gcc-1_31_shared/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31_shared/regex_raw_buffer.o $(C1) $(CXXFLAGS) ../src/regex_raw_buffer.cpp
+
+gcc/boost_regex-gcc-1_31_shared/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31_shared/regex_traits_defaults.o $(C1) $(CXXFLAGS) ../src/regex_traits_defaults.cpp
+
+gcc/boost_regex-gcc-1_31_shared/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31_shared/static_mutex.o $(C1) $(CXXFLAGS) ../src/static_mutex.cpp
 
 gcc/boost_regex-gcc-1_31_shared/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31_shared/w32_regex_traits.o $(C1) $(CXXFLAGS) ../src/w32_regex_traits.cpp
 
+gcc/boost_regex-gcc-1_31_shared/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31_shared/wc_regex_traits.o $(C1) $(CXXFLAGS) ../src/wc_regex_traits.cpp
+
 gcc/boost_regex-gcc-1_31_shared/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31_shared/wide_posix_api.o $(C1) $(CXXFLAGS) ../src/wide_posix_api.cpp
 
@@ -92,8 +98,8 @@ gcc/boost_regex-gcc-1_31_shared :
 boost_regex-gcc-1_31_clean :
 	rm -f gcc/boost_regex-gcc-1_31_shared/*.o
 
-./gcc/libboost_regex-gcc-1_31.so : gcc/boost_regex-gcc-1_31_shared/c_regex_traits.o gcc/boost_regex-gcc-1_31_shared/c_regex_traits_common.o gcc/boost_regex-gcc-1_31_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_31_shared/cregex.o gcc/boost_regex-gcc-1_31_shared/fileiter.o gcc/boost_regex-gcc-1_31_shared/instances.o gcc/boost_regex-gcc-1_31_shared/posix_api.o gcc/boost_regex-gcc-1_31_shared/regex.o gcc/boost_regex-gcc-1_31_shared/regex_debug.o gcc/boost_regex-gcc-1_31_shared/regex_synch.o gcc/boost_regex-gcc-1_31_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_31_shared/wide_posix_api.o gcc/boost_regex-gcc-1_31_shared/winstances.o
-	$(LINKER) -o gcc/libboost_regex-gcc-1_31.so $(LDFLAGS)  gcc/boost_regex-gcc-1_31_shared/c_regex_traits.o gcc/boost_regex-gcc-1_31_shared/c_regex_traits_common.o gcc/boost_regex-gcc-1_31_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_31_shared/cregex.o gcc/boost_regex-gcc-1_31_shared/fileiter.o gcc/boost_regex-gcc-1_31_shared/instances.o gcc/boost_regex-gcc-1_31_shared/posix_api.o gcc/boost_regex-gcc-1_31_shared/regex.o gcc/boost_regex-gcc-1_31_shared/regex_debug.o gcc/boost_regex-gcc-1_31_shared/regex_synch.o gcc/boost_regex-gcc-1_31_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_31_shared/wide_posix_api.o gcc/boost_regex-gcc-1_31_shared/winstances.o $(LIBS)
+./gcc/libboost_regex-gcc-1_31.so : gcc/boost_regex-gcc-1_31_shared/c_regex_traits.o gcc/boost_regex-gcc-1_31_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_31_shared/cregex.o gcc/boost_regex-gcc-1_31_shared/fileiter.o gcc/boost_regex-gcc-1_31_shared/instances.o gcc/boost_regex-gcc-1_31_shared/posix_api.o gcc/boost_regex-gcc-1_31_shared/regex.o gcc/boost_regex-gcc-1_31_shared/regex_debug.o gcc/boost_regex-gcc-1_31_shared/regex_raw_buffer.o gcc/boost_regex-gcc-1_31_shared/regex_traits_defaults.o gcc/boost_regex-gcc-1_31_shared/static_mutex.o gcc/boost_regex-gcc-1_31_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_31_shared/wc_regex_traits.o gcc/boost_regex-gcc-1_31_shared/wide_posix_api.o gcc/boost_regex-gcc-1_31_shared/winstances.o
+	$(LINKER) -o gcc/libboost_regex-gcc-1_31.so $(LDFLAGS)  gcc/boost_regex-gcc-1_31_shared/c_regex_traits.o gcc/boost_regex-gcc-1_31_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_31_shared/cregex.o gcc/boost_regex-gcc-1_31_shared/fileiter.o gcc/boost_regex-gcc-1_31_shared/instances.o gcc/boost_regex-gcc-1_31_shared/posix_api.o gcc/boost_regex-gcc-1_31_shared/regex.o gcc/boost_regex-gcc-1_31_shared/regex_debug.o gcc/boost_regex-gcc-1_31_shared/regex_raw_buffer.o gcc/boost_regex-gcc-1_31_shared/regex_traits_defaults.o gcc/boost_regex-gcc-1_31_shared/static_mutex.o gcc/boost_regex-gcc-1_31_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_31_shared/wc_regex_traits.o gcc/boost_regex-gcc-1_31_shared/wide_posix_api.o gcc/boost_regex-gcc-1_31_shared/winstances.o $(LIBS)
 
 ########################################################
 #
@@ -103,9 +109,6 @@ boost_regex-gcc-1_31_clean :
 gcc/boost_regex-gcc-d-1_31_shared/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31_shared/c_regex_traits.o $(C2) $(CXXFLAGS) ../src/c_regex_traits.cpp
 
-gcc/boost_regex-gcc-d-1_31_shared/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31_shared/c_regex_traits_common.o $(C2) $(CXXFLAGS) ../src/c_regex_traits_common.cpp
-
 gcc/boost_regex-gcc-d-1_31_shared/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31_shared/cpp_regex_traits.o $(C2) $(CXXFLAGS) ../src/cpp_regex_traits.cpp
 
@@ -127,12 +130,21 @@ gcc/boost_regex-gcc-d-1_31_shared/regex.o: ../src/regex.cpp $(ALL_HEADER)
 gcc/boost_regex-gcc-d-1_31_shared/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31_shared/regex_debug.o $(C2) $(CXXFLAGS) ../src/regex_debug.cpp
 
-gcc/boost_regex-gcc-d-1_31_shared/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31_shared/regex_synch.o $(C2) $(CXXFLAGS) ../src/regex_synch.cpp
+gcc/boost_regex-gcc-d-1_31_shared/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31_shared/regex_raw_buffer.o $(C2) $(CXXFLAGS) ../src/regex_raw_buffer.cpp
+
+gcc/boost_regex-gcc-d-1_31_shared/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31_shared/regex_traits_defaults.o $(C2) $(CXXFLAGS) ../src/regex_traits_defaults.cpp
+
+gcc/boost_regex-gcc-d-1_31_shared/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31_shared/static_mutex.o $(C2) $(CXXFLAGS) ../src/static_mutex.cpp
 
 gcc/boost_regex-gcc-d-1_31_shared/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31_shared/w32_regex_traits.o $(C2) $(CXXFLAGS) ../src/w32_regex_traits.cpp
 
+gcc/boost_regex-gcc-d-1_31_shared/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31_shared/wc_regex_traits.o $(C2) $(CXXFLAGS) ../src/wc_regex_traits.cpp
+
 gcc/boost_regex-gcc-d-1_31_shared/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31_shared/wide_posix_api.o $(C2) $(CXXFLAGS) ../src/wide_posix_api.cpp
 
@@ -145,6 +157,6 @@ gcc/boost_regex-gcc-d-1_31_shared :
 boost_regex-gcc-d-1_31_clean :
 	rm -f gcc/boost_regex-gcc-d-1_31_shared/*.o
 
-./gcc/libboost_regex-gcc-d-1_31.so : gcc/boost_regex-gcc-d-1_31_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/c_regex_traits_common.o gcc/boost_regex-gcc-d-1_31_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/cregex.o gcc/boost_regex-gcc-d-1_31_shared/fileiter.o gcc/boost_regex-gcc-d-1_31_shared/instances.o gcc/boost_regex-gcc-d-1_31_shared/posix_api.o gcc/boost_regex-gcc-d-1_31_shared/regex.o gcc/boost_regex-gcc-d-1_31_shared/regex_debug.o gcc/boost_regex-gcc-d-1_31_shared/regex_synch.o gcc/boost_regex-gcc-d-1_31_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_31_shared/winstances.o
-	$(LINKER) -o gcc/libboost_regex-gcc-d-1_31.so $(LDFLAGS)  gcc/boost_regex-gcc-d-1_31_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/c_regex_traits_common.o gcc/boost_regex-gcc-d-1_31_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/cregex.o gcc/boost_regex-gcc-d-1_31_shared/fileiter.o gcc/boost_regex-gcc-d-1_31_shared/instances.o gcc/boost_regex-gcc-d-1_31_shared/posix_api.o gcc/boost_regex-gcc-d-1_31_shared/regex.o gcc/boost_regex-gcc-d-1_31_shared/regex_debug.o gcc/boost_regex-gcc-d-1_31_shared/regex_synch.o gcc/boost_regex-gcc-d-1_31_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_31_shared/winstances.o $(LIBS)
+./gcc/libboost_regex-gcc-d-1_31.so : gcc/boost_regex-gcc-d-1_31_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/cregex.o gcc/boost_regex-gcc-d-1_31_shared/fileiter.o gcc/boost_regex-gcc-d-1_31_shared/instances.o gcc/boost_regex-gcc-d-1_31_shared/posix_api.o gcc/boost_regex-gcc-d-1_31_shared/regex.o gcc/boost_regex-gcc-d-1_31_shared/regex_debug.o gcc/boost_regex-gcc-d-1_31_shared/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_31_shared/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_31_shared/static_mutex.o gcc/boost_regex-gcc-d-1_31_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/wc_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_31_shared/winstances.o
+	$(LINKER) -o gcc/libboost_regex-gcc-d-1_31.so $(LDFLAGS)  gcc/boost_regex-gcc-d-1_31_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/cregex.o gcc/boost_regex-gcc-d-1_31_shared/fileiter.o gcc/boost_regex-gcc-d-1_31_shared/instances.o gcc/boost_regex-gcc-d-1_31_shared/posix_api.o gcc/boost_regex-gcc-d-1_31_shared/regex.o gcc/boost_regex-gcc-d-1_31_shared/regex_debug.o gcc/boost_regex-gcc-d-1_31_shared/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_31_shared/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_31_shared/static_mutex.o gcc/boost_regex-gcc-d-1_31_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/wc_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_31_shared/winstances.o $(LIBS)
 
diff --git a/build/gcc.mak b/build/gcc.mak
index a6331458..5df872b0 100644
--- a/build/gcc.mak
+++ b/build/gcc.mak
@@ -30,7 +30,7 @@ C2=-c -g -I../../../
 
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : gcc  gcc gcc/boost_regex-gcc-1_31 ./gcc/libboost_regex-gcc-1_31.a gcc gcc/boost_regex-gcc-d-1_31 ./gcc/libboost_regex-gcc-d-1_31.a
 
@@ -51,9 +51,6 @@ install : all
 gcc/boost_regex-gcc-1_31/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31/c_regex_traits.o $(C1) $(CXXFLAGS) ../src/c_regex_traits.cpp
 
-gcc/boost_regex-gcc-1_31/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31/c_regex_traits_common.o $(C1) $(CXXFLAGS) ../src/c_regex_traits_common.cpp
-
 gcc/boost_regex-gcc-1_31/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31/cpp_regex_traits.o $(C1) $(CXXFLAGS) ../src/cpp_regex_traits.cpp
 
@@ -75,12 +72,21 @@ gcc/boost_regex-gcc-1_31/regex.o: ../src/regex.cpp $(ALL_HEADER)
 gcc/boost_regex-gcc-1_31/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31/regex_debug.o $(C1) $(CXXFLAGS) ../src/regex_debug.cpp
 
-gcc/boost_regex-gcc-1_31/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31/regex_synch.o $(C1) $(CXXFLAGS) ../src/regex_synch.cpp
+gcc/boost_regex-gcc-1_31/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31/regex_raw_buffer.o $(C1) $(CXXFLAGS) ../src/regex_raw_buffer.cpp
+
+gcc/boost_regex-gcc-1_31/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31/regex_traits_defaults.o $(C1) $(CXXFLAGS) ../src/regex_traits_defaults.cpp
+
+gcc/boost_regex-gcc-1_31/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31/static_mutex.o $(C1) $(CXXFLAGS) ../src/static_mutex.cpp
 
 gcc/boost_regex-gcc-1_31/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31/w32_regex_traits.o $(C1) $(CXXFLAGS) ../src/w32_regex_traits.cpp
 
+gcc/boost_regex-gcc-1_31/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31/wc_regex_traits.o $(C1) $(CXXFLAGS) ../src/wc_regex_traits.cpp
+
 gcc/boost_regex-gcc-1_31/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31/wide_posix_api.o $(C1) $(CXXFLAGS) ../src/wide_posix_api.cpp
 
@@ -93,8 +99,8 @@ gcc/boost_regex-gcc-1_31 :
 boost_regex-gcc-1_31_clean :
 	rm -f gcc/boost_regex-gcc-1_31/*.o
 
-./gcc/libboost_regex-gcc-1_31.a : gcc/boost_regex-gcc-1_31/c_regex_traits.o gcc/boost_regex-gcc-1_31/c_regex_traits_common.o gcc/boost_regex-gcc-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-1_31/cregex.o gcc/boost_regex-gcc-1_31/fileiter.o gcc/boost_regex-gcc-1_31/instances.o gcc/boost_regex-gcc-1_31/posix_api.o gcc/boost_regex-gcc-1_31/regex.o gcc/boost_regex-gcc-1_31/regex_debug.o gcc/boost_regex-gcc-1_31/regex_synch.o gcc/boost_regex-gcc-1_31/w32_regex_traits.o gcc/boost_regex-gcc-1_31/wide_posix_api.o gcc/boost_regex-gcc-1_31/winstances.o
-	ar -r gcc/libboost_regex-gcc-1_31.a  gcc/boost_regex-gcc-1_31/c_regex_traits.o gcc/boost_regex-gcc-1_31/c_regex_traits_common.o gcc/boost_regex-gcc-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-1_31/cregex.o gcc/boost_regex-gcc-1_31/fileiter.o gcc/boost_regex-gcc-1_31/instances.o gcc/boost_regex-gcc-1_31/posix_api.o gcc/boost_regex-gcc-1_31/regex.o gcc/boost_regex-gcc-1_31/regex_debug.o gcc/boost_regex-gcc-1_31/regex_synch.o gcc/boost_regex-gcc-1_31/w32_regex_traits.o gcc/boost_regex-gcc-1_31/wide_posix_api.o gcc/boost_regex-gcc-1_31/winstances.o
+./gcc/libboost_regex-gcc-1_31.a : gcc/boost_regex-gcc-1_31/c_regex_traits.o gcc/boost_regex-gcc-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-1_31/cregex.o gcc/boost_regex-gcc-1_31/fileiter.o gcc/boost_regex-gcc-1_31/instances.o gcc/boost_regex-gcc-1_31/posix_api.o gcc/boost_regex-gcc-1_31/regex.o gcc/boost_regex-gcc-1_31/regex_debug.o gcc/boost_regex-gcc-1_31/regex_raw_buffer.o gcc/boost_regex-gcc-1_31/regex_traits_defaults.o gcc/boost_regex-gcc-1_31/static_mutex.o gcc/boost_regex-gcc-1_31/w32_regex_traits.o gcc/boost_regex-gcc-1_31/wc_regex_traits.o gcc/boost_regex-gcc-1_31/wide_posix_api.o gcc/boost_regex-gcc-1_31/winstances.o
+	ar -r gcc/libboost_regex-gcc-1_31.a  gcc/boost_regex-gcc-1_31/c_regex_traits.o gcc/boost_regex-gcc-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-1_31/cregex.o gcc/boost_regex-gcc-1_31/fileiter.o gcc/boost_regex-gcc-1_31/instances.o gcc/boost_regex-gcc-1_31/posix_api.o gcc/boost_regex-gcc-1_31/regex.o gcc/boost_regex-gcc-1_31/regex_debug.o gcc/boost_regex-gcc-1_31/regex_raw_buffer.o gcc/boost_regex-gcc-1_31/regex_traits_defaults.o gcc/boost_regex-gcc-1_31/static_mutex.o gcc/boost_regex-gcc-1_31/w32_regex_traits.o gcc/boost_regex-gcc-1_31/wc_regex_traits.o gcc/boost_regex-gcc-1_31/wide_posix_api.o gcc/boost_regex-gcc-1_31/winstances.o
 	-ar -s gcc/libboost_regex-gcc-1_31.a
 
 ########################################################
@@ -105,9 +111,6 @@ boost_regex-gcc-1_31_clean :
 gcc/boost_regex-gcc-d-1_31/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31/c_regex_traits.o $(C2) $(CXXFLAGS) ../src/c_regex_traits.cpp
 
-gcc/boost_regex-gcc-d-1_31/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31/c_regex_traits_common.o $(C2) $(CXXFLAGS) ../src/c_regex_traits_common.cpp
-
 gcc/boost_regex-gcc-d-1_31/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31/cpp_regex_traits.o $(C2) $(CXXFLAGS) ../src/cpp_regex_traits.cpp
 
@@ -129,12 +132,21 @@ gcc/boost_regex-gcc-d-1_31/regex.o: ../src/regex.cpp $(ALL_HEADER)
 gcc/boost_regex-gcc-d-1_31/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31/regex_debug.o $(C2) $(CXXFLAGS) ../src/regex_debug.cpp
 
-gcc/boost_regex-gcc-d-1_31/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31/regex_synch.o $(C2) $(CXXFLAGS) ../src/regex_synch.cpp
+gcc/boost_regex-gcc-d-1_31/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31/regex_raw_buffer.o $(C2) $(CXXFLAGS) ../src/regex_raw_buffer.cpp
+
+gcc/boost_regex-gcc-d-1_31/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31/regex_traits_defaults.o $(C2) $(CXXFLAGS) ../src/regex_traits_defaults.cpp
+
+gcc/boost_regex-gcc-d-1_31/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31/static_mutex.o $(C2) $(CXXFLAGS) ../src/static_mutex.cpp
 
 gcc/boost_regex-gcc-d-1_31/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31/w32_regex_traits.o $(C2) $(CXXFLAGS) ../src/w32_regex_traits.cpp
 
+gcc/boost_regex-gcc-d-1_31/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31/wc_regex_traits.o $(C2) $(CXXFLAGS) ../src/wc_regex_traits.cpp
+
 gcc/boost_regex-gcc-d-1_31/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31/wide_posix_api.o $(C2) $(CXXFLAGS) ../src/wide_posix_api.cpp
 
@@ -147,7 +159,7 @@ gcc/boost_regex-gcc-d-1_31 :
 boost_regex-gcc-d-1_31_clean :
 	rm -f gcc/boost_regex-gcc-d-1_31/*.o
 
-./gcc/libboost_regex-gcc-d-1_31.a : gcc/boost_regex-gcc-d-1_31/c_regex_traits.o gcc/boost_regex-gcc-d-1_31/c_regex_traits_common.o gcc/boost_regex-gcc-d-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31/cregex.o gcc/boost_regex-gcc-d-1_31/fileiter.o gcc/boost_regex-gcc-d-1_31/instances.o gcc/boost_regex-gcc-d-1_31/posix_api.o gcc/boost_regex-gcc-d-1_31/regex.o gcc/boost_regex-gcc-d-1_31/regex_debug.o gcc/boost_regex-gcc-d-1_31/regex_synch.o gcc/boost_regex-gcc-d-1_31/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31/wide_posix_api.o gcc/boost_regex-gcc-d-1_31/winstances.o
-	ar -r gcc/libboost_regex-gcc-d-1_31.a  gcc/boost_regex-gcc-d-1_31/c_regex_traits.o gcc/boost_regex-gcc-d-1_31/c_regex_traits_common.o gcc/boost_regex-gcc-d-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31/cregex.o gcc/boost_regex-gcc-d-1_31/fileiter.o gcc/boost_regex-gcc-d-1_31/instances.o gcc/boost_regex-gcc-d-1_31/posix_api.o gcc/boost_regex-gcc-d-1_31/regex.o gcc/boost_regex-gcc-d-1_31/regex_debug.o gcc/boost_regex-gcc-d-1_31/regex_synch.o gcc/boost_regex-gcc-d-1_31/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31/wide_posix_api.o gcc/boost_regex-gcc-d-1_31/winstances.o
+./gcc/libboost_regex-gcc-d-1_31.a : gcc/boost_regex-gcc-d-1_31/c_regex_traits.o gcc/boost_regex-gcc-d-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31/cregex.o gcc/boost_regex-gcc-d-1_31/fileiter.o gcc/boost_regex-gcc-d-1_31/instances.o gcc/boost_regex-gcc-d-1_31/posix_api.o gcc/boost_regex-gcc-d-1_31/regex.o gcc/boost_regex-gcc-d-1_31/regex_debug.o gcc/boost_regex-gcc-d-1_31/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_31/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_31/static_mutex.o gcc/boost_regex-gcc-d-1_31/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31/wc_regex_traits.o gcc/boost_regex-gcc-d-1_31/wide_posix_api.o gcc/boost_regex-gcc-d-1_31/winstances.o
+	ar -r gcc/libboost_regex-gcc-d-1_31.a  gcc/boost_regex-gcc-d-1_31/c_regex_traits.o gcc/boost_regex-gcc-d-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31/cregex.o gcc/boost_regex-gcc-d-1_31/fileiter.o gcc/boost_regex-gcc-d-1_31/instances.o gcc/boost_regex-gcc-d-1_31/posix_api.o gcc/boost_regex-gcc-d-1_31/regex.o gcc/boost_regex-gcc-d-1_31/regex_debug.o gcc/boost_regex-gcc-d-1_31/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_31/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_31/static_mutex.o gcc/boost_regex-gcc-d-1_31/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31/wc_regex_traits.o gcc/boost_regex-gcc-d-1_31/wide_posix_api.o gcc/boost_regex-gcc-d-1_31/winstances.o
 	-ar -s gcc/libboost_regex-gcc-d-1_31.a
 
diff --git a/build/generic.mak b/build/generic.mak
index f6c978d1..1c166f98 100644
--- a/build/generic.mak
+++ b/build/generic.mak
@@ -26,7 +26,7 @@ C1=-c -O2 -I../../../
 
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : $(DIRNAME)  $(DIRNAME) $(DIRNAME)/boost_regex ./$(DIRNAME)/libboost_regex.so
 
@@ -47,9 +47,6 @@ install : all
 $(DIRNAME)/boost_regex/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/c_regex_traits.o $(C1) $(CXXFLAGS) ../src/c_regex_traits.cpp
 
-$(DIRNAME)/boost_regex/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/c_regex_traits_common.o $(C1) $(CXXFLAGS) ../src/c_regex_traits_common.cpp
-
 $(DIRNAME)/boost_regex/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(C1) $(CXXFLAGS) ../src/cpp_regex_traits.cpp
 
@@ -71,12 +68,21 @@ $(DIRNAME)/boost_regex/regex.o: ../src/regex.cpp $(ALL_HEADER)
 $(DIRNAME)/boost_regex/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/regex_debug.o $(C1) $(CXXFLAGS) ../src/regex_debug.cpp
 
-$(DIRNAME)/boost_regex/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/regex_synch.o $(C1) $(CXXFLAGS) ../src/regex_synch.cpp
+$(DIRNAME)/boost_regex/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/regex_raw_buffer.o $(C1) $(CXXFLAGS) ../src/regex_raw_buffer.cpp
+
+$(DIRNAME)/boost_regex/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/regex_traits_defaults.o $(C1) $(CXXFLAGS) ../src/regex_traits_defaults.cpp
+
+$(DIRNAME)/boost_regex/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/static_mutex.o $(C1) $(CXXFLAGS) ../src/static_mutex.cpp
 
 $(DIRNAME)/boost_regex/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/w32_regex_traits.o $(C1) $(CXXFLAGS) ../src/w32_regex_traits.cpp
 
+$(DIRNAME)/boost_regex/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/wc_regex_traits.o $(C1) $(CXXFLAGS) ../src/wc_regex_traits.cpp
+
 $(DIRNAME)/boost_regex/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/wide_posix_api.o $(C1) $(CXXFLAGS) ../src/wide_posix_api.cpp
 
@@ -89,6 +95,6 @@ $(DIRNAME)/boost_regex :
 boost_regex_clean :
 	rm -f $(DIRNAME)/boost_regex/*.o
 
-./$(DIRNAME)/libboost_regex.so : $(DIRNAME)/boost_regex/c_regex_traits.o $(DIRNAME)/boost_regex/c_regex_traits_common.o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(DIRNAME)/boost_regex/cregex.o $(DIRNAME)/boost_regex/fileiter.o $(DIRNAME)/boost_regex/instances.o $(DIRNAME)/boost_regex/posix_api.o $(DIRNAME)/boost_regex/regex.o $(DIRNAME)/boost_regex/regex_debug.o $(DIRNAME)/boost_regex/regex_synch.o $(DIRNAME)/boost_regex/w32_regex_traits.o $(DIRNAME)/boost_regex/wide_posix_api.o $(DIRNAME)/boost_regex/winstances.o
-	$(LINKER) $(LDFLAGS) -o $(DIRNAME)/libboost_regex.so  $(DIRNAME)/boost_regex/c_regex_traits.o $(DIRNAME)/boost_regex/c_regex_traits_common.o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(DIRNAME)/boost_regex/cregex.o $(DIRNAME)/boost_regex/fileiter.o $(DIRNAME)/boost_regex/instances.o $(DIRNAME)/boost_regex/posix_api.o $(DIRNAME)/boost_regex/regex.o $(DIRNAME)/boost_regex/regex_debug.o $(DIRNAME)/boost_regex/regex_synch.o $(DIRNAME)/boost_regex/w32_regex_traits.o $(DIRNAME)/boost_regex/wide_posix_api.o $(DIRNAME)/boost_regex/winstances.o $(LIBS)
+./$(DIRNAME)/libboost_regex.so : $(DIRNAME)/boost_regex/c_regex_traits.o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(DIRNAME)/boost_regex/cregex.o $(DIRNAME)/boost_regex/fileiter.o $(DIRNAME)/boost_regex/instances.o $(DIRNAME)/boost_regex/posix_api.o $(DIRNAME)/boost_regex/regex.o $(DIRNAME)/boost_regex/regex_debug.o $(DIRNAME)/boost_regex/regex_raw_buffer.o $(DIRNAME)/boost_regex/regex_traits_defaults.o $(DIRNAME)/boost_regex/static_mutex.o $(DIRNAME)/boost_regex/w32_regex_traits.o $(DIRNAME)/boost_regex/wc_regex_traits.o $(DIRNAME)/boost_regex/wide_posix_api.o $(DIRNAME)/boost_regex/winstances.o
+	$(LINKER) $(LDFLAGS) -o $(DIRNAME)/libboost_regex.so  $(DIRNAME)/boost_regex/c_regex_traits.o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(DIRNAME)/boost_regex/cregex.o $(DIRNAME)/boost_regex/fileiter.o $(DIRNAME)/boost_regex/instances.o $(DIRNAME)/boost_regex/posix_api.o $(DIRNAME)/boost_regex/regex.o $(DIRNAME)/boost_regex/regex_debug.o $(DIRNAME)/boost_regex/regex_raw_buffer.o $(DIRNAME)/boost_regex/regex_traits_defaults.o $(DIRNAME)/boost_regex/static_mutex.o $(DIRNAME)/boost_regex/w32_regex_traits.o $(DIRNAME)/boost_regex/wc_regex_traits.o $(DIRNAME)/boost_regex/wide_posix_api.o $(DIRNAME)/boost_regex/winstances.o $(LIBS)
 
diff --git a/build/sunpro.mak b/build/sunpro.mak
index f3cdd14a..df50d2ae 100644
--- a/build/sunpro.mak
+++ b/build/sunpro.mak
@@ -34,7 +34,7 @@ SUNWS_CACHE_NAME=SunWS_cache
 
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : sunpro sunpro/libboost_regex$(LIBSUFFIX) sunpro/libboost_regex$(LIBSUFFIX).a sunpro/libboost_regex_mt$(LIBSUFFIX) sunpro/libboost_regex_mt$(LIBSUFFIX).a sunpro/shared_libboost_regex$(LIBSUFFIX) sunpro/libboost_regex$(LIBSUFFIX).so sunpro/shared_libboost_regex_mt$(LIBSUFFIX) sunpro/libboost_regex_mt$(LIBSUFFIX).so
 
@@ -54,9 +54,6 @@ sunpro :
 sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o ../src/c_regex_traits.cpp
 
-sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o ../src/c_regex_traits_common.cpp
-
 sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o ../src/cpp_regex_traits.cpp
 
@@ -78,12 +75,21 @@ sunpro/libboost_regex$(LIBSUFFIX)/regex.o: ../src/regex.cpp $(ALL_HEADER)
 sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o ../src/regex_debug.cpp
 
-sunpro/libboost_regex$(LIBSUFFIX)/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/regex_synch.o ../src/regex_synch.cpp
+sunpro/libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o ../src/regex_raw_buffer.cpp
+
+sunpro/libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o ../src/regex_traits_defaults.cpp
+
+sunpro/libboost_regex$(LIBSUFFIX)/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/static_mutex.o ../src/static_mutex.cpp
 
 sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o ../src/w32_regex_traits.cpp
 
+sunpro/libboost_regex$(LIBSUFFIX)/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/wc_regex_traits.o ../src/wc_regex_traits.cpp
+
 sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o ../src/wide_posix_api.cpp
 
@@ -97,8 +103,8 @@ libboost_regex$(LIBSUFFIX)_clean :
 	rm -f sunpro/libboost_regex$(LIBSUFFIX)/*.o
 	rm -fr sunpro/libboost_regex$(LIBSUFFIX)/$(SUNWS_CACHE_NAME)
 
-sunpro/libboost_regex$(LIBSUFFIX).a : sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cregex.o sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex$(LIBSUFFIX)/instances.o sunpro/libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/regex.o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex$(LIBSUFFIX)/regex_synch.o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/winstances.o
-	CC -xar $(CXXFLAGS) $(LDFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX).a  sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cregex.o sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex$(LIBSUFFIX)/instances.o sunpro/libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/regex.o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex$(LIBSUFFIX)/regex_synch.o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/winstances.o
+sunpro/libboost_regex$(LIBSUFFIX).a : sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cregex.o sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex$(LIBSUFFIX)/instances.o sunpro/libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/regex.o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/winstances.o
+	CC -xar $(CXXFLAGS) $(LDFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX).a  sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cregex.o sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex$(LIBSUFFIX)/instances.o sunpro/libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/regex.o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/winstances.o
 
 ########################################################
 #
@@ -108,9 +114,6 @@ sunpro/libboost_regex$(LIBSUFFIX).a : sunpro/libboost_regex$(LIBSUFFIX)/c_regex_
 sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o ../src/c_regex_traits.cpp
 
-sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o ../src/c_regex_traits_common.cpp
-
 sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o ../src/cpp_regex_traits.cpp
 
@@ -132,12 +135,21 @@ sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o: ../src/regex.cpp $(ALL_HEADER)
 sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o ../src/regex_debug.cpp
 
-sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_synch.o ../src/regex_synch.cpp
+sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o ../src/regex_raw_buffer.cpp
+
+sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o ../src/regex_traits_defaults.cpp
+
+sunpro/libboost_regex_mt$(LIBSUFFIX)/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/static_mutex.o ../src/static_mutex.cpp
 
 sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o ../src/w32_regex_traits.cpp
 
+sunpro/libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o ../src/wc_regex_traits.cpp
+
 sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o ../src/wide_posix_api.cpp
 
@@ -151,8 +163,8 @@ libboost_regex_mt$(LIBSUFFIX)_clean :
 	rm -f sunpro/libboost_regex_mt$(LIBSUFFIX)/*.o
 	rm -fr sunpro/libboost_regex_mt$(LIBSUFFIX)/$(SUNWS_CACHE_NAME)
 
-sunpro/libboost_regex_mt$(LIBSUFFIX).a : sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_synch.o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/winstances.o
-	CC -xar $(CXXFLAGS) $(LDFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX).a  sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_synch.o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/winstances.o
+sunpro/libboost_regex_mt$(LIBSUFFIX).a : sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/winstances.o
+	CC -xar $(CXXFLAGS) $(LDFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX).a  sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/winstances.o
 
 ########################################################
 #
@@ -162,9 +174,6 @@ sunpro/libboost_regex_mt$(LIBSUFFIX).a : sunpro/libboost_regex_mt$(LIBSUFFIX)/c_
 sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o ../src/c_regex_traits.cpp
 
-sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o ../src/c_regex_traits_common.cpp
-
 sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o ../src/cpp_regex_traits.cpp
 
@@ -186,12 +195,21 @@ sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o: ../src/regex.cpp $(ALL_HEADER)
 sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o ../src/regex_debug.cpp
 
-sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_synch.o ../src/regex_synch.cpp
+sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o ../src/regex_raw_buffer.cpp
+
+sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o ../src/regex_traits_defaults.cpp
+
+sunpro/shared_libboost_regex$(LIBSUFFIX)/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/static_mutex.o ../src/static_mutex.cpp
 
 sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o ../src/w32_regex_traits.cpp
 
+sunpro/shared_libboost_regex$(LIBSUFFIX)/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/wc_regex_traits.o ../src/wc_regex_traits.cpp
+
 sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o ../src/wide_posix_api.cpp
 
@@ -205,8 +223,8 @@ libboost_regex$(LIBSUFFIX)_clean_shared :
 	rm -f sunpro/shared_libboost_regex$(LIBSUFFIX)/*.o
 	rm -fr sunpro/shared_libboost_regex$(LIBSUFFIX)/$(SUNWS_CACHE_NAME)
 
-sunpro/libboost_regex$(LIBSUFFIX).so : sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_synch.o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/winstances.o
-	CC -KPIC -O2 -I../../../ -G -o sunpro/libboost_regex$(LIBSUFFIX).so $(LDFLAGS)  sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_synch.o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/winstances.o $(LIBS)
+sunpro/libboost_regex$(LIBSUFFIX).so : sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/winstances.o
+	CC -KPIC -O2 -I../../../ -G -o sunpro/libboost_regex$(LIBSUFFIX).so $(LDFLAGS)  sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/winstances.o $(LIBS)
 
 ########################################################
 #
@@ -216,9 +234,6 @@ sunpro/libboost_regex$(LIBSUFFIX).so : sunpro/shared_libboost_regex$(LIBSUFFIX)/
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o ../src/c_regex_traits.cpp
 
-sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o ../src/c_regex_traits_common.cpp
-
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o ../src/cpp_regex_traits.cpp
 
@@ -240,12 +255,21 @@ sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o: ../src/regex.cpp $(ALL_HEAD
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o ../src/regex_debug.cpp
 
-sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_synch.o ../src/regex_synch.cpp
+sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o ../src/regex_raw_buffer.cpp
+
+sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o ../src/regex_traits_defaults.cpp
+
+sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/static_mutex.o ../src/static_mutex.cpp
 
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o ../src/w32_regex_traits.cpp
 
+sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o ../src/wc_regex_traits.cpp
+
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o ../src/wide_posix_api.cpp
 
@@ -259,6 +283,6 @@ libboost_regex_mt$(LIBSUFFIX)_clean_shared :
 	rm -f sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/*.o
 	rm -fr sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/$(SUNWS_CACHE_NAME)
 
-sunpro/libboost_regex_mt$(LIBSUFFIX).so : sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_synch.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/winstances.o
-	CC -KPIC -O2 -mt -I../../../ -G -o sunpro/libboost_regex_mt$(LIBSUFFIX).so $(LDFLAGS)  sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_synch.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/winstances.o $(LIBS)
+sunpro/libboost_regex_mt$(LIBSUFFIX).so : sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/winstances.o
+	CC -KPIC -O2 -mt -I../../../ -G -o sunpro/libboost_regex_mt$(LIBSUFFIX).so $(LDFLAGS)  sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/winstances.o $(LIBS)
 
diff --git a/build/vc6-stlport.mak b/build/vc6-stlport.mak
index c908cb16..d719faad 100644
--- a/build/vc6-stlport.mak
+++ b/build/vc6-stlport.mak
@@ -40,7 +40,7 @@ NULL=nul
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc6-mt-sp-1_31_dir ./vc6-stlport/libboost_regex-vc6-mt-sp-1_31.lib boost_regex-vc6-mt-p-1_31_dir ./vc6-stlport/boost_regex-vc6-mt-p-1_31.lib libboost_regex-vc6-mt-p-1_31_dir ./vc6-stlport/libboost_regex-vc6-mt-p-1_31.lib boost_regex-vc6-mt-gdp-1_31_dir ./vc6-stlport/boost_regex-vc6-mt-gdp-1_31.lib libboost_regex-vc6-mt-sgdp-1_31_dir ./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.lib libboost_regex-vc6-mt-gdp-1_31_dir ./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31.lib
 
@@ -74,9 +74,6 @@ stlport_check : $(STLPORT_PATH)\stlport\string
 vc6-stlport/libboost_regex-vc6-mt-sp-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_31.pdb ../src/c_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc6-stlport/libboost_regex-vc6-mt-sp-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -98,12 +95,21 @@ vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex.obj: ../src/regex.cpp $(ALL_HEAD
 vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_31.pdb ../src/regex_debug.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_31.pdb ../src/regex_synch.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_31.pdb ../src/static_mutex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc6-stlport/libboost_regex-vc6-mt-sp-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc6-stlport/libboost_regex-vc6-mt-sp-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -119,8 +125,8 @@ libboost_regex-vc6-mt-sp-1_31_clean :
 	del vc6-stlport\libboost_regex-vc6-mt-sp-1_31\*.exp
 	del vc6-stlport\libboost_regex-vc6-mt-sp-1_31\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-sp-1_31.lib : vc6-stlport/libboost_regex-vc6-mt-sp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sp-1_31.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-sp-1_31.lib : vc6-stlport/libboost_regex-vc6-mt-sp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sp-1_31.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/winstances.obj
 
 ########################################################
 #
@@ -130,9 +136,6 @@ libboost_regex-vc6-mt-sp-1_31_clean :
 vc6-stlport/boost_regex-vc6-mt-p-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_31.pdb ../src/c_regex_traits.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc6-stlport/boost_regex-vc6-mt-p-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -154,12 +157,21 @@ vc6-stlport/boost_regex-vc6-mt-p-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_31.pdb ../src/regex_debug.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_31.pdb ../src/regex_synch.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc6-stlport/boost_regex-vc6-mt-p-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_31.pdb ../src/static_mutex.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc6-stlport/boost_regex-vc6-mt-p-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc6-stlport/boost_regex-vc6-mt-p-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -175,8 +187,8 @@ boost_regex-vc6-mt-p-1_31_clean :
 	del vc6-stlport\boost_regex-vc6-mt-p-1_31\*.exp
 	del vc6-stlport\boost_regex-vc6-mt-p-1_31\*.pch
 
-./vc6-stlport/boost_regex-vc6-mt-p-1_31.lib : vc6-stlport/boost_regex-vc6-mt-p-1_31/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/c_regex_traits_common.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_synch.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6-stlport/boost_regex-vc6-mt-p-1_31.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-p-1_31.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-p-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6-stlport/boost_regex-vc6-mt-p-1_31/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/c_regex_traits_common.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_synch.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/winstances.obj
+./vc6-stlport/boost_regex-vc6-mt-p-1_31.lib : vc6-stlport/boost_regex-vc6-mt-p-1_31/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6-stlport/boost_regex-vc6-mt-p-1_31.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-p-1_31.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-p-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6-stlport/boost_regex-vc6-mt-p-1_31/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/winstances.obj
 
 ########################################################
 #
@@ -186,9 +198,6 @@ boost_regex-vc6-mt-p-1_31_clean :
 vc6-stlport/libboost_regex-vc6-mt-p-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_31.pdb ../src/c_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc6-stlport/libboost_regex-vc6-mt-p-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -210,12 +219,21 @@ vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADE
 vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_31.pdb ../src/regex_debug.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_31.pdb ../src/regex_synch.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-p-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_31.pdb ../src/static_mutex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc6-stlport/libboost_regex-vc6-mt-p-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc6-stlport/libboost_regex-vc6-mt-p-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -231,8 +249,8 @@ libboost_regex-vc6-mt-p-1_31_clean :
 	del vc6-stlport\libboost_regex-vc6-mt-p-1_31\*.exp
 	del vc6-stlport\libboost_regex-vc6-mt-p-1_31\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-p-1_31.lib : vc6-stlport/libboost_regex-vc6-mt-p-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-p-1_31.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-p-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-p-1_31.lib : vc6-stlport/libboost_regex-vc6-mt-p-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-p-1_31.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-p-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/winstances.obj
 
 ########################################################
 #
@@ -242,9 +260,6 @@ libboost_regex-vc6-mt-p-1_31_clean :
 vc6-stlport/boost_regex-vc6-mt-gdp-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_31.pdb ../src/c_regex_traits.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc6-stlport/boost_regex-vc6-mt-gdp-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -266,12 +281,21 @@ vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER
 vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_31.pdb ../src/regex_debug.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_31.pdb ../src/regex_synch.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc6-stlport/boost_regex-vc6-mt-gdp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_31.pdb ../src/static_mutex.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc6-stlport/boost_regex-vc6-mt-gdp-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc6-stlport/boost_regex-vc6-mt-gdp-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -287,8 +311,8 @@ boost_regex-vc6-mt-gdp-1_31_clean :
 	del vc6-stlport\boost_regex-vc6-mt-gdp-1_31\*.exp
 	del vc6-stlport\boost_regex-vc6-mt-gdp-1_31\*.pch
 
-./vc6-stlport/boost_regex-vc6-mt-gdp-1_31.lib : vc6-stlport/boost_regex-vc6-mt-gdp-1_31/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/c_regex_traits_common.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_synch.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6-stlport/boost_regex-vc6-mt-gdp-1_31.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-gdp-1_31.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-gdp-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6-stlport/boost_regex-vc6-mt-gdp-1_31/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/c_regex_traits_common.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_synch.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/winstances.obj
+./vc6-stlport/boost_regex-vc6-mt-gdp-1_31.lib : vc6-stlport/boost_regex-vc6-mt-gdp-1_31/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6-stlport/boost_regex-vc6-mt-gdp-1_31.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-gdp-1_31.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-gdp-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6-stlport/boost_regex-vc6-mt-gdp-1_31/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/winstances.obj
 
 ########################################################
 #
@@ -298,9 +322,6 @@ boost_regex-vc6-mt-gdp-1_31_clean :
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.pdb ../src/c_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -322,12 +343,21 @@ vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex.obj: ../src/regex.cpp $(ALL_HE
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.pdb ../src/regex_debug.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.pdb ../src/regex_synch.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.pdb ../src/static_mutex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -343,8 +373,8 @@ libboost_regex-vc6-mt-sgdp-1_31_clean :
 	del vc6-stlport\libboost_regex-vc6-mt-sgdp-1_31\*.exp
 	del vc6-stlport\libboost_regex-vc6-mt-sgdp-1_31\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.lib : vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.lib : vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/winstances.obj
 
 ########################################################
 #
@@ -354,9 +384,6 @@ libboost_regex-vc6-mt-sgdp-1_31_clean :
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_31.pdb ../src/c_regex_traits.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -378,12 +405,21 @@ vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex.obj: ../src/regex.cpp $(ALL_HEA
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_31.pdb ../src/regex_debug.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_31.pdb ../src/regex_synch.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_31.pdb ../src/static_mutex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -399,6 +435,6 @@ libboost_regex-vc6-mt-gdp-1_31_clean :
 	del vc6-stlport\libboost_regex-vc6-mt-gdp-1_31\*.exp
 	del vc6-stlport\libboost_regex-vc6-mt-gdp-1_31\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31.lib : vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-gdp-1_31.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31.lib : vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-gdp-1_31.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/winstances.obj
 
diff --git a/build/vc6.mak b/build/vc6.mak
index ccfcb0c4..7eabf665 100644
--- a/build/vc6.mak
+++ b/build/vc6.mak
@@ -36,7 +36,7 @@ NULL=nul
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc6-s-1_31_dir ./vc6/libboost_regex-vc6-s-1_31.lib libboost_regex-vc6-mt-s-1_31_dir ./vc6/libboost_regex-vc6-mt-s-1_31.lib libboost_regex-vc6-sgd-1_31_dir ./vc6/libboost_regex-vc6-sgd-1_31.lib libboost_regex-vc6-mt-sgd-1_31_dir ./vc6/libboost_regex-vc6-mt-sgd-1_31.lib boost_regex-vc6-mt-gd-1_31_dir ./vc6/boost_regex-vc6-mt-gd-1_31.lib boost_regex-vc6-mt-1_31_dir ./vc6/boost_regex-vc6-mt-1_31.lib libboost_regex-vc6-mt-1_31_dir ./vc6/libboost_regex-vc6-mt-1_31.lib libboost_regex-vc6-mt-gd-1_31_dir ./vc6/libboost_regex-vc6-mt-gd-1_31.lib
 
@@ -70,9 +70,6 @@ main_dir :
 vc6/libboost_regex-vc6-s-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_31/ -Fdvc6/libboost_regex-vc6-s-1_31.pdb ../src/c_regex_traits.cpp
 
-vc6/libboost_regex-vc6-s-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_31/ -Fdvc6/libboost_regex-vc6-s-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc6/libboost_regex-vc6-s-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_31/ -Fdvc6/libboost_regex-vc6-s-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -94,12 +91,21 @@ vc6/libboost_regex-vc6-s-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc6/libboost_regex-vc6-s-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_31/ -Fdvc6/libboost_regex-vc6-s-1_31.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-s-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_31/ -Fdvc6/libboost_regex-vc6-s-1_31.pdb ../src/regex_synch.cpp
+vc6/libboost_regex-vc6-s-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_31/ -Fdvc6/libboost_regex-vc6-s-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc6/libboost_regex-vc6-s-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_31/ -Fdvc6/libboost_regex-vc6-s-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc6/libboost_regex-vc6-s-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_31/ -Fdvc6/libboost_regex-vc6-s-1_31.pdb ../src/static_mutex.cpp
 
 vc6/libboost_regex-vc6-s-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_31/ -Fdvc6/libboost_regex-vc6-s-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc6/libboost_regex-vc6-s-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_31/ -Fdvc6/libboost_regex-vc6-s-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc6/libboost_regex-vc6-s-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_31/ -Fdvc6/libboost_regex-vc6-s-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -115,8 +121,8 @@ libboost_regex-vc6-s-1_31_clean :
 	del vc6\libboost_regex-vc6-s-1_31\*.exp
 	del vc6\libboost_regex-vc6-s-1_31\*.pch
 
-./vc6/libboost_regex-vc6-s-1_31.lib : vc6/libboost_regex-vc6-s-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/c_regex_traits_common.obj vc6/libboost_regex-vc6-s-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/cregex.obj vc6/libboost_regex-vc6-s-1_31/fileiter.obj vc6/libboost_regex-vc6-s-1_31/instances.obj vc6/libboost_regex-vc6-s-1_31/posix_api.obj vc6/libboost_regex-vc6-s-1_31/regex.obj vc6/libboost_regex-vc6-s-1_31/regex_debug.obj vc6/libboost_regex-vc6-s-1_31/regex_synch.obj vc6/libboost_regex-vc6-s-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_31/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-s-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-s-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/c_regex_traits_common.obj vc6/libboost_regex-vc6-s-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/cregex.obj vc6/libboost_regex-vc6-s-1_31/fileiter.obj vc6/libboost_regex-vc6-s-1_31/instances.obj vc6/libboost_regex-vc6-s-1_31/posix_api.obj vc6/libboost_regex-vc6-s-1_31/regex.obj vc6/libboost_regex-vc6-s-1_31/regex_debug.obj vc6/libboost_regex-vc6-s-1_31/regex_synch.obj vc6/libboost_regex-vc6-s-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_31/winstances.obj
+./vc6/libboost_regex-vc6-s-1_31.lib : vc6/libboost_regex-vc6-s-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/cregex.obj vc6/libboost_regex-vc6-s-1_31/fileiter.obj vc6/libboost_regex-vc6-s-1_31/instances.obj vc6/libboost_regex-vc6-s-1_31/posix_api.obj vc6/libboost_regex-vc6-s-1_31/regex.obj vc6/libboost_regex-vc6-s-1_31/regex_debug.obj vc6/libboost_regex-vc6-s-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-s-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-s-1_31/static_mutex.obj vc6/libboost_regex-vc6-s-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_31/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-s-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-s-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/cregex.obj vc6/libboost_regex-vc6-s-1_31/fileiter.obj vc6/libboost_regex-vc6-s-1_31/instances.obj vc6/libboost_regex-vc6-s-1_31/posix_api.obj vc6/libboost_regex-vc6-s-1_31/regex.obj vc6/libboost_regex-vc6-s-1_31/regex_debug.obj vc6/libboost_regex-vc6-s-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-s-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-s-1_31/static_mutex.obj vc6/libboost_regex-vc6-s-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_31/winstances.obj
 
 ########################################################
 #
@@ -126,9 +132,6 @@ libboost_regex-vc6-s-1_31_clean :
 vc6/libboost_regex-vc6-mt-s-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_31/ -Fdvc6/libboost_regex-vc6-mt-s-1_31.pdb ../src/c_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_31/ -Fdvc6/libboost_regex-vc6-mt-s-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc6/libboost_regex-vc6-mt-s-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_31/ -Fdvc6/libboost_regex-vc6-mt-s-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -150,12 +153,21 @@ vc6/libboost_regex-vc6-mt-s-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc6/libboost_regex-vc6-mt-s-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_31/ -Fdvc6/libboost_regex-vc6-mt-s-1_31.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_31/ -Fdvc6/libboost_regex-vc6-mt-s-1_31.pdb ../src/regex_synch.cpp
+vc6/libboost_regex-vc6-mt-s-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_31/ -Fdvc6/libboost_regex-vc6-mt-s-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc6/libboost_regex-vc6-mt-s-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_31/ -Fdvc6/libboost_regex-vc6-mt-s-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc6/libboost_regex-vc6-mt-s-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_31/ -Fdvc6/libboost_regex-vc6-mt-s-1_31.pdb ../src/static_mutex.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_31/ -Fdvc6/libboost_regex-vc6-mt-s-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc6/libboost_regex-vc6-mt-s-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_31/ -Fdvc6/libboost_regex-vc6-mt-s-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc6/libboost_regex-vc6-mt-s-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_31/ -Fdvc6/libboost_regex-vc6-mt-s-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -171,8 +183,8 @@ libboost_regex-vc6-mt-s-1_31_clean :
 	del vc6\libboost_regex-vc6-mt-s-1_31\*.exp
 	del vc6\libboost_regex-vc6-mt-s-1_31\*.pch
 
-./vc6/libboost_regex-vc6-mt-s-1_31.lib : vc6/libboost_regex-vc6-mt-s-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-s-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/cregex.obj vc6/libboost_regex-vc6-mt-s-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_31/instances.obj vc6/libboost_regex-vc6-mt-s-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_31/regex.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_synch.obj vc6/libboost_regex-vc6-mt-s-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_31/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-s-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-s-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-s-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/cregex.obj vc6/libboost_regex-vc6-mt-s-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_31/instances.obj vc6/libboost_regex-vc6-mt-s-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_31/regex.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_synch.obj vc6/libboost_regex-vc6-mt-s-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_31/winstances.obj
+./vc6/libboost_regex-vc6-mt-s-1_31.lib : vc6/libboost_regex-vc6-mt-s-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/cregex.obj vc6/libboost_regex-vc6-mt-s-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_31/instances.obj vc6/libboost_regex-vc6-mt-s-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_31/regex.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-s-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-s-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_31/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-s-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-s-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/cregex.obj vc6/libboost_regex-vc6-mt-s-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_31/instances.obj vc6/libboost_regex-vc6-mt-s-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_31/regex.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-s-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-s-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_31/winstances.obj
 
 ########################################################
 #
@@ -182,9 +194,6 @@ libboost_regex-vc6-mt-s-1_31_clean :
 vc6/libboost_regex-vc6-sgd-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_31/ -Fdvc6/libboost_regex-vc6-sgd-1_31.pdb ../src/c_regex_traits.cpp
 
-vc6/libboost_regex-vc6-sgd-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_31/ -Fdvc6/libboost_regex-vc6-sgd-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc6/libboost_regex-vc6-sgd-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_31/ -Fdvc6/libboost_regex-vc6-sgd-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -206,12 +215,21 @@ vc6/libboost_regex-vc6-sgd-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc6/libboost_regex-vc6-sgd-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_31/ -Fdvc6/libboost_regex-vc6-sgd-1_31.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-sgd-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_31/ -Fdvc6/libboost_regex-vc6-sgd-1_31.pdb ../src/regex_synch.cpp
+vc6/libboost_regex-vc6-sgd-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_31/ -Fdvc6/libboost_regex-vc6-sgd-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc6/libboost_regex-vc6-sgd-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_31/ -Fdvc6/libboost_regex-vc6-sgd-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc6/libboost_regex-vc6-sgd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_31/ -Fdvc6/libboost_regex-vc6-sgd-1_31.pdb ../src/static_mutex.cpp
 
 vc6/libboost_regex-vc6-sgd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_31/ -Fdvc6/libboost_regex-vc6-sgd-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc6/libboost_regex-vc6-sgd-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_31/ -Fdvc6/libboost_regex-vc6-sgd-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc6/libboost_regex-vc6-sgd-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_31/ -Fdvc6/libboost_regex-vc6-sgd-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -227,8 +245,8 @@ libboost_regex-vc6-sgd-1_31_clean :
 	del vc6\libboost_regex-vc6-sgd-1_31\*.exp
 	del vc6\libboost_regex-vc6-sgd-1_31\*.pch
 
-./vc6/libboost_regex-vc6-sgd-1_31.lib : vc6/libboost_regex-vc6-sgd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/c_regex_traits_common.obj vc6/libboost_regex-vc6-sgd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/cregex.obj vc6/libboost_regex-vc6-sgd-1_31/fileiter.obj vc6/libboost_regex-vc6-sgd-1_31/instances.obj vc6/libboost_regex-vc6-sgd-1_31/posix_api.obj vc6/libboost_regex-vc6-sgd-1_31/regex.obj vc6/libboost_regex-vc6-sgd-1_31/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_31/regex_synch.obj vc6/libboost_regex-vc6-sgd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_31/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-sgd-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-sgd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/c_regex_traits_common.obj vc6/libboost_regex-vc6-sgd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/cregex.obj vc6/libboost_regex-vc6-sgd-1_31/fileiter.obj vc6/libboost_regex-vc6-sgd-1_31/instances.obj vc6/libboost_regex-vc6-sgd-1_31/posix_api.obj vc6/libboost_regex-vc6-sgd-1_31/regex.obj vc6/libboost_regex-vc6-sgd-1_31/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_31/regex_synch.obj vc6/libboost_regex-vc6-sgd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_31/winstances.obj
+./vc6/libboost_regex-vc6-sgd-1_31.lib : vc6/libboost_regex-vc6-sgd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/cregex.obj vc6/libboost_regex-vc6-sgd-1_31/fileiter.obj vc6/libboost_regex-vc6-sgd-1_31/instances.obj vc6/libboost_regex-vc6-sgd-1_31/posix_api.obj vc6/libboost_regex-vc6-sgd-1_31/regex.obj vc6/libboost_regex-vc6-sgd-1_31/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-sgd-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-sgd-1_31/static_mutex.obj vc6/libboost_regex-vc6-sgd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_31/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-sgd-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-sgd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/cregex.obj vc6/libboost_regex-vc6-sgd-1_31/fileiter.obj vc6/libboost_regex-vc6-sgd-1_31/instances.obj vc6/libboost_regex-vc6-sgd-1_31/posix_api.obj vc6/libboost_regex-vc6-sgd-1_31/regex.obj vc6/libboost_regex-vc6-sgd-1_31/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-sgd-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-sgd-1_31/static_mutex.obj vc6/libboost_regex-vc6-sgd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_31/winstances.obj
 
 ########################################################
 #
@@ -238,9 +256,6 @@ libboost_regex-vc6-sgd-1_31_clean :
 vc6/libboost_regex-vc6-mt-sgd-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_31/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_31.pdb ../src/c_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_31/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc6/libboost_regex-vc6-mt-sgd-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_31/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -262,12 +277,21 @@ vc6/libboost_regex-vc6-mt-sgd-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc6/libboost_regex-vc6-mt-sgd-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_31/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_31.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_31/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_31.pdb ../src/regex_synch.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_31/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc6/libboost_regex-vc6-mt-sgd-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_31/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc6/libboost_regex-vc6-mt-sgd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_31/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_31.pdb ../src/static_mutex.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_31/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc6/libboost_regex-vc6-mt-sgd-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_31/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc6/libboost_regex-vc6-mt-sgd-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_31/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -283,8 +307,8 @@ libboost_regex-vc6-mt-sgd-1_31_clean :
 	del vc6\libboost_regex-vc6-mt-sgd-1_31\*.exp
 	del vc6\libboost_regex-vc6-mt-sgd-1_31\*.pch
 
-./vc6/libboost_regex-vc6-mt-sgd-1_31.lib : vc6/libboost_regex-vc6-mt-sgd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-sgd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_31/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_synch.obj vc6/libboost_regex-vc6-mt-sgd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_31/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-sgd-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-sgd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-sgd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_31/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_synch.obj vc6/libboost_regex-vc6-mt-sgd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_31/winstances.obj
+./vc6/libboost_regex-vc6-mt-sgd-1_31.lib : vc6/libboost_regex-vc6-mt-sgd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_31/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-sgd-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_31/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-sgd-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-sgd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_31/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-sgd-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_31/winstances.obj
 
 ########################################################
 #
@@ -294,9 +318,6 @@ libboost_regex-vc6-mt-sgd-1_31_clean :
 vc6/boost_regex-vc6-mt-gd-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_31/ -Fdvc6/boost_regex-vc6-mt-gd-1_31.pdb ../src/c_regex_traits.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_31/ -Fdvc6/boost_regex-vc6-mt-gd-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc6/boost_regex-vc6-mt-gd-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_31/ -Fdvc6/boost_regex-vc6-mt-gd-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -318,12 +339,21 @@ vc6/boost_regex-vc6-mt-gd-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc6/boost_regex-vc6-mt-gd-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_31/ -Fdvc6/boost_regex-vc6-mt-gd-1_31.pdb ../src/regex_debug.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_31/ -Fdvc6/boost_regex-vc6-mt-gd-1_31.pdb ../src/regex_synch.cpp
+vc6/boost_regex-vc6-mt-gd-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_31/ -Fdvc6/boost_regex-vc6-mt-gd-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc6/boost_regex-vc6-mt-gd-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_31/ -Fdvc6/boost_regex-vc6-mt-gd-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc6/boost_regex-vc6-mt-gd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_31/ -Fdvc6/boost_regex-vc6-mt-gd-1_31.pdb ../src/static_mutex.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_31/ -Fdvc6/boost_regex-vc6-mt-gd-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc6/boost_regex-vc6-mt-gd-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_31/ -Fdvc6/boost_regex-vc6-mt-gd-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc6/boost_regex-vc6-mt-gd-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_31/ -Fdvc6/boost_regex-vc6-mt-gd-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -339,8 +369,8 @@ boost_regex-vc6-mt-gd-1_31_clean :
 	del vc6\boost_regex-vc6-mt-gd-1_31\*.exp
 	del vc6\boost_regex-vc6-mt-gd-1_31\*.pch
 
-./vc6/boost_regex-vc6-mt-gd-1_31.lib : vc6/boost_regex-vc6-mt-gd-1_31/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/c_regex_traits_common.obj vc6/boost_regex-vc6-mt-gd-1_31/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/cregex.obj vc6/boost_regex-vc6-mt-gd-1_31/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_31/instances.obj vc6/boost_regex-vc6-mt-gd-1_31/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_31/regex.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_synch.obj vc6/boost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6/boost_regex-vc6-mt-gd-1_31.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-gd-1_31.dll" /implib:"vc6/boost_regex-vc6-mt-gd-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6/boost_regex-vc6-mt-gd-1_31/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/c_regex_traits_common.obj vc6/boost_regex-vc6-mt-gd-1_31/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/cregex.obj vc6/boost_regex-vc6-mt-gd-1_31/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_31/instances.obj vc6/boost_regex-vc6-mt-gd-1_31/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_31/regex.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_synch.obj vc6/boost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_31/winstances.obj
+./vc6/boost_regex-vc6-mt-gd-1_31.lib : vc6/boost_regex-vc6-mt-gd-1_31/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/cregex.obj vc6/boost_regex-vc6-mt-gd-1_31/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_31/instances.obj vc6/boost_regex-vc6-mt-gd-1_31/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_31/regex.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-gd-1_31/static_mutex.obj vc6/boost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/wc_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6/boost_regex-vc6-mt-gd-1_31.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-gd-1_31.dll" /implib:"vc6/boost_regex-vc6-mt-gd-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6/boost_regex-vc6-mt-gd-1_31/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/cregex.obj vc6/boost_regex-vc6-mt-gd-1_31/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_31/instances.obj vc6/boost_regex-vc6-mt-gd-1_31/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_31/regex.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-gd-1_31/static_mutex.obj vc6/boost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/wc_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_31/winstances.obj
 
 ########################################################
 #
@@ -350,9 +380,6 @@ boost_regex-vc6-mt-gd-1_31_clean :
 vc6/boost_regex-vc6-mt-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_31/ -Fdvc6/boost_regex-vc6-mt-1_31.pdb ../src/c_regex_traits.cpp
 
-vc6/boost_regex-vc6-mt-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_31/ -Fdvc6/boost_regex-vc6-mt-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc6/boost_regex-vc6-mt-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_31/ -Fdvc6/boost_regex-vc6-mt-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -374,12 +401,21 @@ vc6/boost_regex-vc6-mt-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc6/boost_regex-vc6-mt-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_31/ -Fdvc6/boost_regex-vc6-mt-1_31.pdb ../src/regex_debug.cpp
 
-vc6/boost_regex-vc6-mt-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_31/ -Fdvc6/boost_regex-vc6-mt-1_31.pdb ../src/regex_synch.cpp
+vc6/boost_regex-vc6-mt-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_31/ -Fdvc6/boost_regex-vc6-mt-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc6/boost_regex-vc6-mt-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_31/ -Fdvc6/boost_regex-vc6-mt-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc6/boost_regex-vc6-mt-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_31/ -Fdvc6/boost_regex-vc6-mt-1_31.pdb ../src/static_mutex.cpp
 
 vc6/boost_regex-vc6-mt-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_31/ -Fdvc6/boost_regex-vc6-mt-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc6/boost_regex-vc6-mt-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_31/ -Fdvc6/boost_regex-vc6-mt-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc6/boost_regex-vc6-mt-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_31/ -Fdvc6/boost_regex-vc6-mt-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -395,8 +431,8 @@ boost_regex-vc6-mt-1_31_clean :
 	del vc6\boost_regex-vc6-mt-1_31\*.exp
 	del vc6\boost_regex-vc6-mt-1_31\*.pch
 
-./vc6/boost_regex-vc6-mt-1_31.lib : vc6/boost_regex-vc6-mt-1_31/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/c_regex_traits_common.obj vc6/boost_regex-vc6-mt-1_31/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/cregex.obj vc6/boost_regex-vc6-mt-1_31/fileiter.obj vc6/boost_regex-vc6-mt-1_31/instances.obj vc6/boost_regex-vc6-mt-1_31/posix_api.obj vc6/boost_regex-vc6-mt-1_31/regex.obj vc6/boost_regex-vc6-mt-1_31/regex_debug.obj vc6/boost_regex-vc6-mt-1_31/regex_synch.obj vc6/boost_regex-vc6-mt-1_31/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6/boost_regex-vc6-mt-1_31.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-1_31.dll" /implib:"vc6/boost_regex-vc6-mt-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6/boost_regex-vc6-mt-1_31/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/c_regex_traits_common.obj vc6/boost_regex-vc6-mt-1_31/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/cregex.obj vc6/boost_regex-vc6-mt-1_31/fileiter.obj vc6/boost_regex-vc6-mt-1_31/instances.obj vc6/boost_regex-vc6-mt-1_31/posix_api.obj vc6/boost_regex-vc6-mt-1_31/regex.obj vc6/boost_regex-vc6-mt-1_31/regex_debug.obj vc6/boost_regex-vc6-mt-1_31/regex_synch.obj vc6/boost_regex-vc6-mt-1_31/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_31/winstances.obj
+./vc6/boost_regex-vc6-mt-1_31.lib : vc6/boost_regex-vc6-mt-1_31/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/cregex.obj vc6/boost_regex-vc6-mt-1_31/fileiter.obj vc6/boost_regex-vc6-mt-1_31/instances.obj vc6/boost_regex-vc6-mt-1_31/posix_api.obj vc6/boost_regex-vc6-mt-1_31/regex.obj vc6/boost_regex-vc6-mt-1_31/regex_debug.obj vc6/boost_regex-vc6-mt-1_31/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-1_31/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-1_31/static_mutex.obj vc6/boost_regex-vc6-mt-1_31/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/wc_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6/boost_regex-vc6-mt-1_31.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-1_31.dll" /implib:"vc6/boost_regex-vc6-mt-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6/boost_regex-vc6-mt-1_31/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/cregex.obj vc6/boost_regex-vc6-mt-1_31/fileiter.obj vc6/boost_regex-vc6-mt-1_31/instances.obj vc6/boost_regex-vc6-mt-1_31/posix_api.obj vc6/boost_regex-vc6-mt-1_31/regex.obj vc6/boost_regex-vc6-mt-1_31/regex_debug.obj vc6/boost_regex-vc6-mt-1_31/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-1_31/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-1_31/static_mutex.obj vc6/boost_regex-vc6-mt-1_31/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/wc_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_31/winstances.obj
 
 ########################################################
 #
@@ -406,9 +442,6 @@ boost_regex-vc6-mt-1_31_clean :
 vc6/libboost_regex-vc6-mt-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_31/ -Fdvc6/libboost_regex-vc6-mt-1_31.pdb ../src/c_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_31/ -Fdvc6/libboost_regex-vc6-mt-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc6/libboost_regex-vc6-mt-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_31/ -Fdvc6/libboost_regex-vc6-mt-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -430,12 +463,21 @@ vc6/libboost_regex-vc6-mt-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc6/libboost_regex-vc6-mt-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_31/ -Fdvc6/libboost_regex-vc6-mt-1_31.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-mt-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_31/ -Fdvc6/libboost_regex-vc6-mt-1_31.pdb ../src/regex_synch.cpp
+vc6/libboost_regex-vc6-mt-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_31/ -Fdvc6/libboost_regex-vc6-mt-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc6/libboost_regex-vc6-mt-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_31/ -Fdvc6/libboost_regex-vc6-mt-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc6/libboost_regex-vc6-mt-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_31/ -Fdvc6/libboost_regex-vc6-mt-1_31.pdb ../src/static_mutex.cpp
 
 vc6/libboost_regex-vc6-mt-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_31/ -Fdvc6/libboost_regex-vc6-mt-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc6/libboost_regex-vc6-mt-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_31/ -Fdvc6/libboost_regex-vc6-mt-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc6/libboost_regex-vc6-mt-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_31/ -Fdvc6/libboost_regex-vc6-mt-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -451,8 +493,8 @@ libboost_regex-vc6-mt-1_31_clean :
 	del vc6\libboost_regex-vc6-mt-1_31\*.exp
 	del vc6\libboost_regex-vc6-mt-1_31\*.pch
 
-./vc6/libboost_regex-vc6-mt-1_31.lib : vc6/libboost_regex-vc6-mt-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/cregex.obj vc6/libboost_regex-vc6-mt-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-1_31/instances.obj vc6/libboost_regex-vc6-mt-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-1_31/regex.obj vc6/libboost_regex-vc6-mt-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-1_31/regex_synch.obj vc6/libboost_regex-vc6-mt-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_31/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/cregex.obj vc6/libboost_regex-vc6-mt-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-1_31/instances.obj vc6/libboost_regex-vc6-mt-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-1_31/regex.obj vc6/libboost_regex-vc6-mt-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-1_31/regex_synch.obj vc6/libboost_regex-vc6-mt-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_31/winstances.obj
+./vc6/libboost_regex-vc6-mt-1_31.lib : vc6/libboost_regex-vc6-mt-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/cregex.obj vc6/libboost_regex-vc6-mt-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-1_31/instances.obj vc6/libboost_regex-vc6-mt-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-1_31/regex.obj vc6/libboost_regex-vc6-mt-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_31/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/cregex.obj vc6/libboost_regex-vc6-mt-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-1_31/instances.obj vc6/libboost_regex-vc6-mt-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-1_31/regex.obj vc6/libboost_regex-vc6-mt-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_31/winstances.obj
 
 ########################################################
 #
@@ -462,9 +504,6 @@ libboost_regex-vc6-mt-1_31_clean :
 vc6/libboost_regex-vc6-mt-gd-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_31/ -Fdvc6/libboost_regex-vc6-mt-gd-1_31.pdb ../src/c_regex_traits.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_31/ -Fdvc6/libboost_regex-vc6-mt-gd-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc6/libboost_regex-vc6-mt-gd-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_31/ -Fdvc6/libboost_regex-vc6-mt-gd-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -486,12 +525,21 @@ vc6/libboost_regex-vc6-mt-gd-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc6/libboost_regex-vc6-mt-gd-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_31/ -Fdvc6/libboost_regex-vc6-mt-gd-1_31.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_31/ -Fdvc6/libboost_regex-vc6-mt-gd-1_31.pdb ../src/regex_synch.cpp
+vc6/libboost_regex-vc6-mt-gd-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_31/ -Fdvc6/libboost_regex-vc6-mt-gd-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc6/libboost_regex-vc6-mt-gd-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_31/ -Fdvc6/libboost_regex-vc6-mt-gd-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc6/libboost_regex-vc6-mt-gd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_31/ -Fdvc6/libboost_regex-vc6-mt-gd-1_31.pdb ../src/static_mutex.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_31/ -Fdvc6/libboost_regex-vc6-mt-gd-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc6/libboost_regex-vc6-mt-gd-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_31/ -Fdvc6/libboost_regex-vc6-mt-gd-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc6/libboost_regex-vc6-mt-gd-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_31/ -Fdvc6/libboost_regex-vc6-mt-gd-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -507,6 +555,6 @@ libboost_regex-vc6-mt-gd-1_31_clean :
 	del vc6\libboost_regex-vc6-mt-gd-1_31\*.exp
 	del vc6\libboost_regex-vc6-mt-gd-1_31\*.pch
 
-./vc6/libboost_regex-vc6-mt-gd-1_31.lib : vc6/libboost_regex-vc6-mt-gd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-gd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_31/instances.obj vc6/libboost_regex-vc6-mt-gd-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_synch.obj vc6/libboost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_31/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-gd-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-gd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-gd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_31/instances.obj vc6/libboost_regex-vc6-mt-gd-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_synch.obj vc6/libboost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_31/winstances.obj
+./vc6/libboost_regex-vc6-mt-gd-1_31.lib : vc6/libboost_regex-vc6-mt-gd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_31/instances.obj vc6/libboost_regex-vc6-mt-gd-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-gd-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_31/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-gd-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-gd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_31/instances.obj vc6/libboost_regex-vc6-mt-gd-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-gd-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_31/winstances.obj
 
diff --git a/build/vc7-stlport.mak b/build/vc7-stlport.mak
index 7f4611af..5fdd64a0 100644
--- a/build/vc7-stlport.mak
+++ b/build/vc7-stlport.mak
@@ -40,7 +40,7 @@ NULL=nul
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc7-mt-sp-1_31_dir ./vc7-stlport/libboost_regex-vc7-mt-sp-1_31.lib boost_regex-vc7-mt-p-1_31_dir ./vc7-stlport/boost_regex-vc7-mt-p-1_31.lib libboost_regex-vc7-mt-p-1_31_dir ./vc7-stlport/libboost_regex-vc7-mt-p-1_31.lib boost_regex-vc7-mt-gdp-1_31_dir ./vc7-stlport/boost_regex-vc7-mt-gdp-1_31.lib libboost_regex-vc7-mt-sgdp-1_31_dir ./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.lib libboost_regex-vc7-mt-gdp-1_31_dir ./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31.lib
 
@@ -74,9 +74,6 @@ stlport_check : $(STLPORT_PATH)\stlport\string
 vc7-stlport/libboost_regex-vc7-mt-sp-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_31.pdb ../src/c_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc7-stlport/libboost_regex-vc7-mt-sp-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -98,12 +95,21 @@ vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex.obj: ../src/regex.cpp $(ALL_HEAD
 vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_31.pdb ../src/regex_debug.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_31.pdb ../src/regex_synch.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_31.pdb ../src/static_mutex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc7-stlport/libboost_regex-vc7-mt-sp-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc7-stlport/libboost_regex-vc7-mt-sp-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -119,8 +125,8 @@ libboost_regex-vc7-mt-sp-1_31_clean :
 	del vc7-stlport\libboost_regex-vc7-mt-sp-1_31\*.exp
 	del vc7-stlport\libboost_regex-vc7-mt-sp-1_31\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-sp-1_31.lib : vc7-stlport/libboost_regex-vc7-mt-sp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sp-1_31.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-sp-1_31.lib : vc7-stlport/libboost_regex-vc7-mt-sp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sp-1_31.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/winstances.obj
 
 ########################################################
 #
@@ -130,9 +136,6 @@ libboost_regex-vc7-mt-sp-1_31_clean :
 vc7-stlport/boost_regex-vc7-mt-p-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_31.pdb ../src/c_regex_traits.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc7-stlport/boost_regex-vc7-mt-p-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -154,12 +157,21 @@ vc7-stlport/boost_regex-vc7-mt-p-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_31.pdb ../src/regex_debug.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_31.pdb ../src/regex_synch.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc7-stlport/boost_regex-vc7-mt-p-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_31.pdb ../src/static_mutex.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc7-stlport/boost_regex-vc7-mt-p-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc7-stlport/boost_regex-vc7-mt-p-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -175,8 +187,8 @@ boost_regex-vc7-mt-p-1_31_clean :
 	del vc7-stlport\boost_regex-vc7-mt-p-1_31\*.exp
 	del vc7-stlport\boost_regex-vc7-mt-p-1_31\*.pch
 
-./vc7-stlport/boost_regex-vc7-mt-p-1_31.lib : vc7-stlport/boost_regex-vc7-mt-p-1_31/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/c_regex_traits_common.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_synch.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7-stlport/boost_regex-vc7-mt-p-1_31.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-p-1_31.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-p-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7-stlport/boost_regex-vc7-mt-p-1_31/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/c_regex_traits_common.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_synch.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/winstances.obj
+./vc7-stlport/boost_regex-vc7-mt-p-1_31.lib : vc7-stlport/boost_regex-vc7-mt-p-1_31/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7-stlport/boost_regex-vc7-mt-p-1_31.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-p-1_31.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-p-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7-stlport/boost_regex-vc7-mt-p-1_31/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/winstances.obj
 
 ########################################################
 #
@@ -186,9 +198,6 @@ boost_regex-vc7-mt-p-1_31_clean :
 vc7-stlport/libboost_regex-vc7-mt-p-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_31.pdb ../src/c_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc7-stlport/libboost_regex-vc7-mt-p-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -210,12 +219,21 @@ vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADE
 vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_31.pdb ../src/regex_debug.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_31.pdb ../src/regex_synch.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-p-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_31.pdb ../src/static_mutex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc7-stlport/libboost_regex-vc7-mt-p-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc7-stlport/libboost_regex-vc7-mt-p-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -231,8 +249,8 @@ libboost_regex-vc7-mt-p-1_31_clean :
 	del vc7-stlport\libboost_regex-vc7-mt-p-1_31\*.exp
 	del vc7-stlport\libboost_regex-vc7-mt-p-1_31\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-p-1_31.lib : vc7-stlport/libboost_regex-vc7-mt-p-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-p-1_31.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-p-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-p-1_31.lib : vc7-stlport/libboost_regex-vc7-mt-p-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-p-1_31.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-p-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/winstances.obj
 
 ########################################################
 #
@@ -242,9 +260,6 @@ libboost_regex-vc7-mt-p-1_31_clean :
 vc7-stlport/boost_regex-vc7-mt-gdp-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_31.pdb ../src/c_regex_traits.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc7-stlport/boost_regex-vc7-mt-gdp-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -266,12 +281,21 @@ vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER
 vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_31.pdb ../src/regex_debug.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_31.pdb ../src/regex_synch.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc7-stlport/boost_regex-vc7-mt-gdp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_31.pdb ../src/static_mutex.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc7-stlport/boost_regex-vc7-mt-gdp-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc7-stlport/boost_regex-vc7-mt-gdp-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -287,8 +311,8 @@ boost_regex-vc7-mt-gdp-1_31_clean :
 	del vc7-stlport\boost_regex-vc7-mt-gdp-1_31\*.exp
 	del vc7-stlport\boost_regex-vc7-mt-gdp-1_31\*.pch
 
-./vc7-stlport/boost_regex-vc7-mt-gdp-1_31.lib : vc7-stlport/boost_regex-vc7-mt-gdp-1_31/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/c_regex_traits_common.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_synch.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7-stlport/boost_regex-vc7-mt-gdp-1_31.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-gdp-1_31.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-gdp-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7-stlport/boost_regex-vc7-mt-gdp-1_31/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/c_regex_traits_common.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_synch.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/winstances.obj
+./vc7-stlport/boost_regex-vc7-mt-gdp-1_31.lib : vc7-stlport/boost_regex-vc7-mt-gdp-1_31/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7-stlport/boost_regex-vc7-mt-gdp-1_31.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-gdp-1_31.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-gdp-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7-stlport/boost_regex-vc7-mt-gdp-1_31/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/winstances.obj
 
 ########################################################
 #
@@ -298,9 +322,6 @@ boost_regex-vc7-mt-gdp-1_31_clean :
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.pdb ../src/c_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -322,12 +343,21 @@ vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex.obj: ../src/regex.cpp $(ALL_HE
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.pdb ../src/regex_debug.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.pdb ../src/regex_synch.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.pdb ../src/static_mutex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -343,8 +373,8 @@ libboost_regex-vc7-mt-sgdp-1_31_clean :
 	del vc7-stlport\libboost_regex-vc7-mt-sgdp-1_31\*.exp
 	del vc7-stlport\libboost_regex-vc7-mt-sgdp-1_31\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.lib : vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.lib : vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/winstances.obj
 
 ########################################################
 #
@@ -354,9 +384,6 @@ libboost_regex-vc7-mt-sgdp-1_31_clean :
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_31.pdb ../src/c_regex_traits.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -378,12 +405,21 @@ vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex.obj: ../src/regex.cpp $(ALL_HEA
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_31.pdb ../src/regex_debug.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_31.pdb ../src/regex_synch.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_31.pdb ../src/static_mutex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -399,6 +435,6 @@ libboost_regex-vc7-mt-gdp-1_31_clean :
 	del vc7-stlport\libboost_regex-vc7-mt-gdp-1_31\*.exp
 	del vc7-stlport\libboost_regex-vc7-mt-gdp-1_31\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31.lib : vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-gdp-1_31.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31.lib : vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-gdp-1_31.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/winstances.obj
 
diff --git a/build/vc7.mak b/build/vc7.mak
index d79f03bd..5ea3e7e1 100644
--- a/build/vc7.mak
+++ b/build/vc7.mak
@@ -36,7 +36,7 @@ NULL=nul
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc7-s-1_31_dir ./vc7/libboost_regex-vc7-s-1_31.lib libboost_regex-vc7-mt-s-1_31_dir ./vc7/libboost_regex-vc7-mt-s-1_31.lib libboost_regex-vc7-sgd-1_31_dir ./vc7/libboost_regex-vc7-sgd-1_31.lib libboost_regex-vc7-mt-sgd-1_31_dir ./vc7/libboost_regex-vc7-mt-sgd-1_31.lib boost_regex-vc7-mt-gd-1_31_dir ./vc7/boost_regex-vc7-mt-gd-1_31.lib boost_regex-vc7-mt-1_31_dir ./vc7/boost_regex-vc7-mt-1_31.lib libboost_regex-vc7-mt-1_31_dir ./vc7/libboost_regex-vc7-mt-1_31.lib libboost_regex-vc7-mt-gd-1_31_dir ./vc7/libboost_regex-vc7-mt-gd-1_31.lib
 
@@ -70,9 +70,6 @@ main_dir :
 vc7/libboost_regex-vc7-s-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_31/ -Fdvc7/libboost_regex-vc7-s-1_31.pdb ../src/c_regex_traits.cpp
 
-vc7/libboost_regex-vc7-s-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_31/ -Fdvc7/libboost_regex-vc7-s-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc7/libboost_regex-vc7-s-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_31/ -Fdvc7/libboost_regex-vc7-s-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -94,12 +91,21 @@ vc7/libboost_regex-vc7-s-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc7/libboost_regex-vc7-s-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_31/ -Fdvc7/libboost_regex-vc7-s-1_31.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-s-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_31/ -Fdvc7/libboost_regex-vc7-s-1_31.pdb ../src/regex_synch.cpp
+vc7/libboost_regex-vc7-s-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_31/ -Fdvc7/libboost_regex-vc7-s-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc7/libboost_regex-vc7-s-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_31/ -Fdvc7/libboost_regex-vc7-s-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc7/libboost_regex-vc7-s-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_31/ -Fdvc7/libboost_regex-vc7-s-1_31.pdb ../src/static_mutex.cpp
 
 vc7/libboost_regex-vc7-s-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_31/ -Fdvc7/libboost_regex-vc7-s-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc7/libboost_regex-vc7-s-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_31/ -Fdvc7/libboost_regex-vc7-s-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc7/libboost_regex-vc7-s-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_31/ -Fdvc7/libboost_regex-vc7-s-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -115,8 +121,8 @@ libboost_regex-vc7-s-1_31_clean :
 	del vc7\libboost_regex-vc7-s-1_31\*.exp
 	del vc7\libboost_regex-vc7-s-1_31\*.pch
 
-./vc7/libboost_regex-vc7-s-1_31.lib : vc7/libboost_regex-vc7-s-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/c_regex_traits_common.obj vc7/libboost_regex-vc7-s-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/cregex.obj vc7/libboost_regex-vc7-s-1_31/fileiter.obj vc7/libboost_regex-vc7-s-1_31/instances.obj vc7/libboost_regex-vc7-s-1_31/posix_api.obj vc7/libboost_regex-vc7-s-1_31/regex.obj vc7/libboost_regex-vc7-s-1_31/regex_debug.obj vc7/libboost_regex-vc7-s-1_31/regex_synch.obj vc7/libboost_regex-vc7-s-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_31/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-s-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-s-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/c_regex_traits_common.obj vc7/libboost_regex-vc7-s-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/cregex.obj vc7/libboost_regex-vc7-s-1_31/fileiter.obj vc7/libboost_regex-vc7-s-1_31/instances.obj vc7/libboost_regex-vc7-s-1_31/posix_api.obj vc7/libboost_regex-vc7-s-1_31/regex.obj vc7/libboost_regex-vc7-s-1_31/regex_debug.obj vc7/libboost_regex-vc7-s-1_31/regex_synch.obj vc7/libboost_regex-vc7-s-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_31/winstances.obj
+./vc7/libboost_regex-vc7-s-1_31.lib : vc7/libboost_regex-vc7-s-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/cregex.obj vc7/libboost_regex-vc7-s-1_31/fileiter.obj vc7/libboost_regex-vc7-s-1_31/instances.obj vc7/libboost_regex-vc7-s-1_31/posix_api.obj vc7/libboost_regex-vc7-s-1_31/regex.obj vc7/libboost_regex-vc7-s-1_31/regex_debug.obj vc7/libboost_regex-vc7-s-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-s-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-s-1_31/static_mutex.obj vc7/libboost_regex-vc7-s-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_31/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-s-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-s-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/cregex.obj vc7/libboost_regex-vc7-s-1_31/fileiter.obj vc7/libboost_regex-vc7-s-1_31/instances.obj vc7/libboost_regex-vc7-s-1_31/posix_api.obj vc7/libboost_regex-vc7-s-1_31/regex.obj vc7/libboost_regex-vc7-s-1_31/regex_debug.obj vc7/libboost_regex-vc7-s-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-s-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-s-1_31/static_mutex.obj vc7/libboost_regex-vc7-s-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_31/winstances.obj
 
 ########################################################
 #
@@ -126,9 +132,6 @@ libboost_regex-vc7-s-1_31_clean :
 vc7/libboost_regex-vc7-mt-s-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_31/ -Fdvc7/libboost_regex-vc7-mt-s-1_31.pdb ../src/c_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_31/ -Fdvc7/libboost_regex-vc7-mt-s-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc7/libboost_regex-vc7-mt-s-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_31/ -Fdvc7/libboost_regex-vc7-mt-s-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -150,12 +153,21 @@ vc7/libboost_regex-vc7-mt-s-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc7/libboost_regex-vc7-mt-s-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_31/ -Fdvc7/libboost_regex-vc7-mt-s-1_31.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_31/ -Fdvc7/libboost_regex-vc7-mt-s-1_31.pdb ../src/regex_synch.cpp
+vc7/libboost_regex-vc7-mt-s-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_31/ -Fdvc7/libboost_regex-vc7-mt-s-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc7/libboost_regex-vc7-mt-s-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_31/ -Fdvc7/libboost_regex-vc7-mt-s-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc7/libboost_regex-vc7-mt-s-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_31/ -Fdvc7/libboost_regex-vc7-mt-s-1_31.pdb ../src/static_mutex.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_31/ -Fdvc7/libboost_regex-vc7-mt-s-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc7/libboost_regex-vc7-mt-s-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_31/ -Fdvc7/libboost_regex-vc7-mt-s-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc7/libboost_regex-vc7-mt-s-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_31/ -Fdvc7/libboost_regex-vc7-mt-s-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -171,8 +183,8 @@ libboost_regex-vc7-mt-s-1_31_clean :
 	del vc7\libboost_regex-vc7-mt-s-1_31\*.exp
 	del vc7\libboost_regex-vc7-mt-s-1_31\*.pch
 
-./vc7/libboost_regex-vc7-mt-s-1_31.lib : vc7/libboost_regex-vc7-mt-s-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-s-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/cregex.obj vc7/libboost_regex-vc7-mt-s-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_31/instances.obj vc7/libboost_regex-vc7-mt-s-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_31/regex.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_synch.obj vc7/libboost_regex-vc7-mt-s-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_31/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-s-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-s-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-s-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/cregex.obj vc7/libboost_regex-vc7-mt-s-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_31/instances.obj vc7/libboost_regex-vc7-mt-s-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_31/regex.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_synch.obj vc7/libboost_regex-vc7-mt-s-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_31/winstances.obj
+./vc7/libboost_regex-vc7-mt-s-1_31.lib : vc7/libboost_regex-vc7-mt-s-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/cregex.obj vc7/libboost_regex-vc7-mt-s-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_31/instances.obj vc7/libboost_regex-vc7-mt-s-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_31/regex.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-s-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-s-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_31/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-s-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-s-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/cregex.obj vc7/libboost_regex-vc7-mt-s-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_31/instances.obj vc7/libboost_regex-vc7-mt-s-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_31/regex.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-s-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-s-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_31/winstances.obj
 
 ########################################################
 #
@@ -182,9 +194,6 @@ libboost_regex-vc7-mt-s-1_31_clean :
 vc7/libboost_regex-vc7-sgd-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_31/ -Fdvc7/libboost_regex-vc7-sgd-1_31.pdb ../src/c_regex_traits.cpp
 
-vc7/libboost_regex-vc7-sgd-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_31/ -Fdvc7/libboost_regex-vc7-sgd-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc7/libboost_regex-vc7-sgd-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_31/ -Fdvc7/libboost_regex-vc7-sgd-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -206,12 +215,21 @@ vc7/libboost_regex-vc7-sgd-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc7/libboost_regex-vc7-sgd-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_31/ -Fdvc7/libboost_regex-vc7-sgd-1_31.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-sgd-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_31/ -Fdvc7/libboost_regex-vc7-sgd-1_31.pdb ../src/regex_synch.cpp
+vc7/libboost_regex-vc7-sgd-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_31/ -Fdvc7/libboost_regex-vc7-sgd-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc7/libboost_regex-vc7-sgd-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_31/ -Fdvc7/libboost_regex-vc7-sgd-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc7/libboost_regex-vc7-sgd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_31/ -Fdvc7/libboost_regex-vc7-sgd-1_31.pdb ../src/static_mutex.cpp
 
 vc7/libboost_regex-vc7-sgd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_31/ -Fdvc7/libboost_regex-vc7-sgd-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc7/libboost_regex-vc7-sgd-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_31/ -Fdvc7/libboost_regex-vc7-sgd-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc7/libboost_regex-vc7-sgd-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_31/ -Fdvc7/libboost_regex-vc7-sgd-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -227,8 +245,8 @@ libboost_regex-vc7-sgd-1_31_clean :
 	del vc7\libboost_regex-vc7-sgd-1_31\*.exp
 	del vc7\libboost_regex-vc7-sgd-1_31\*.pch
 
-./vc7/libboost_regex-vc7-sgd-1_31.lib : vc7/libboost_regex-vc7-sgd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/c_regex_traits_common.obj vc7/libboost_regex-vc7-sgd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/cregex.obj vc7/libboost_regex-vc7-sgd-1_31/fileiter.obj vc7/libboost_regex-vc7-sgd-1_31/instances.obj vc7/libboost_regex-vc7-sgd-1_31/posix_api.obj vc7/libboost_regex-vc7-sgd-1_31/regex.obj vc7/libboost_regex-vc7-sgd-1_31/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_31/regex_synch.obj vc7/libboost_regex-vc7-sgd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_31/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-sgd-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-sgd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/c_regex_traits_common.obj vc7/libboost_regex-vc7-sgd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/cregex.obj vc7/libboost_regex-vc7-sgd-1_31/fileiter.obj vc7/libboost_regex-vc7-sgd-1_31/instances.obj vc7/libboost_regex-vc7-sgd-1_31/posix_api.obj vc7/libboost_regex-vc7-sgd-1_31/regex.obj vc7/libboost_regex-vc7-sgd-1_31/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_31/regex_synch.obj vc7/libboost_regex-vc7-sgd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_31/winstances.obj
+./vc7/libboost_regex-vc7-sgd-1_31.lib : vc7/libboost_regex-vc7-sgd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/cregex.obj vc7/libboost_regex-vc7-sgd-1_31/fileiter.obj vc7/libboost_regex-vc7-sgd-1_31/instances.obj vc7/libboost_regex-vc7-sgd-1_31/posix_api.obj vc7/libboost_regex-vc7-sgd-1_31/regex.obj vc7/libboost_regex-vc7-sgd-1_31/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-sgd-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-sgd-1_31/static_mutex.obj vc7/libboost_regex-vc7-sgd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_31/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-sgd-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-sgd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/cregex.obj vc7/libboost_regex-vc7-sgd-1_31/fileiter.obj vc7/libboost_regex-vc7-sgd-1_31/instances.obj vc7/libboost_regex-vc7-sgd-1_31/posix_api.obj vc7/libboost_regex-vc7-sgd-1_31/regex.obj vc7/libboost_regex-vc7-sgd-1_31/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-sgd-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-sgd-1_31/static_mutex.obj vc7/libboost_regex-vc7-sgd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_31/winstances.obj
 
 ########################################################
 #
@@ -238,9 +256,6 @@ libboost_regex-vc7-sgd-1_31_clean :
 vc7/libboost_regex-vc7-mt-sgd-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_31/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_31.pdb ../src/c_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_31/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc7/libboost_regex-vc7-mt-sgd-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_31/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -262,12 +277,21 @@ vc7/libboost_regex-vc7-mt-sgd-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc7/libboost_regex-vc7-mt-sgd-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_31/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_31.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_31/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_31.pdb ../src/regex_synch.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_31/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc7/libboost_regex-vc7-mt-sgd-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_31/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc7/libboost_regex-vc7-mt-sgd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_31/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_31.pdb ../src/static_mutex.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_31/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc7/libboost_regex-vc7-mt-sgd-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_31/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc7/libboost_regex-vc7-mt-sgd-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_31/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -283,8 +307,8 @@ libboost_regex-vc7-mt-sgd-1_31_clean :
 	del vc7\libboost_regex-vc7-mt-sgd-1_31\*.exp
 	del vc7\libboost_regex-vc7-mt-sgd-1_31\*.pch
 
-./vc7/libboost_regex-vc7-mt-sgd-1_31.lib : vc7/libboost_regex-vc7-mt-sgd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-sgd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_31/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_synch.obj vc7/libboost_regex-vc7-mt-sgd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_31/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-sgd-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-sgd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-sgd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_31/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_synch.obj vc7/libboost_regex-vc7-mt-sgd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_31/winstances.obj
+./vc7/libboost_regex-vc7-mt-sgd-1_31.lib : vc7/libboost_regex-vc7-mt-sgd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_31/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-sgd-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_31/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-sgd-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-sgd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_31/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-sgd-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_31/winstances.obj
 
 ########################################################
 #
@@ -294,9 +318,6 @@ libboost_regex-vc7-mt-sgd-1_31_clean :
 vc7/boost_regex-vc7-mt-gd-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_31/ -Fdvc7/boost_regex-vc7-mt-gd-1_31.pdb ../src/c_regex_traits.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_31/ -Fdvc7/boost_regex-vc7-mt-gd-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc7/boost_regex-vc7-mt-gd-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_31/ -Fdvc7/boost_regex-vc7-mt-gd-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -318,12 +339,21 @@ vc7/boost_regex-vc7-mt-gd-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc7/boost_regex-vc7-mt-gd-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_31/ -Fdvc7/boost_regex-vc7-mt-gd-1_31.pdb ../src/regex_debug.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_31/ -Fdvc7/boost_regex-vc7-mt-gd-1_31.pdb ../src/regex_synch.cpp
+vc7/boost_regex-vc7-mt-gd-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_31/ -Fdvc7/boost_regex-vc7-mt-gd-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc7/boost_regex-vc7-mt-gd-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_31/ -Fdvc7/boost_regex-vc7-mt-gd-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc7/boost_regex-vc7-mt-gd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_31/ -Fdvc7/boost_regex-vc7-mt-gd-1_31.pdb ../src/static_mutex.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_31/ -Fdvc7/boost_regex-vc7-mt-gd-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc7/boost_regex-vc7-mt-gd-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_31/ -Fdvc7/boost_regex-vc7-mt-gd-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc7/boost_regex-vc7-mt-gd-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_31/ -Fdvc7/boost_regex-vc7-mt-gd-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -339,8 +369,8 @@ boost_regex-vc7-mt-gd-1_31_clean :
 	del vc7\boost_regex-vc7-mt-gd-1_31\*.exp
 	del vc7\boost_regex-vc7-mt-gd-1_31\*.pch
 
-./vc7/boost_regex-vc7-mt-gd-1_31.lib : vc7/boost_regex-vc7-mt-gd-1_31/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/c_regex_traits_common.obj vc7/boost_regex-vc7-mt-gd-1_31/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/cregex.obj vc7/boost_regex-vc7-mt-gd-1_31/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_31/instances.obj vc7/boost_regex-vc7-mt-gd-1_31/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_31/regex.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_synch.obj vc7/boost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7/boost_regex-vc7-mt-gd-1_31.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-gd-1_31.dll" /implib:"vc7/boost_regex-vc7-mt-gd-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7/boost_regex-vc7-mt-gd-1_31/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/c_regex_traits_common.obj vc7/boost_regex-vc7-mt-gd-1_31/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/cregex.obj vc7/boost_regex-vc7-mt-gd-1_31/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_31/instances.obj vc7/boost_regex-vc7-mt-gd-1_31/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_31/regex.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_synch.obj vc7/boost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_31/winstances.obj
+./vc7/boost_regex-vc7-mt-gd-1_31.lib : vc7/boost_regex-vc7-mt-gd-1_31/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/cregex.obj vc7/boost_regex-vc7-mt-gd-1_31/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_31/instances.obj vc7/boost_regex-vc7-mt-gd-1_31/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_31/regex.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-gd-1_31/static_mutex.obj vc7/boost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/wc_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7/boost_regex-vc7-mt-gd-1_31.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-gd-1_31.dll" /implib:"vc7/boost_regex-vc7-mt-gd-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7/boost_regex-vc7-mt-gd-1_31/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/cregex.obj vc7/boost_regex-vc7-mt-gd-1_31/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_31/instances.obj vc7/boost_regex-vc7-mt-gd-1_31/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_31/regex.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-gd-1_31/static_mutex.obj vc7/boost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/wc_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_31/winstances.obj
 
 ########################################################
 #
@@ -350,9 +380,6 @@ boost_regex-vc7-mt-gd-1_31_clean :
 vc7/boost_regex-vc7-mt-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_31/ -Fdvc7/boost_regex-vc7-mt-1_31.pdb ../src/c_regex_traits.cpp
 
-vc7/boost_regex-vc7-mt-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_31/ -Fdvc7/boost_regex-vc7-mt-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc7/boost_regex-vc7-mt-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_31/ -Fdvc7/boost_regex-vc7-mt-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -374,12 +401,21 @@ vc7/boost_regex-vc7-mt-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc7/boost_regex-vc7-mt-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_31/ -Fdvc7/boost_regex-vc7-mt-1_31.pdb ../src/regex_debug.cpp
 
-vc7/boost_regex-vc7-mt-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_31/ -Fdvc7/boost_regex-vc7-mt-1_31.pdb ../src/regex_synch.cpp
+vc7/boost_regex-vc7-mt-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_31/ -Fdvc7/boost_regex-vc7-mt-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc7/boost_regex-vc7-mt-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_31/ -Fdvc7/boost_regex-vc7-mt-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc7/boost_regex-vc7-mt-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_31/ -Fdvc7/boost_regex-vc7-mt-1_31.pdb ../src/static_mutex.cpp
 
 vc7/boost_regex-vc7-mt-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_31/ -Fdvc7/boost_regex-vc7-mt-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc7/boost_regex-vc7-mt-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_31/ -Fdvc7/boost_regex-vc7-mt-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc7/boost_regex-vc7-mt-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_31/ -Fdvc7/boost_regex-vc7-mt-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -395,8 +431,8 @@ boost_regex-vc7-mt-1_31_clean :
 	del vc7\boost_regex-vc7-mt-1_31\*.exp
 	del vc7\boost_regex-vc7-mt-1_31\*.pch
 
-./vc7/boost_regex-vc7-mt-1_31.lib : vc7/boost_regex-vc7-mt-1_31/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/c_regex_traits_common.obj vc7/boost_regex-vc7-mt-1_31/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/cregex.obj vc7/boost_regex-vc7-mt-1_31/fileiter.obj vc7/boost_regex-vc7-mt-1_31/instances.obj vc7/boost_regex-vc7-mt-1_31/posix_api.obj vc7/boost_regex-vc7-mt-1_31/regex.obj vc7/boost_regex-vc7-mt-1_31/regex_debug.obj vc7/boost_regex-vc7-mt-1_31/regex_synch.obj vc7/boost_regex-vc7-mt-1_31/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7/boost_regex-vc7-mt-1_31.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-1_31.dll" /implib:"vc7/boost_regex-vc7-mt-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7/boost_regex-vc7-mt-1_31/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/c_regex_traits_common.obj vc7/boost_regex-vc7-mt-1_31/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/cregex.obj vc7/boost_regex-vc7-mt-1_31/fileiter.obj vc7/boost_regex-vc7-mt-1_31/instances.obj vc7/boost_regex-vc7-mt-1_31/posix_api.obj vc7/boost_regex-vc7-mt-1_31/regex.obj vc7/boost_regex-vc7-mt-1_31/regex_debug.obj vc7/boost_regex-vc7-mt-1_31/regex_synch.obj vc7/boost_regex-vc7-mt-1_31/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_31/winstances.obj
+./vc7/boost_regex-vc7-mt-1_31.lib : vc7/boost_regex-vc7-mt-1_31/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/cregex.obj vc7/boost_regex-vc7-mt-1_31/fileiter.obj vc7/boost_regex-vc7-mt-1_31/instances.obj vc7/boost_regex-vc7-mt-1_31/posix_api.obj vc7/boost_regex-vc7-mt-1_31/regex.obj vc7/boost_regex-vc7-mt-1_31/regex_debug.obj vc7/boost_regex-vc7-mt-1_31/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-1_31/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-1_31/static_mutex.obj vc7/boost_regex-vc7-mt-1_31/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/wc_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7/boost_regex-vc7-mt-1_31.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-1_31.dll" /implib:"vc7/boost_regex-vc7-mt-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7/boost_regex-vc7-mt-1_31/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/cregex.obj vc7/boost_regex-vc7-mt-1_31/fileiter.obj vc7/boost_regex-vc7-mt-1_31/instances.obj vc7/boost_regex-vc7-mt-1_31/posix_api.obj vc7/boost_regex-vc7-mt-1_31/regex.obj vc7/boost_regex-vc7-mt-1_31/regex_debug.obj vc7/boost_regex-vc7-mt-1_31/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-1_31/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-1_31/static_mutex.obj vc7/boost_regex-vc7-mt-1_31/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/wc_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_31/winstances.obj
 
 ########################################################
 #
@@ -406,9 +442,6 @@ boost_regex-vc7-mt-1_31_clean :
 vc7/libboost_regex-vc7-mt-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_31/ -Fdvc7/libboost_regex-vc7-mt-1_31.pdb ../src/c_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_31/ -Fdvc7/libboost_regex-vc7-mt-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc7/libboost_regex-vc7-mt-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_31/ -Fdvc7/libboost_regex-vc7-mt-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -430,12 +463,21 @@ vc7/libboost_regex-vc7-mt-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc7/libboost_regex-vc7-mt-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_31/ -Fdvc7/libboost_regex-vc7-mt-1_31.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-mt-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_31/ -Fdvc7/libboost_regex-vc7-mt-1_31.pdb ../src/regex_synch.cpp
+vc7/libboost_regex-vc7-mt-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_31/ -Fdvc7/libboost_regex-vc7-mt-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc7/libboost_regex-vc7-mt-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_31/ -Fdvc7/libboost_regex-vc7-mt-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc7/libboost_regex-vc7-mt-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_31/ -Fdvc7/libboost_regex-vc7-mt-1_31.pdb ../src/static_mutex.cpp
 
 vc7/libboost_regex-vc7-mt-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_31/ -Fdvc7/libboost_regex-vc7-mt-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc7/libboost_regex-vc7-mt-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_31/ -Fdvc7/libboost_regex-vc7-mt-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc7/libboost_regex-vc7-mt-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_31/ -Fdvc7/libboost_regex-vc7-mt-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -451,8 +493,8 @@ libboost_regex-vc7-mt-1_31_clean :
 	del vc7\libboost_regex-vc7-mt-1_31\*.exp
 	del vc7\libboost_regex-vc7-mt-1_31\*.pch
 
-./vc7/libboost_regex-vc7-mt-1_31.lib : vc7/libboost_regex-vc7-mt-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/cregex.obj vc7/libboost_regex-vc7-mt-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-1_31/instances.obj vc7/libboost_regex-vc7-mt-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-1_31/regex.obj vc7/libboost_regex-vc7-mt-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-1_31/regex_synch.obj vc7/libboost_regex-vc7-mt-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_31/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/cregex.obj vc7/libboost_regex-vc7-mt-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-1_31/instances.obj vc7/libboost_regex-vc7-mt-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-1_31/regex.obj vc7/libboost_regex-vc7-mt-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-1_31/regex_synch.obj vc7/libboost_regex-vc7-mt-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_31/winstances.obj
+./vc7/libboost_regex-vc7-mt-1_31.lib : vc7/libboost_regex-vc7-mt-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/cregex.obj vc7/libboost_regex-vc7-mt-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-1_31/instances.obj vc7/libboost_regex-vc7-mt-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-1_31/regex.obj vc7/libboost_regex-vc7-mt-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_31/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/cregex.obj vc7/libboost_regex-vc7-mt-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-1_31/instances.obj vc7/libboost_regex-vc7-mt-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-1_31/regex.obj vc7/libboost_regex-vc7-mt-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_31/winstances.obj
 
 ########################################################
 #
@@ -462,9 +504,6 @@ libboost_regex-vc7-mt-1_31_clean :
 vc7/libboost_regex-vc7-mt-gd-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_31/ -Fdvc7/libboost_regex-vc7-mt-gd-1_31.pdb ../src/c_regex_traits.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_31/ -Fdvc7/libboost_regex-vc7-mt-gd-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc7/libboost_regex-vc7-mt-gd-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_31/ -Fdvc7/libboost_regex-vc7-mt-gd-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -486,12 +525,21 @@ vc7/libboost_regex-vc7-mt-gd-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc7/libboost_regex-vc7-mt-gd-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_31/ -Fdvc7/libboost_regex-vc7-mt-gd-1_31.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_31/ -Fdvc7/libboost_regex-vc7-mt-gd-1_31.pdb ../src/regex_synch.cpp
+vc7/libboost_regex-vc7-mt-gd-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_31/ -Fdvc7/libboost_regex-vc7-mt-gd-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc7/libboost_regex-vc7-mt-gd-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_31/ -Fdvc7/libboost_regex-vc7-mt-gd-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc7/libboost_regex-vc7-mt-gd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_31/ -Fdvc7/libboost_regex-vc7-mt-gd-1_31.pdb ../src/static_mutex.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_31/ -Fdvc7/libboost_regex-vc7-mt-gd-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc7/libboost_regex-vc7-mt-gd-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_31/ -Fdvc7/libboost_regex-vc7-mt-gd-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc7/libboost_regex-vc7-mt-gd-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_31/ -Fdvc7/libboost_regex-vc7-mt-gd-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -507,6 +555,6 @@ libboost_regex-vc7-mt-gd-1_31_clean :
 	del vc7\libboost_regex-vc7-mt-gd-1_31\*.exp
 	del vc7\libboost_regex-vc7-mt-gd-1_31\*.pch
 
-./vc7/libboost_regex-vc7-mt-gd-1_31.lib : vc7/libboost_regex-vc7-mt-gd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-gd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_31/instances.obj vc7/libboost_regex-vc7-mt-gd-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_synch.obj vc7/libboost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_31/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-gd-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-gd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-gd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_31/instances.obj vc7/libboost_regex-vc7-mt-gd-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_synch.obj vc7/libboost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_31/winstances.obj
+./vc7/libboost_regex-vc7-mt-gd-1_31.lib : vc7/libboost_regex-vc7-mt-gd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_31/instances.obj vc7/libboost_regex-vc7-mt-gd-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-gd-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_31/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-gd-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-gd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_31/instances.obj vc7/libboost_regex-vc7-mt-gd-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-gd-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_31/winstances.obj
 
diff --git a/build/vc71-stlport.mak b/build/vc71-stlport.mak
index a4dde955..983d482d 100644
--- a/build/vc71-stlport.mak
+++ b/build/vc71-stlport.mak
@@ -40,7 +40,7 @@ NULL=nul
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc71-mt-sp-1_31_dir ./vc71-stlport/libboost_regex-vc71-mt-sp-1_31.lib boost_regex-vc71-mt-p-1_31_dir ./vc71-stlport/boost_regex-vc71-mt-p-1_31.lib libboost_regex-vc71-mt-p-1_31_dir ./vc71-stlport/libboost_regex-vc71-mt-p-1_31.lib boost_regex-vc71-mt-gdp-1_31_dir ./vc71-stlport/boost_regex-vc71-mt-gdp-1_31.lib libboost_regex-vc71-mt-sgdp-1_31_dir ./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.lib libboost_regex-vc71-mt-gdp-1_31_dir ./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31.lib
 
@@ -74,9 +74,6 @@ stlport_check : $(STLPORT_PATH)\stlport\string
 vc71-stlport/libboost_regex-vc71-mt-sp-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_31.pdb ../src/c_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc71-stlport/libboost_regex-vc71-mt-sp-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -98,12 +95,21 @@ vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex.obj: ../src/regex.cpp $(ALL_HE
 vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_31.pdb ../src/regex_debug.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_31.pdb ../src/regex_synch.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_31.pdb ../src/static_mutex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc71-stlport/libboost_regex-vc71-mt-sp-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc71-stlport/libboost_regex-vc71-mt-sp-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -119,8 +125,8 @@ libboost_regex-vc71-mt-sp-1_31_clean :
 	del vc71-stlport\libboost_regex-vc71-mt-sp-1_31\*.exp
 	del vc71-stlport\libboost_regex-vc71-mt-sp-1_31\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-sp-1_31.lib : vc71-stlport/libboost_regex-vc71-mt-sp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sp-1_31.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-sp-1_31.lib : vc71-stlport/libboost_regex-vc71-mt-sp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sp-1_31.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/winstances.obj
 
 ########################################################
 #
@@ -130,9 +136,6 @@ libboost_regex-vc71-mt-sp-1_31_clean :
 vc71-stlport/boost_regex-vc71-mt-p-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_31.pdb ../src/c_regex_traits.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc71-stlport/boost_regex-vc71-mt-p-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -154,12 +157,21 @@ vc71-stlport/boost_regex-vc71-mt-p-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER
 vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_31.pdb ../src/regex_debug.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_31.pdb ../src/regex_synch.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc71-stlport/boost_regex-vc71-mt-p-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_31.pdb ../src/static_mutex.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc71-stlport/boost_regex-vc71-mt-p-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc71-stlport/boost_regex-vc71-mt-p-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -175,8 +187,8 @@ boost_regex-vc71-mt-p-1_31_clean :
 	del vc71-stlport\boost_regex-vc71-mt-p-1_31\*.exp
 	del vc71-stlport\boost_regex-vc71-mt-p-1_31\*.pch
 
-./vc71-stlport/boost_regex-vc71-mt-p-1_31.lib : vc71-stlport/boost_regex-vc71-mt-p-1_31/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/c_regex_traits_common.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_synch.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71-stlport/boost_regex-vc71-mt-p-1_31.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-p-1_31.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-p-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71-stlport/boost_regex-vc71-mt-p-1_31/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/c_regex_traits_common.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_synch.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/winstances.obj
+./vc71-stlport/boost_regex-vc71-mt-p-1_31.lib : vc71-stlport/boost_regex-vc71-mt-p-1_31/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71-stlport/boost_regex-vc71-mt-p-1_31.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-p-1_31.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-p-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71-stlport/boost_regex-vc71-mt-p-1_31/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/winstances.obj
 
 ########################################################
 #
@@ -186,9 +198,6 @@ boost_regex-vc71-mt-p-1_31_clean :
 vc71-stlport/libboost_regex-vc71-mt-p-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_31.pdb ../src/c_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc71-stlport/libboost_regex-vc71-mt-p-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -210,12 +219,21 @@ vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex.obj: ../src/regex.cpp $(ALL_HEA
 vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_31.pdb ../src/regex_debug.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_31.pdb ../src/regex_synch.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-p-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_31.pdb ../src/static_mutex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc71-stlport/libboost_regex-vc71-mt-p-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc71-stlport/libboost_regex-vc71-mt-p-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -231,8 +249,8 @@ libboost_regex-vc71-mt-p-1_31_clean :
 	del vc71-stlport\libboost_regex-vc71-mt-p-1_31\*.exp
 	del vc71-stlport\libboost_regex-vc71-mt-p-1_31\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-p-1_31.lib : vc71-stlport/libboost_regex-vc71-mt-p-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-p-1_31.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-p-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-p-1_31.lib : vc71-stlport/libboost_regex-vc71-mt-p-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-p-1_31.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-p-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/winstances.obj
 
 ########################################################
 #
@@ -242,9 +260,6 @@ libboost_regex-vc71-mt-p-1_31_clean :
 vc71-stlport/boost_regex-vc71-mt-gdp-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_31.pdb ../src/c_regex_traits.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc71-stlport/boost_regex-vc71-mt-gdp-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -266,12 +281,21 @@ vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex.obj: ../src/regex.cpp $(ALL_HEAD
 vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_31.pdb ../src/regex_debug.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_31.pdb ../src/regex_synch.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc71-stlport/boost_regex-vc71-mt-gdp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_31.pdb ../src/static_mutex.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc71-stlport/boost_regex-vc71-mt-gdp-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc71-stlport/boost_regex-vc71-mt-gdp-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -287,8 +311,8 @@ boost_regex-vc71-mt-gdp-1_31_clean :
 	del vc71-stlport\boost_regex-vc71-mt-gdp-1_31\*.exp
 	del vc71-stlport\boost_regex-vc71-mt-gdp-1_31\*.pch
 
-./vc71-stlport/boost_regex-vc71-mt-gdp-1_31.lib : vc71-stlport/boost_regex-vc71-mt-gdp-1_31/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/c_regex_traits_common.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_synch.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71-stlport/boost_regex-vc71-mt-gdp-1_31.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-gdp-1_31.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-gdp-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71-stlport/boost_regex-vc71-mt-gdp-1_31/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/c_regex_traits_common.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_synch.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/winstances.obj
+./vc71-stlport/boost_regex-vc71-mt-gdp-1_31.lib : vc71-stlport/boost_regex-vc71-mt-gdp-1_31/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71-stlport/boost_regex-vc71-mt-gdp-1_31.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-gdp-1_31.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-gdp-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71-stlport/boost_regex-vc71-mt-gdp-1_31/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/winstances.obj
 
 ########################################################
 #
@@ -298,9 +322,6 @@ boost_regex-vc71-mt-gdp-1_31_clean :
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.pdb ../src/c_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -322,12 +343,21 @@ vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex.obj: ../src/regex.cpp $(ALL_
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.pdb ../src/regex_debug.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.pdb ../src/regex_synch.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.pdb ../src/static_mutex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -343,8 +373,8 @@ libboost_regex-vc71-mt-sgdp-1_31_clean :
 	del vc71-stlport\libboost_regex-vc71-mt-sgdp-1_31\*.exp
 	del vc71-stlport\libboost_regex-vc71-mt-sgdp-1_31\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.lib : vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.lib : vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/winstances.obj
 
 ########################################################
 #
@@ -354,9 +384,6 @@ libboost_regex-vc71-mt-sgdp-1_31_clean :
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_31.pdb ../src/c_regex_traits.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -378,12 +405,21 @@ vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex.obj: ../src/regex.cpp $(ALL_H
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_31.pdb ../src/regex_debug.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_31.pdb ../src/regex_synch.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_31.pdb ../src/static_mutex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -399,6 +435,6 @@ libboost_regex-vc71-mt-gdp-1_31_clean :
 	del vc71-stlport\libboost_regex-vc71-mt-gdp-1_31\*.exp
 	del vc71-stlport\libboost_regex-vc71-mt-gdp-1_31\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31.lib : vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-gdp-1_31.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31.lib : vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-gdp-1_31.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/winstances.obj
 
diff --git a/build/vc71.mak b/build/vc71.mak
index 0c6454d7..25a06c9f 100644
--- a/build/vc71.mak
+++ b/build/vc71.mak
@@ -36,7 +36,7 @@ NULL=nul
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc71-s-1_31_dir ./vc71/libboost_regex-vc71-s-1_31.lib libboost_regex-vc71-mt-s-1_31_dir ./vc71/libboost_regex-vc71-mt-s-1_31.lib libboost_regex-vc71-sgd-1_31_dir ./vc71/libboost_regex-vc71-sgd-1_31.lib libboost_regex-vc71-mt-sgd-1_31_dir ./vc71/libboost_regex-vc71-mt-sgd-1_31.lib boost_regex-vc71-mt-gd-1_31_dir ./vc71/boost_regex-vc71-mt-gd-1_31.lib boost_regex-vc71-mt-1_31_dir ./vc71/boost_regex-vc71-mt-1_31.lib libboost_regex-vc71-mt-1_31_dir ./vc71/libboost_regex-vc71-mt-1_31.lib libboost_regex-vc71-mt-gd-1_31_dir ./vc71/libboost_regex-vc71-mt-gd-1_31.lib
 
@@ -70,9 +70,6 @@ main_dir :
 vc71/libboost_regex-vc71-s-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_31/ -Fdvc71/libboost_regex-vc71-s-1_31.pdb ../src/c_regex_traits.cpp
 
-vc71/libboost_regex-vc71-s-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_31/ -Fdvc71/libboost_regex-vc71-s-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc71/libboost_regex-vc71-s-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_31/ -Fdvc71/libboost_regex-vc71-s-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -94,12 +91,21 @@ vc71/libboost_regex-vc71-s-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc71/libboost_regex-vc71-s-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_31/ -Fdvc71/libboost_regex-vc71-s-1_31.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-s-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_31/ -Fdvc71/libboost_regex-vc71-s-1_31.pdb ../src/regex_synch.cpp
+vc71/libboost_regex-vc71-s-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_31/ -Fdvc71/libboost_regex-vc71-s-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc71/libboost_regex-vc71-s-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_31/ -Fdvc71/libboost_regex-vc71-s-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc71/libboost_regex-vc71-s-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_31/ -Fdvc71/libboost_regex-vc71-s-1_31.pdb ../src/static_mutex.cpp
 
 vc71/libboost_regex-vc71-s-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_31/ -Fdvc71/libboost_regex-vc71-s-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc71/libboost_regex-vc71-s-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_31/ -Fdvc71/libboost_regex-vc71-s-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc71/libboost_regex-vc71-s-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_31/ -Fdvc71/libboost_regex-vc71-s-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -115,8 +121,8 @@ libboost_regex-vc71-s-1_31_clean :
 	del vc71\libboost_regex-vc71-s-1_31\*.exp
 	del vc71\libboost_regex-vc71-s-1_31\*.pch
 
-./vc71/libboost_regex-vc71-s-1_31.lib : vc71/libboost_regex-vc71-s-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/c_regex_traits_common.obj vc71/libboost_regex-vc71-s-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/cregex.obj vc71/libboost_regex-vc71-s-1_31/fileiter.obj vc71/libboost_regex-vc71-s-1_31/instances.obj vc71/libboost_regex-vc71-s-1_31/posix_api.obj vc71/libboost_regex-vc71-s-1_31/regex.obj vc71/libboost_regex-vc71-s-1_31/regex_debug.obj vc71/libboost_regex-vc71-s-1_31/regex_synch.obj vc71/libboost_regex-vc71-s-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_31/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-s-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-s-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/c_regex_traits_common.obj vc71/libboost_regex-vc71-s-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/cregex.obj vc71/libboost_regex-vc71-s-1_31/fileiter.obj vc71/libboost_regex-vc71-s-1_31/instances.obj vc71/libboost_regex-vc71-s-1_31/posix_api.obj vc71/libboost_regex-vc71-s-1_31/regex.obj vc71/libboost_regex-vc71-s-1_31/regex_debug.obj vc71/libboost_regex-vc71-s-1_31/regex_synch.obj vc71/libboost_regex-vc71-s-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_31/winstances.obj
+./vc71/libboost_regex-vc71-s-1_31.lib : vc71/libboost_regex-vc71-s-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/cregex.obj vc71/libboost_regex-vc71-s-1_31/fileiter.obj vc71/libboost_regex-vc71-s-1_31/instances.obj vc71/libboost_regex-vc71-s-1_31/posix_api.obj vc71/libboost_regex-vc71-s-1_31/regex.obj vc71/libboost_regex-vc71-s-1_31/regex_debug.obj vc71/libboost_regex-vc71-s-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-s-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-s-1_31/static_mutex.obj vc71/libboost_regex-vc71-s-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_31/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-s-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-s-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/cregex.obj vc71/libboost_regex-vc71-s-1_31/fileiter.obj vc71/libboost_regex-vc71-s-1_31/instances.obj vc71/libboost_regex-vc71-s-1_31/posix_api.obj vc71/libboost_regex-vc71-s-1_31/regex.obj vc71/libboost_regex-vc71-s-1_31/regex_debug.obj vc71/libboost_regex-vc71-s-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-s-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-s-1_31/static_mutex.obj vc71/libboost_regex-vc71-s-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_31/winstances.obj
 
 ########################################################
 #
@@ -126,9 +132,6 @@ libboost_regex-vc71-s-1_31_clean :
 vc71/libboost_regex-vc71-mt-s-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_31/ -Fdvc71/libboost_regex-vc71-mt-s-1_31.pdb ../src/c_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_31/ -Fdvc71/libboost_regex-vc71-mt-s-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc71/libboost_regex-vc71-mt-s-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_31/ -Fdvc71/libboost_regex-vc71-mt-s-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -150,12 +153,21 @@ vc71/libboost_regex-vc71-mt-s-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc71/libboost_regex-vc71-mt-s-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_31/ -Fdvc71/libboost_regex-vc71-mt-s-1_31.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_31/ -Fdvc71/libboost_regex-vc71-mt-s-1_31.pdb ../src/regex_synch.cpp
+vc71/libboost_regex-vc71-mt-s-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_31/ -Fdvc71/libboost_regex-vc71-mt-s-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc71/libboost_regex-vc71-mt-s-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_31/ -Fdvc71/libboost_regex-vc71-mt-s-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc71/libboost_regex-vc71-mt-s-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_31/ -Fdvc71/libboost_regex-vc71-mt-s-1_31.pdb ../src/static_mutex.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_31/ -Fdvc71/libboost_regex-vc71-mt-s-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc71/libboost_regex-vc71-mt-s-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_31/ -Fdvc71/libboost_regex-vc71-mt-s-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc71/libboost_regex-vc71-mt-s-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_31/ -Fdvc71/libboost_regex-vc71-mt-s-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -171,8 +183,8 @@ libboost_regex-vc71-mt-s-1_31_clean :
 	del vc71\libboost_regex-vc71-mt-s-1_31\*.exp
 	del vc71\libboost_regex-vc71-mt-s-1_31\*.pch
 
-./vc71/libboost_regex-vc71-mt-s-1_31.lib : vc71/libboost_regex-vc71-mt-s-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-s-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/cregex.obj vc71/libboost_regex-vc71-mt-s-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_31/instances.obj vc71/libboost_regex-vc71-mt-s-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_31/regex.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_synch.obj vc71/libboost_regex-vc71-mt-s-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_31/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-s-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-s-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-s-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/cregex.obj vc71/libboost_regex-vc71-mt-s-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_31/instances.obj vc71/libboost_regex-vc71-mt-s-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_31/regex.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_synch.obj vc71/libboost_regex-vc71-mt-s-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_31/winstances.obj
+./vc71/libboost_regex-vc71-mt-s-1_31.lib : vc71/libboost_regex-vc71-mt-s-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/cregex.obj vc71/libboost_regex-vc71-mt-s-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_31/instances.obj vc71/libboost_regex-vc71-mt-s-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_31/regex.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-s-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-s-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_31/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-s-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-s-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/cregex.obj vc71/libboost_regex-vc71-mt-s-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_31/instances.obj vc71/libboost_regex-vc71-mt-s-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_31/regex.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-s-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-s-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_31/winstances.obj
 
 ########################################################
 #
@@ -182,9 +194,6 @@ libboost_regex-vc71-mt-s-1_31_clean :
 vc71/libboost_regex-vc71-sgd-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_31/ -Fdvc71/libboost_regex-vc71-sgd-1_31.pdb ../src/c_regex_traits.cpp
 
-vc71/libboost_regex-vc71-sgd-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_31/ -Fdvc71/libboost_regex-vc71-sgd-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc71/libboost_regex-vc71-sgd-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_31/ -Fdvc71/libboost_regex-vc71-sgd-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -206,12 +215,21 @@ vc71/libboost_regex-vc71-sgd-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc71/libboost_regex-vc71-sgd-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_31/ -Fdvc71/libboost_regex-vc71-sgd-1_31.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-sgd-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_31/ -Fdvc71/libboost_regex-vc71-sgd-1_31.pdb ../src/regex_synch.cpp
+vc71/libboost_regex-vc71-sgd-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_31/ -Fdvc71/libboost_regex-vc71-sgd-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc71/libboost_regex-vc71-sgd-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_31/ -Fdvc71/libboost_regex-vc71-sgd-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc71/libboost_regex-vc71-sgd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_31/ -Fdvc71/libboost_regex-vc71-sgd-1_31.pdb ../src/static_mutex.cpp
 
 vc71/libboost_regex-vc71-sgd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_31/ -Fdvc71/libboost_regex-vc71-sgd-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc71/libboost_regex-vc71-sgd-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_31/ -Fdvc71/libboost_regex-vc71-sgd-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc71/libboost_regex-vc71-sgd-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_31/ -Fdvc71/libboost_regex-vc71-sgd-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -227,8 +245,8 @@ libboost_regex-vc71-sgd-1_31_clean :
 	del vc71\libboost_regex-vc71-sgd-1_31\*.exp
 	del vc71\libboost_regex-vc71-sgd-1_31\*.pch
 
-./vc71/libboost_regex-vc71-sgd-1_31.lib : vc71/libboost_regex-vc71-sgd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/c_regex_traits_common.obj vc71/libboost_regex-vc71-sgd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/cregex.obj vc71/libboost_regex-vc71-sgd-1_31/fileiter.obj vc71/libboost_regex-vc71-sgd-1_31/instances.obj vc71/libboost_regex-vc71-sgd-1_31/posix_api.obj vc71/libboost_regex-vc71-sgd-1_31/regex.obj vc71/libboost_regex-vc71-sgd-1_31/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_31/regex_synch.obj vc71/libboost_regex-vc71-sgd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_31/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-sgd-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-sgd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/c_regex_traits_common.obj vc71/libboost_regex-vc71-sgd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/cregex.obj vc71/libboost_regex-vc71-sgd-1_31/fileiter.obj vc71/libboost_regex-vc71-sgd-1_31/instances.obj vc71/libboost_regex-vc71-sgd-1_31/posix_api.obj vc71/libboost_regex-vc71-sgd-1_31/regex.obj vc71/libboost_regex-vc71-sgd-1_31/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_31/regex_synch.obj vc71/libboost_regex-vc71-sgd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_31/winstances.obj
+./vc71/libboost_regex-vc71-sgd-1_31.lib : vc71/libboost_regex-vc71-sgd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/cregex.obj vc71/libboost_regex-vc71-sgd-1_31/fileiter.obj vc71/libboost_regex-vc71-sgd-1_31/instances.obj vc71/libboost_regex-vc71-sgd-1_31/posix_api.obj vc71/libboost_regex-vc71-sgd-1_31/regex.obj vc71/libboost_regex-vc71-sgd-1_31/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-sgd-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-sgd-1_31/static_mutex.obj vc71/libboost_regex-vc71-sgd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_31/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-sgd-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-sgd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/cregex.obj vc71/libboost_regex-vc71-sgd-1_31/fileiter.obj vc71/libboost_regex-vc71-sgd-1_31/instances.obj vc71/libboost_regex-vc71-sgd-1_31/posix_api.obj vc71/libboost_regex-vc71-sgd-1_31/regex.obj vc71/libboost_regex-vc71-sgd-1_31/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-sgd-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-sgd-1_31/static_mutex.obj vc71/libboost_regex-vc71-sgd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_31/winstances.obj
 
 ########################################################
 #
@@ -238,9 +256,6 @@ libboost_regex-vc71-sgd-1_31_clean :
 vc71/libboost_regex-vc71-mt-sgd-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_31/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_31.pdb ../src/c_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_31/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc71/libboost_regex-vc71-mt-sgd-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_31/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -262,12 +277,21 @@ vc71/libboost_regex-vc71-mt-sgd-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc71/libboost_regex-vc71-mt-sgd-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_31/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_31.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_31/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_31.pdb ../src/regex_synch.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_31/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc71/libboost_regex-vc71-mt-sgd-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_31/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc71/libboost_regex-vc71-mt-sgd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_31/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_31.pdb ../src/static_mutex.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_31/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc71/libboost_regex-vc71-mt-sgd-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_31/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc71/libboost_regex-vc71-mt-sgd-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_31/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -283,8 +307,8 @@ libboost_regex-vc71-mt-sgd-1_31_clean :
 	del vc71\libboost_regex-vc71-mt-sgd-1_31\*.exp
 	del vc71\libboost_regex-vc71-mt-sgd-1_31\*.pch
 
-./vc71/libboost_regex-vc71-mt-sgd-1_31.lib : vc71/libboost_regex-vc71-mt-sgd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-sgd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_31/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_synch.obj vc71/libboost_regex-vc71-mt-sgd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_31/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-sgd-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-sgd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-sgd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_31/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_synch.obj vc71/libboost_regex-vc71-mt-sgd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_31/winstances.obj
+./vc71/libboost_regex-vc71-mt-sgd-1_31.lib : vc71/libboost_regex-vc71-mt-sgd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_31/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-sgd-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_31/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-sgd-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-sgd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_31/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-sgd-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_31/winstances.obj
 
 ########################################################
 #
@@ -294,9 +318,6 @@ libboost_regex-vc71-mt-sgd-1_31_clean :
 vc71/boost_regex-vc71-mt-gd-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_31/ -Fdvc71/boost_regex-vc71-mt-gd-1_31.pdb ../src/c_regex_traits.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_31/ -Fdvc71/boost_regex-vc71-mt-gd-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc71/boost_regex-vc71-mt-gd-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_31/ -Fdvc71/boost_regex-vc71-mt-gd-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -318,12 +339,21 @@ vc71/boost_regex-vc71-mt-gd-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc71/boost_regex-vc71-mt-gd-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_31/ -Fdvc71/boost_regex-vc71-mt-gd-1_31.pdb ../src/regex_debug.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_31/ -Fdvc71/boost_regex-vc71-mt-gd-1_31.pdb ../src/regex_synch.cpp
+vc71/boost_regex-vc71-mt-gd-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_31/ -Fdvc71/boost_regex-vc71-mt-gd-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc71/boost_regex-vc71-mt-gd-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_31/ -Fdvc71/boost_regex-vc71-mt-gd-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc71/boost_regex-vc71-mt-gd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_31/ -Fdvc71/boost_regex-vc71-mt-gd-1_31.pdb ../src/static_mutex.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_31/ -Fdvc71/boost_regex-vc71-mt-gd-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc71/boost_regex-vc71-mt-gd-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_31/ -Fdvc71/boost_regex-vc71-mt-gd-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc71/boost_regex-vc71-mt-gd-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_31/ -Fdvc71/boost_regex-vc71-mt-gd-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -339,8 +369,8 @@ boost_regex-vc71-mt-gd-1_31_clean :
 	del vc71\boost_regex-vc71-mt-gd-1_31\*.exp
 	del vc71\boost_regex-vc71-mt-gd-1_31\*.pch
 
-./vc71/boost_regex-vc71-mt-gd-1_31.lib : vc71/boost_regex-vc71-mt-gd-1_31/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/c_regex_traits_common.obj vc71/boost_regex-vc71-mt-gd-1_31/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/cregex.obj vc71/boost_regex-vc71-mt-gd-1_31/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_31/instances.obj vc71/boost_regex-vc71-mt-gd-1_31/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_31/regex.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_synch.obj vc71/boost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71/boost_regex-vc71-mt-gd-1_31.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-gd-1_31.dll" /implib:"vc71/boost_regex-vc71-mt-gd-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71/boost_regex-vc71-mt-gd-1_31/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/c_regex_traits_common.obj vc71/boost_regex-vc71-mt-gd-1_31/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/cregex.obj vc71/boost_regex-vc71-mt-gd-1_31/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_31/instances.obj vc71/boost_regex-vc71-mt-gd-1_31/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_31/regex.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_synch.obj vc71/boost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_31/winstances.obj
+./vc71/boost_regex-vc71-mt-gd-1_31.lib : vc71/boost_regex-vc71-mt-gd-1_31/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/cregex.obj vc71/boost_regex-vc71-mt-gd-1_31/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_31/instances.obj vc71/boost_regex-vc71-mt-gd-1_31/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_31/regex.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-gd-1_31/static_mutex.obj vc71/boost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/wc_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71/boost_regex-vc71-mt-gd-1_31.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-gd-1_31.dll" /implib:"vc71/boost_regex-vc71-mt-gd-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71/boost_regex-vc71-mt-gd-1_31/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/cregex.obj vc71/boost_regex-vc71-mt-gd-1_31/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_31/instances.obj vc71/boost_regex-vc71-mt-gd-1_31/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_31/regex.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-gd-1_31/static_mutex.obj vc71/boost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/wc_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_31/winstances.obj
 
 ########################################################
 #
@@ -350,9 +380,6 @@ boost_regex-vc71-mt-gd-1_31_clean :
 vc71/boost_regex-vc71-mt-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_31/ -Fdvc71/boost_regex-vc71-mt-1_31.pdb ../src/c_regex_traits.cpp
 
-vc71/boost_regex-vc71-mt-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_31/ -Fdvc71/boost_regex-vc71-mt-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc71/boost_regex-vc71-mt-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_31/ -Fdvc71/boost_regex-vc71-mt-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -374,12 +401,21 @@ vc71/boost_regex-vc71-mt-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc71/boost_regex-vc71-mt-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_31/ -Fdvc71/boost_regex-vc71-mt-1_31.pdb ../src/regex_debug.cpp
 
-vc71/boost_regex-vc71-mt-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_31/ -Fdvc71/boost_regex-vc71-mt-1_31.pdb ../src/regex_synch.cpp
+vc71/boost_regex-vc71-mt-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_31/ -Fdvc71/boost_regex-vc71-mt-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc71/boost_regex-vc71-mt-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_31/ -Fdvc71/boost_regex-vc71-mt-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc71/boost_regex-vc71-mt-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_31/ -Fdvc71/boost_regex-vc71-mt-1_31.pdb ../src/static_mutex.cpp
 
 vc71/boost_regex-vc71-mt-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_31/ -Fdvc71/boost_regex-vc71-mt-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc71/boost_regex-vc71-mt-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_31/ -Fdvc71/boost_regex-vc71-mt-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc71/boost_regex-vc71-mt-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_31/ -Fdvc71/boost_regex-vc71-mt-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -395,8 +431,8 @@ boost_regex-vc71-mt-1_31_clean :
 	del vc71\boost_regex-vc71-mt-1_31\*.exp
 	del vc71\boost_regex-vc71-mt-1_31\*.pch
 
-./vc71/boost_regex-vc71-mt-1_31.lib : vc71/boost_regex-vc71-mt-1_31/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/c_regex_traits_common.obj vc71/boost_regex-vc71-mt-1_31/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/cregex.obj vc71/boost_regex-vc71-mt-1_31/fileiter.obj vc71/boost_regex-vc71-mt-1_31/instances.obj vc71/boost_regex-vc71-mt-1_31/posix_api.obj vc71/boost_regex-vc71-mt-1_31/regex.obj vc71/boost_regex-vc71-mt-1_31/regex_debug.obj vc71/boost_regex-vc71-mt-1_31/regex_synch.obj vc71/boost_regex-vc71-mt-1_31/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71/boost_regex-vc71-mt-1_31.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-1_31.dll" /implib:"vc71/boost_regex-vc71-mt-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71/boost_regex-vc71-mt-1_31/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/c_regex_traits_common.obj vc71/boost_regex-vc71-mt-1_31/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/cregex.obj vc71/boost_regex-vc71-mt-1_31/fileiter.obj vc71/boost_regex-vc71-mt-1_31/instances.obj vc71/boost_regex-vc71-mt-1_31/posix_api.obj vc71/boost_regex-vc71-mt-1_31/regex.obj vc71/boost_regex-vc71-mt-1_31/regex_debug.obj vc71/boost_regex-vc71-mt-1_31/regex_synch.obj vc71/boost_regex-vc71-mt-1_31/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_31/winstances.obj
+./vc71/boost_regex-vc71-mt-1_31.lib : vc71/boost_regex-vc71-mt-1_31/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/cregex.obj vc71/boost_regex-vc71-mt-1_31/fileiter.obj vc71/boost_regex-vc71-mt-1_31/instances.obj vc71/boost_regex-vc71-mt-1_31/posix_api.obj vc71/boost_regex-vc71-mt-1_31/regex.obj vc71/boost_regex-vc71-mt-1_31/regex_debug.obj vc71/boost_regex-vc71-mt-1_31/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-1_31/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-1_31/static_mutex.obj vc71/boost_regex-vc71-mt-1_31/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/wc_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71/boost_regex-vc71-mt-1_31.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-1_31.dll" /implib:"vc71/boost_regex-vc71-mt-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71/boost_regex-vc71-mt-1_31/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/cregex.obj vc71/boost_regex-vc71-mt-1_31/fileiter.obj vc71/boost_regex-vc71-mt-1_31/instances.obj vc71/boost_regex-vc71-mt-1_31/posix_api.obj vc71/boost_regex-vc71-mt-1_31/regex.obj vc71/boost_regex-vc71-mt-1_31/regex_debug.obj vc71/boost_regex-vc71-mt-1_31/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-1_31/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-1_31/static_mutex.obj vc71/boost_regex-vc71-mt-1_31/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/wc_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_31/winstances.obj
 
 ########################################################
 #
@@ -406,9 +442,6 @@ boost_regex-vc71-mt-1_31_clean :
 vc71/libboost_regex-vc71-mt-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_31/ -Fdvc71/libboost_regex-vc71-mt-1_31.pdb ../src/c_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_31/ -Fdvc71/libboost_regex-vc71-mt-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc71/libboost_regex-vc71-mt-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_31/ -Fdvc71/libboost_regex-vc71-mt-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -430,12 +463,21 @@ vc71/libboost_regex-vc71-mt-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc71/libboost_regex-vc71-mt-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_31/ -Fdvc71/libboost_regex-vc71-mt-1_31.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-mt-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_31/ -Fdvc71/libboost_regex-vc71-mt-1_31.pdb ../src/regex_synch.cpp
+vc71/libboost_regex-vc71-mt-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_31/ -Fdvc71/libboost_regex-vc71-mt-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc71/libboost_regex-vc71-mt-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_31/ -Fdvc71/libboost_regex-vc71-mt-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc71/libboost_regex-vc71-mt-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_31/ -Fdvc71/libboost_regex-vc71-mt-1_31.pdb ../src/static_mutex.cpp
 
 vc71/libboost_regex-vc71-mt-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_31/ -Fdvc71/libboost_regex-vc71-mt-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc71/libboost_regex-vc71-mt-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_31/ -Fdvc71/libboost_regex-vc71-mt-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc71/libboost_regex-vc71-mt-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_31/ -Fdvc71/libboost_regex-vc71-mt-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -451,8 +493,8 @@ libboost_regex-vc71-mt-1_31_clean :
 	del vc71\libboost_regex-vc71-mt-1_31\*.exp
 	del vc71\libboost_regex-vc71-mt-1_31\*.pch
 
-./vc71/libboost_regex-vc71-mt-1_31.lib : vc71/libboost_regex-vc71-mt-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/cregex.obj vc71/libboost_regex-vc71-mt-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-1_31/instances.obj vc71/libboost_regex-vc71-mt-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-1_31/regex.obj vc71/libboost_regex-vc71-mt-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-1_31/regex_synch.obj vc71/libboost_regex-vc71-mt-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_31/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/cregex.obj vc71/libboost_regex-vc71-mt-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-1_31/instances.obj vc71/libboost_regex-vc71-mt-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-1_31/regex.obj vc71/libboost_regex-vc71-mt-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-1_31/regex_synch.obj vc71/libboost_regex-vc71-mt-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_31/winstances.obj
+./vc71/libboost_regex-vc71-mt-1_31.lib : vc71/libboost_regex-vc71-mt-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/cregex.obj vc71/libboost_regex-vc71-mt-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-1_31/instances.obj vc71/libboost_regex-vc71-mt-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-1_31/regex.obj vc71/libboost_regex-vc71-mt-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_31/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/cregex.obj vc71/libboost_regex-vc71-mt-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-1_31/instances.obj vc71/libboost_regex-vc71-mt-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-1_31/regex.obj vc71/libboost_regex-vc71-mt-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_31/winstances.obj
 
 ########################################################
 #
@@ -462,9 +504,6 @@ libboost_regex-vc71-mt-1_31_clean :
 vc71/libboost_regex-vc71-mt-gd-1_31/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_31/ -Fdvc71/libboost_regex-vc71-mt-gd-1_31.pdb ../src/c_regex_traits.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_31/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_31/ -Fdvc71/libboost_regex-vc71-mt-gd-1_31.pdb ../src/c_regex_traits_common.cpp
-
 vc71/libboost_regex-vc71-mt-gd-1_31/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_31/ -Fdvc71/libboost_regex-vc71-mt-gd-1_31.pdb ../src/cpp_regex_traits.cpp
 
@@ -486,12 +525,21 @@ vc71/libboost_regex-vc71-mt-gd-1_31/regex.obj: ../src/regex.cpp $(ALL_HEADER)
 vc71/libboost_regex-vc71-mt-gd-1_31/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_31/ -Fdvc71/libboost_regex-vc71-mt-gd-1_31.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_31/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_31/ -Fdvc71/libboost_regex-vc71-mt-gd-1_31.pdb ../src/regex_synch.cpp
+vc71/libboost_regex-vc71-mt-gd-1_31/regex_raw_buffer.obj: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_31/ -Fdvc71/libboost_regex-vc71-mt-gd-1_31.pdb ../src/regex_raw_buffer.cpp
+
+vc71/libboost_regex-vc71-mt-gd-1_31/regex_traits_defaults.obj: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_31/ -Fdvc71/libboost_regex-vc71-mt-gd-1_31.pdb ../src/regex_traits_defaults.cpp
+
+vc71/libboost_regex-vc71-mt-gd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_31/ -Fdvc71/libboost_regex-vc71-mt-gd-1_31.pdb ../src/static_mutex.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_31/ -Fdvc71/libboost_regex-vc71-mt-gd-1_31.pdb ../src/w32_regex_traits.cpp
 
+vc71/libboost_regex-vc71-mt-gd-1_31/wc_regex_traits.obj: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_31/ -Fdvc71/libboost_regex-vc71-mt-gd-1_31.pdb ../src/wc_regex_traits.cpp
+
 vc71/libboost_regex-vc71-mt-gd-1_31/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_31/ -Fdvc71/libboost_regex-vc71-mt-gd-1_31.pdb ../src/wide_posix_api.cpp
 
@@ -507,6 +555,6 @@ libboost_regex-vc71-mt-gd-1_31_clean :
 	del vc71\libboost_regex-vc71-mt-gd-1_31\*.exp
 	del vc71\libboost_regex-vc71-mt-gd-1_31\*.pch
 
-./vc71/libboost_regex-vc71-mt-gd-1_31.lib : vc71/libboost_regex-vc71-mt-gd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-gd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_31/instances.obj vc71/libboost_regex-vc71-mt-gd-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_synch.obj vc71/libboost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_31/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-gd-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-gd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-gd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_31/instances.obj vc71/libboost_regex-vc71-mt-gd-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_synch.obj vc71/libboost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_31/winstances.obj
+./vc71/libboost_regex-vc71-mt-gd-1_31.lib : vc71/libboost_regex-vc71-mt-gd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_31/instances.obj vc71/libboost_regex-vc71-mt-gd-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-gd-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_31/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-gd-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-gd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_31/instances.obj vc71/libboost_regex-vc71-mt-gd-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-gd-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_31/winstances.obj
 
diff --git a/doc/Attic/bad_expression.html b/doc/Attic/bad_expression.html
index 00523b5a..6fa0b886 100644
--- a/doc/Attic/bad_expression.html
+++ b/doc/Attic/bad_expression.html
@@ -15,7 +15,7 @@
             </td>
             <td width="353">
                <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">class bad_expression</h2>
+               <h2 align="center">class regex_error</h2>
             </td>
             <td width="50">
                <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
@@ -27,49 +27,52 @@
       <hr>
       <h3>Synopsis</h3>
       <p>#include &lt;<a href="../../../boost/regex/pattern_except.hpp">boost/pattern_except.hpp</a>&gt;</p>
-      <p>The class <code>bad_expression</code> defines the type of objects thrown as 
+      <p>The class <code>regex_error</code> defines the type of objects thrown as 
          exceptions to report errors during the conversion from a string representing a 
          regular expression to a finite state machine.&nbsp;&nbsp;</p>
       <pre>
 <b>namespace</b> boost{
 
-<b>class</b> bad_pattern : <b>public</b> std::runtime_error
+<b>class</b> regex_error : <b>public</b> std::runtime_error
 {
 <b>public</b>:
-   <b>explicit</b> bad_pattern(<b>const</b> std::string&amp; s) : std::runtime_error(s){};
-};
-
-<b>class</b> bad_expression : <b>public</b> bad_pattern
-{
-<b>public</b>:
-   bad_expression(<b>const</b> std::string&amp; s) : bad_pattern(s) {}
+   <b>explicit</b> regex_error(<b>const</b> std::string& s, <a href="error_type.html">regex_constants::error_type err</a>, std::ptrdiff_t pos);
+   <b>explicit</b> regex_error(<a href="error_type.html">boost::regex_constants::error_type err</a>);
+   <a href="error_type.html">boost::regex_constants::error_type</a> code()<b>const</b>;
+   std::ptrdiff_t position()<b>const</b>;
 };
 
+typedef regex_error bad_pattern; // for backwards compatibily
+typedef regex_error bad_expression; // for backwards compatibility
 
 } // namespace boost
 </pre>
       <h3>Description</h3>
       <pre>
-bad_expression(const string&amp; what_arg);
-</pre>
-      <p><b>Effects:</b> Constructs an object of class <code>bad_expression</code>.</p>
-      <b></b>
-      <p><b>Postcondition:</b> <code>strcmp(what(), what_arg.c_str()) == 0</code>.</p>
-      <p>Footnotes: the class <i>bad_pattern</i> forms the base class for all 
-         pattern-matching exceptions, of which <i>bad_expression</i> is one. The choice 
-         of <i>std::runtime_error</i> as the base class for <i>bad_pattern</i> is moot; 
-         depending upon how the library is used exceptions may be either logic errors 
-         (programmer supplied expressions) or run time errors (user supplied 
-         expressions).</p>
+regex_error(<b>const</b> std::string& s, <a href="error_type.html">regex_constants::error_type</a> err, std::ptrdiff_t pos);
+regex_error(<a href="error_type.html">boost::regex_constants::error_type err</a>);</pre>
+      <p><b>Effects:</b> Constructs an object of class <code>regex_error</code>.</p>
+      <pre>
+<a href="error_type.html">boost::regex_constants::error_type</a> code()<b>const</b>;</pre>
+      <p><b>Effects:</b> returns the error code that represents parsing error that occured.</p>
+      <pre>
+std::ptrdiff_t position()<b>const</b>; </pre>
+      <p><b>Effects:</b> returns the location in the expression where parsing stopped.</p>
+      <P>Footnotes: the choice of <code>std::runtime_error</code> as the base class for <code>
+            regex_error</code> is moot; depending upon how the library is used 
+         exceptions may be either logic errors (programmer supplied expressions) or run 
+         time errors (user supplied expressions).&nbsp; The library previously used <code>bad_pattern</code>
+         and <code>bad_expression</code> for errors, these have been replaced by the 
+         single class <code>regex_error</code> to keep the library in synchronisation 
+         with the standardization proposal.</P>
       <p></p>
       <hr>
       <p>Revised 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         24&nbsp;June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/Attic/basic_regex.html b/doc/Attic/basic_regex.html
index 77e476b5..0a35289f 100644
--- a/doc/Attic/basic_regex.html
+++ b/doc/Attic/basic_regex.html
@@ -29,23 +29,22 @@
 #include &lt;<a href="../../../boost/regex.hpp">boost/regex.hpp</a>&gt;
 </pre>
       <p>The template class <em>basic_regex</em> encapsulates regular expression parsing 
-         and compilation. The class takes three template parameters:</p>
+         and compilation. The class takes two template parameters:</p>
       <p><b><i>charT</i></b>: determines the character type, i.e. either char or 
-         wchar_t.</p>
+         wchar_t; see <EM><A href="concepts.html#charT">charT concept</A></EM>.</p>
       <p><b><i>traits</i></b>: determines the behavior of the character type, for 
          example which character class names are recognized. A default traits class is 
-         provided: <a href="regex_traits.html">regex_traits&lt;charT&gt;</a>.</p>
-      <p><b><i>Allocator</i></b>: the allocator class used to allocate memory by the 
-         class.</p>
+         provided: <a href="regex_traits.html">regex_traits&lt;charT&gt;</a>.&nbsp; See 
+         also <EM><A href="concepts.html#traits">traits concept</A></EM>.</p>
       <p>For ease of use there are two typedefs that define the two standard <i>basic_regex</i>
-         instances, unless you want to use custom traits classes or allocators, you 
-         won't need to use anything other than these:</p>
+         instances, unless you want to use custom traits classes or non-standard 
+         character types, you won't need to use anything other than these:</p>
       <pre>
 <b>namespace</b> boost{
-<b>template</b> &lt;<b>class</b> charT, <b>class</b> traits = regex_traits&lt;charT&gt;, <b>class</b> Allocator = std::allocator&lt;charT&gt;  &gt;
+<b>template</b> &lt;<b>class</b> charT, <b>class</b> traits = regex_traits&lt;charT&gt;  &gt;
 <b>class</b> basic_regex;
-<b>typedef</b> basic_regex&lt;<b>char</b>&gt; regex;
-<b>typedef</b> basic_regex&lt;<b>wchar_t&gt;</b> wregex;
+<b>typedef</b> basic_regex&lt;<b>char</b>&gt;      regex;
+<b>typedef</b> basic_regex&lt;<b>wchar_t&gt;</b>   wregex;
 }
 </pre>
       <p>The definition of <i>basic_regex</i> follows: it is based very closely on class 
@@ -53,60 +52,60 @@
       <pre>
 namespace boost{
 
-template &lt;class charT,
-          class traits = regex_traits&lt;charT&gt;,
-          class Allocator = allocator&lt;charT&gt; &gt;
-class basic_regex
-{
-public:
+template &lt;class  charT, class traits = regex_traits&lt;charT&gt; &gt;
+class basic_regex {
+   public:          
    // types:
    typedef          charT                                value_type;
-   typedef          implementation defined               const_iterator;
-   typedef          const_iterator                       iterator;
-   typedef typename Allocator::reference                 reference;
-   typedef typename Allocator::const_reference           const_reference;
-   typedef typename Allocator::difference_type           difference_type;
-   typedef typename Allocator::size_type                 size_type;
-   typedef          Allocator                            allocator_type;
+   typedef          implementation-specific              const_iterator;
+   typedef          const_iterator                       iterator;                 
+   typedef          charT&amp;                               reference;           
+   typedef          const charT&amp;                         const_reference;           
+   typedef          std::ptrdiff_t                       difference_type;                 
+   typedef          std::size_t                          size_type;
    typedef          regex_constants::syntax_option_type  flag_type;
    typedef typename traits::locale_type                  locale_type;
 
    // constants:
-   static const regex_constants::syntax_option_type normal = regex_constants::normal;
-   static const regex_constants::syntax_option_type icase = regex_constants::icase;
-   static const regex_constants::syntax_option_type nosubs = regex_constants::nosubs;
-   static const regex_constants::syntax_option_type optimize = regex_constants::optimize;
-   static const regex_constants::syntax_option_type collate = regex_constants::collate;
-   static const regex_constants::syntax_option_type ECMAScript = normal;
-   static const regex_constants::syntax_option_type JavaScript = normal;
-   static const regex_constants::syntax_option_type JScript = normal;
-   // these flags are optional, if the functionality is supported
-   // then the flags shall take these names.
-   static const regex_constants::syntax_option_type basic = regex_constants::basic;
-   static const regex_constants::syntax_option_type extended = regex_constants::extended;
-   static const regex_constants::syntax_option_type awk = regex_constants::awk;
-   static const regex_constants::syntax_option_type grep = regex_constants::grep;
-   static const regex_constants::syntax_option_type egrep = regex_constants::egrep;
-   static const regex_constants::syntax_option_type sed = basic = regex_constants::sed;
-   static const regex_constants::syntax_option_type perl = regex_constants::perl;
+   // main option selection:
+   static const regex_constants::syntax_option_type normal          = regex_constants::normal;
+   static const regex_constants::syntax_option_type ECMAScript      = normal;
+   static const regex_constants::syntax_option_type JavaScript      = normal;
+   static const regex_constants::syntax_option_type JScript         = normal;
+   static const regex_constants::syntax_option_type basic           = regex_constants::basic;
+   static const regex_constants::syntax_option_type extended        = regex_constants::extended;
+   static const regex_constants::syntax_option_type awk             = regex_constants::awk;
+   static const regex_constants::syntax_option_type grep            = regex_constants::grep;
+   static const regex_constants::syntax_option_type egrep           = regex_constants::egrep;
+   static const regex_constants::syntax_option_type sed             = basic = regex_constants::sed;
+   static const regex_constants::syntax_option_type perl            = regex_constants::perl;
+   static const regex_constants::syntax_option_type literal         = regex_constants::literal;
+   // modifiers specific to perl expressions:
+   static const regex_constants::syntax_option_type no_mod_m        = regex_constants::no_mod_m;
+   static const regex_constants::syntax_option_type no_mod_s        = regex_constants::no_mod_s;
+   static const regex_constants::syntax_option_type mod_s           = regex_constants::mod_s;
+   static const regex_constants::syntax_option_type mod_x           = regex_constants::mod_x;
+   // modifiers specific to POSIX basic expressions:
+   static const regex_constants::syntax_option_type bk_plus_qm      = regex_constants::bk_plus_qm;
+   static const regex_constants::syntax_option_type bk_vbar         = regex_constants::bk_vbar
+   static const regex_constants::syntax_option_type no_char_classes = regex_constants::no_char_classes
+   static const regex_constants::syntax_option_type no_intervals    = regex_constants::no_intervals
+   // common modifiers:
+   static const regex_constants::syntax_option_type nosubs          = regex_constants::nosubs;
+   static const regex_constants::syntax_option_type optimize        = regex_constants::optimize;
+   static const regex_constants::syntax_option_type collate         = regex_constants::collate;
+   static const regex_constants::syntax_option_type newline_alt     = regex_constants::newline_alt;
 
    // construct/copy/destroy:
-   explicit <A href="#c1">basic_regex</A>(const Allocator&amp; a = Allocator());
-   explicit <A href="#c2">basic_regex</A>(const charT* p, flag_type f = regex_constants::normal,
-                        const Allocator&amp; a = Allocator());
-   <A href="#c3">basic_regex</A>(const charT* p1, const charT* p2, flag_type f = regex_constants::normal,
-               const Allocator&amp; a = Allocator());
-   <A href="#c4">basic_regex</A>(const charT* p, size_type len, flag_type f,
-               const Allocator&amp; a = Allocator());
+   explicit <A href="#c1">basic_regex</A> ();
+   explicit <A href="#c2">basic_regex</A>(const  charT* p, flag_type f = regex_constants::normal);
+   <A href="#c3">basic_regex</A>(const charT* p1, const  charT* p2, flag_type f = regex_constants::normal);
+   <A href="#c4">basic_regex</A>(const charT* p, size_type len, flag_type  f);
    <A href="#c5">basic_regex</A>(const basic_regex&amp;);
    template &lt;class ST, class SA&gt;
-   explicit <A href="#c6">basic_regex</A>(const basic_string&lt;charT, ST, SA&gt;&amp; p,
-                        flag_type f = regex_constants::normal,
-                        const Allocator&amp; a = Allocator());
+   explicit <A href="#c6">basic_regex</A>(const basic_string&lt;charT, ST,  SA&gt;&amp; p, flag_type f = regex_constants::normal);
    template &lt;class InputIterator&gt;
-   <A href="#c7">basic_regex</A>(InputIterator first, inputIterator last,
-               flag_type f = regex_constants::normal,
-               const Allocator&amp; a = Allocator());
+   <A href="#c7">basic_regex</A>(InputIterator first,  InputIterator last, flag_type f = regex_constants::normal);
 
    ~basic_regex();
    basic_regex&amp; <A href="#o1">operator</A>=(const basic_regex&amp;);
@@ -134,7 +133,6 @@ public:
                        flag_type f = regex_constants::normal);
 
    // const operations:
-   Allocator <A href="#m7">get_allocator</A>() const;
    flag_type <A href="#m8">flags</A>() const;
    basic_string&lt;charT&gt; <A href="#m9">str</A>() const;
    int <A href="#m10">compare</A>(basic_regex&amp;) const;
@@ -182,21 +180,34 @@ typedef basic_regex&lt;wchar_t&gt; wregex;
       <p>Class&nbsp;<em>basic_regex</em> has the following public member functions:</p>
       <h4>basic_regex constants</h4>
       <pre>
-static const regex_constants::syntax_option_type normal = regex_constants::normal;
-static const regex_constants::syntax_option_type icase = regex_constants::icase;
-static const regex_constants::syntax_option_type nosubs = regex_constants::nosubs;
-static const regex_constants::syntax_option_type optimize = regex_constants::optimize;
-static const regex_constants::syntax_option_type collate = regex_constants::collate;
-static const regex_constants::syntax_option_type ECMAScript = normal;
-static const regex_constants::syntax_option_type JavaScript = normal;
-static const regex_constants::syntax_option_type JScript = normal;
-static const regex_constants::syntax_option_type basic = regex_constants::basic;
-static const regex_constants::syntax_option_type extended = regex_constants::extended;
-static const regex_constants::syntax_option_type awk = regex_constants::awk;
-static const regex_constants::syntax_option_type grep = regex_constants::grep;
-static const regex_constants::syntax_option_type egrep = regex_constants::egrep;
-static const regex_constants::syntax_option_type sed = basic = regex_constants::sed;
-static const regex_constants::syntax_option_type perl = regex_constants::perl;
+// main option selection:
+static const regex_constants::syntax_option_type normal           = regex_constants::normal;
+static const regex_constants::syntax_option_type ECMAScript       = normal;
+static const regex_constants::syntax_option_type JavaScript       = normal;
+static const regex_constants::syntax_option_type JScript          = normal;
+static const regex_constants::syntax_option_type basic            = regex_constants::basic;
+static const regex_constants::syntax_option_type extended         = regex_constants::extended;
+static const regex_constants::syntax_option_type awk              = regex_constants::awk;
+static const regex_constants::syntax_option_type grep             = regex_constants::grep;
+static const regex_constants::syntax_option_type egrep            = regex_constants::egrep;
+static const regex_constants::syntax_option_type sed              = regex_constants::sed;
+static const regex_constants::syntax_option_type perl             = regex_constants::perl;
+static const regex_constants::syntax_option_type literal          = regex_constants::literal;
+// modifiers specific to perl expressions:
+static const regex_constants::syntax_option_type no_mod_m         = regex_constants::no_mod_m;
+static const regex_constants::syntax_option_type no_mod_s         = regex_constants::no_mod_s;
+static const regex_constants::syntax_option_type mod_s            = regex_constants::mod_s;
+static const regex_constants::syntax_option_type mod_x            = regex_constants::mod_x;
+// modifiers specific to POSIX basic expressions:
+static const regex_constants::syntax_option_type bk_plus_qm       = regex_constants::bk_plus_qm;
+static const regex_constants::syntax_option_type bk_vbar          = regex_constants::bk_vbar
+static const regex_constants::syntax_option_type no_char_classes  = regex_constants::no_char_classes
+static const regex_constants::syntax_option_type no_intervals     = regex_constants::no_intervals
+// common modifiers:
+static const regex_constants::syntax_option_type nosubs           = regex_constants::nosubs;
+static const regex_constants::syntax_option_type optimize         = regex_constants::optimize;
+static const regex_constants::syntax_option_type collate          = regex_constants::collate;
+static const regex_constants::syntax_option_type newline_alt      = regex_constants::newline_alt;
 </pre>
       <p>The static constant members are provided as synonyms for the constants declared 
          in namespace <code>boost::regex_constants</code>; for each constant of type <code><A href="syntax_option_type.html">
@@ -204,11 +215,7 @@ static const regex_constants::syntax_option_type perl = regex_constants::perl;
          then a constant with the same name, type and value is declared within the scope 
          of <code>basic_regex</code>.</p>
       <h4>basic_regex constructors</h4>
-      <p>In all <code>basic_regex</code> constructors, a copy of the <code>Allocator</code>
-         argument is used for any memory allocation performed by the constructor or 
-         member functions during the lifetime of the object.</p>
-      <pre>
-basic_regex(const Allocator&amp; a = Allocator());
+      <pre> basic_regex();
 </pre>
       <P><b>Effects:</b> Constructs an object of class <code>basic_regex</code>. The 
          postconditions of this function are indicated in the table:</P>
@@ -252,7 +259,7 @@ basic_regex(const Allocator&amp; a = Allocator());
             </table>
          </center>
       </div>
-      <pre> <A name=c2></A>basic_regex(const charT* p, flag_type f = regex_constants::normal, const Allocator&amp; a = Allocator());
+      <pre><BR> basic_regex(const charT* p, flag_type f = regex_constants::normal);
  
 </pre>
       <P><b>Requires:</b> <i>p</i> shall not be a null pointer.</P>
@@ -322,7 +329,7 @@ basic_regex(const Allocator&amp; a = Allocator());
       <pre>
  
 </pre>
-      <PRE><A name=c3></A>basic_regex(const charT* p1, const charT* p2, flag_type f = regex_constants::normal, const Allocator&amp; a = Allocator());</PRE>
+      <PRE><A name=c3></A>basic_regex(const charT* p1, const charT* p2, flag_type f = regex_constants::normal);</PRE>
       <p><b>Requires:</b> <i>p1</i> and <i>p2</i> are not null pointers, <code>p1 &lt; p2</code>.</p>
       <p><b>Throws:</b> <code>bad_expression</code> if [p1,p2) is not a valid regular 
          expression.</p>
@@ -390,8 +397,7 @@ basic_regex(const Allocator&amp; a = Allocator());
       <pre>
  
 </pre>
-      <pre><A name=c4></A>
-basic_regex(const charT* p, size_type len, flag_type f, const Allocator&amp; a = Allocator());
+      <pre><A name=c4></A>basic_regex(const charT* p, size_type len, flag_type f);
 </pre>
       <p><b>Requires:</b> <i>p</i> shall not be a null pointer, <code>len &lt; max_size()</code>.</p>
       <p><b>Throws:</b> <code>bad_expression</code> if <i>p</i> is not a valid regular 
@@ -457,11 +463,7 @@ basic_regex(const charT* p, size_type len, flag_type f, const Allocator&amp; a =
             </table>
          </center>
       </div>
-      <pre>
-  
-</pre>
-      <pre><A name=c5></A>
-basic_regex(const basic_regex&amp; e);
+      <pre><A name=c5></A><BR>basic_regex(const basic_regex&amp; e);
 </pre>
       <p><b>Effects:</b> Constructs an object of class <code>basic_regex</code> as a 
          copy of the object <i>e</i>. The postconditions of this function are indicated 
@@ -522,14 +524,9 @@ basic_regex(const basic_regex&amp; e);
             </table>
          </center>
       </div>
-      <pre>
- 
-</pre>
-      <pre>
+      <pre><BR>
 template &lt;class ST, class SA&gt;
-<A name=c6></A>
-basic_regex(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-            flag_type f = regex_constants::normal, const Allocator&amp; a = Allocator());
+<A name=c6></A>basic_regex(const basic_string&lt;charT, ST, SA&gt;&amp; s, flag_type f = regex_constants::normal);
 </pre>
       <p><b>Throws:</b> <code>bad_expression</code> if <i>s</i> is not a valid regular 
          expression.</p>
@@ -594,14 +591,9 @@ basic_regex(const basic_string&lt;charT, ST, SA&gt;&amp; s,
             </table>
          </center>
       </div>
-      <pre>
- 
-</pre>
-      <pre>
+      <pre><BR>
 template &lt;class ForwardIterator&gt;
-<A name=c7></A>
-basic_regex(ForwardIterator first, ForwardIterator last,
-            flag_type f = regex_constants::normal, const Allocator&amp; a = Allocator());
+<A name=c7></A>basic_regex(ForwardIterator first, ForwardIterator last, flag_type f = regex_constants::normal);
 </pre>
       <p><b>Throws:</b> <code>bad_expression</code> if the sequence <i>[first, last)</i> 
          is not a valid regular expression.</p>
@@ -667,15 +659,11 @@ basic_regex(ForwardIterator first, ForwardIterator last,
             </table>
          </center>
       </div>
-      <pre>
-  
-</pre>
       <pre><A name=o1></A>
 basic_regex&amp; operator=(const basic_regex&amp; e);
 </pre>
       <p><b>Effects:</b> Returns the result of <code>assign(e.str(), e.flags())</code>.</p>
-      <pre><A name=o2></A>
-basic_regex&amp; operator=(const charT* ptr);
+      <pre><A name=o2></A>basic_regex&amp; operator=(const charT* ptr);
 </pre>
       <p><b>Requires:</b> <i>p</i> shall not be a null pointer.</p>
       <p><b>Effects:</b> Returns the result of <code>assign(ptr)</code>.</p>
@@ -685,23 +673,23 @@ basic_regex&amp; operator=(const basic_string&lt;charT, ST, SA&gt;&amp; p);
 </pre>
       <p><b>Effects:</b> Returns the result of <code>assign(p)</code>.</p>
       <h4>basic_regex iterators</h4>
-      <pre><A name=m1></A>
+      <pre>
 const_iterator begin() const;
 </pre>
       <p><b>Effects:</b> Returns a starting iterator to a sequence of characters 
          representing the regular expression.</p>
-      <pre><A name=m2></A>
+      <pre>
 const_iterator end() const;
 </pre>
       <p><b>Effects:</b> Returns termination iterator to a sequence of characters 
          representing the regular expression.</p>
       <h4>basic_regex capacity</h4>
-      <pre><A name=m3></A>
+      <pre>
 size_type size() const;
 </pre>
       <p><b>Effects:</b> Returns the length of the sequence of characters representing 
          the regular expression.</p>
-      <pre><A name=m4></A>
+      <pre>
 size_type max_size() const;
 </pre>
       <p><b>Effects:</b> Returns the maximum length of the sequence of characters 
@@ -716,7 +704,7 @@ bool empty() const;
       <p><b>Effects:</b> Returns the number of marked sub-expressions within the regular 
          expresion.</p>
       <h4>basic_regex assign</h4>
-      <pre><A name=a1></A>
+      <pre>
 basic_regex&amp; assign(const basic_regex&amp; that);
 </pre>
       <p><b>Effects:</b> Returns <code>assign(that.str(), that.flags())</code>.</p>
@@ -803,11 +791,7 @@ basic_regex&amp; assign(InputIterator first, InputIterator last,
          requirements (24.1.1).</p>
       <p><b>Effects:</b> Returns <code>assign(string_type(first, last), f)</code>.</p>
       <h4>basic_regex constant operations</h4>
-      <pre><A name=m7></A>Allocator get_allocator() const;
-</pre>
-      <p><b>Effects:</b> Returns a copy of the Allocator that was passed to the object's 
-         constructor.</p>
-      <pre><A name=m8></A>flag_type flags() const;
+      <pre><A name=m7></A><A name=m8></A>flag_type flags() const;
 </pre>
       <p><b>Effects:</b> Returns a copy of the regular expression syntax flags that were 
          passed to the object's constructor, or the last call to <code>assign.</code></p>
@@ -834,7 +818,7 @@ locale_type getloc() const;
             traits_inst</code> is a (default initialized) instance of the template 
          parameter <code>traits</code> stored within the object.</p>
       <h4>basic_regex swap</h4>
-      <pre><A name=m13></A>
+      <pre>
 void swap(basic_regex&amp; e) throw();
 </pre>
       <p><b>Effects:</b> Swaps the contents of the two regular expressions.</p>
@@ -902,11 +886,10 @@ void swap(basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
       <hr>
       <p>Revised 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         24&nbsp;June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/Attic/concepts.html b/doc/Attic/concepts.html
new file mode 100644
index 00000000..def336f5
--- /dev/null
+++ b/doc/Attic/concepts.html
@@ -0,0 +1,453 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+   <head>
+      <title>Boost.Regex: Index</title>
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+      <link rel="stylesheet" type="text/css" href="../../../boost.css">
+   </head>
+   <body>
+      <P>
+         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
+            <TR>
+               <td valign="top" width="300">
+                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
+               </td>
+               <TD width="353">
+                  <H1 align="center">Boost.Regex</H1>
+                  <H2 align="center">Concepts</H2>
+               </TD>
+               <td width="50">
+                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
+               </td>
+            </TR>
+         </TABLE>
+      </P>
+      <HR>
+      <p></p>
+      <H3><A name="charT"></A>charT requirements</H3>
+      <P>Type charT used a template argument to <A href="basic_regex.html">class template 
+            basic_regex</A>, must have a trivial default constructor, copy constructor, 
+         assignment operator, and destructor.&nbsp; In addition the following 
+         requirements must be met for objects; c of type charT, c1 and c2 of type charT 
+         const, and i of type int:</P>
+      <P>
+         <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="100%" border="1">
+            <TR>
+               <TD><STRONG>Expression</STRONG></TD>
+               <TD><STRONG>Return type</STRONG></TD>
+               <TD><STRONG>Assertion / Note / Pre- / Post-condition</STRONG></TD>
+            </TR>
+            <TR>
+               <TD>charT c</TD>
+               <TD>charT</TD>
+               <TD>Default constructor (must be trivial).</TD>
+            </TR>
+            <TR>
+               <TD>charT c(c1)</TD>
+               <TD>charT</TD>
+               <TD>Copy constructor (must be trivial).</TD>
+            </TR>
+            <TR>
+               <TD>c1 = c2</TD>
+               <TD>charT</TD>
+               <TD>Assignment operator (must be trivial).</TD>
+            </TR>
+            <TR>
+               <TD>c1 == c2</TD>
+               <TD>bool</TD>
+               <TD>true if&nbsp;c1 has the same value&nbsp;as c2.</TD>
+            </TR>
+            <TR>
+               <TD>c1 != c2</TD>
+               <TD>bool</TD>
+               <TD>true if c1 and c2 are not equal.</TD>
+            </TR>
+            <TR>
+               <TD>c1 &lt; c2</TD>
+               <TD>bool</TD>
+               <TD>true if the value of c1 is less than c2.</TD>
+            </TR>
+            <TR>
+               <TD>c1 &gt; c2</TD>
+               <TD>bool</TD>
+               <TD>true if the value of c1 is greater than c2.</TD>
+            </TR>
+            <TR>
+               <TD>c1 &lt;= c2</TD>
+               <TD>bool</TD>
+               <TD>true if c1 is less than or equal to c2.</TD>
+            </TR>
+            <TR>
+               <TD>c1 &gt;= c2</TD>
+               <TD>bool</TD>
+               <TD>true if c1 is greater than or equal to c2.</TD>
+            </TR>
+            <TR>
+               <TD>intmax_t i = c1</TD>
+               <TD>int</TD>
+               <TD>
+                  <P>charT must be convertible to an integral type.</P>
+                  <P>Note: type charT is not required to support this operation, if the traits class 
+                     used supports the full Boost-specific interface, rather than&nbsp;the minimal 
+                     standardised-interface (see traits class requirements below).</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>charT c(i);</TD>
+               <TD>charT</TD>
+               <TD>charT must be constructable from an integral type.</TD>
+            </TR>
+         </TABLE>
+      </P>
+      <H3><A name="traits"></A>traits requirements</H3>
+      <P>There are two sets of requirements for the traits template argument to 
+         basic_regex: a mininal interface (which is part of the regex standardization 
+         proposal), and an optional Boost-specific enhanced interface.</P>
+      <H4>Minimal requirements.</H4>
+      <P>In the following table X denotes a traits class defining types and functions 
+         for the character container type charT; u is an object of type X; v is an 
+         object of type const X; p is a value of type const charT*; I1 and I2 are Input 
+         Iterators; c is a value of type const charT; s is an object of type 
+         X::string_type; cs is an object of type const X::string_type; b is a value of 
+         type bool; I is a value of type int; F1 and F2 are values of type const charT*; 
+         and loc is an object of type X::locale_type.</P>
+      <P>
+         <TABLE id="Table3" cellSpacing="1" cellPadding="7" width="100%" border="1">
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P><STRONG>Expression</STRONG></P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P><STRONG>Return type</STRONG></P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P><STRONG>Assertion / Note
+                        <BR>
+                        Pre / Post condition</STRONG></P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>X::char_type</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>charT</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>The character container type used in the implementation of class template <CODE>basic_regex</CODE>.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>X::size_type</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>&nbsp;</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>An unsigned integer type, capable of holding the length of a null-terminated 
+                     string of charT's.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>X::string_type</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>std::basic_string&lt;charT&gt; or std::vector&lt;charT&gt;</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>&nbsp;</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>X::locale_type</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>Implementation defined</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>A copy constructible type that represents the locale used by the traits class.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>X::char_class_type</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>Implementation defined</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>A bitmask type representing a particular character classification. Multiple 
+                     values of this type can be bitwise-or'ed together to obtain a new valid value.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>X::length(p)</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>X::size_type</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Yields the smallest <CODE>i</CODE> such that <CODE>p[i] == 0</CODE>. Complexity 
+                     is linear in <CODE>i</CODE>.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.translate(c)</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>X::char_type</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Returns a character such that for any character d that is to be considered 
+                     equivalent to c then v.translate(c) == v.translate(d).</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.translate_nocase(c)</P>
+               </TD>
+               <TD vAlign="top" width="28%">X::char_type</TD>
+               <TD vAlign="top" width="45%">For all characters C that are to be considered 
+                  equivalent to c when comparisons are to be performed without regard to case, 
+                  then v.translate_- nocase(c) == v.translate_- nocase(C).</TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.transform(F1, F2)</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>X::string_type</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Returns a sort key for the character sequence designated by the iterator range 
+                     [F1, F2) such that if the character sequence [G1, G2) sorts before the 
+                     character sequence [H1, H2) then v.transform(G1, G2) &lt; v.transform(H1, 
+                     H2).&nbsp;</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.transform_primary(F1, F2)</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>X::string_type</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Returns a sort key for the character sequence designated by the iterator range 
+                     [F1, F2) such that if the character sequence [G1, G2) sorts before the 
+                     character sequence [H1, H2) when character case is not considered then 
+                     v.transform_primary(G1, G2) &lt; v.transform_- primary(H1, H2).</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.lookup_classname(F1, F2)</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>X::char_class_type</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Converts the character sequence designated by the iterator range [F1,F2) into a 
+                     bitmask type that can subsequently be passed to isctype. Values returned from 
+                     lookup_classname can be safely bitwise or'ed together. Returns 0 if the 
+                     character sequence is not the name of a character class recognized by X. The 
+                     value returned shall be independent of the case of the characters in the 
+                     sequence.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.lookup_collatename(F1, F2)</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>X::string_type</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Returns a sequence of characters that represents the collating element 
+                     consisting of the character sequence designated by the iterator range [F1, F2). 
+                     Returns an empty string if the character sequence is not a valid collating 
+                     element.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.isctype(c, v.lookup_classname (F1, F2))</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>bool</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Returns true if character c is a member of the character class designated by 
+                     the iterator range [F1, F2), false otherwise.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.value(c, i)</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>int</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Returns the value represented by the digit c in base I if the character c is a 
+                     valid digit in base I; otherwise returns -1. [Note: the value of I will only be 
+                     8, 10, or 16. -end note]</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>u.imbue(loc)</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>X::locale_type</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Imbues <CODE>u</CODE> with the locale <CODE>loc</CODE>, returns the previous 
+                     locale used by u if any.&nbsp;</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.getloc()</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>X::locale_type</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Returns the current locale used by <CODE>v</CODE> if any.&nbsp;</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.error_string(i)</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>std::string</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Returns a human readable error string for the error condition <CODE>i</CODE>, 
+                     where <CODE>i</CODE> is one of the values enumerated by type <CODE>regex_constants::error_type</CODE>.&nbsp; 
+                     If the value <CODE>i</CODE> is not recognized then returns the string "Unknown 
+                     error" or a localized equivalent.</P>
+               </TD>
+            </TR>
+         </TABLE>
+      </P>
+      <H4>Additional Optional Requirements</H4>
+      <P>The following additional requirements are strictly optional, however in order 
+         for basic_regex to take advantage of these additional interfaces, all of the 
+         following requirements must be met; basic_regex will detect the presence or 
+         absense of member <EM>boost_extensions_tag </EM>and configure itself 
+         appropriately.</P>
+      <P>
+         <TABLE id="Table4" cellSpacing="1" cellPadding="1" width="100%" border="1">
+            <TR>
+               <TD><STRONG>Expression</STRONG></TD>
+               <TD width="231"><STRONG>Result</STRONG></TD>
+               <TD>
+                  <P><STRONG>Assertion / Note
+                        <BR>
+                        Pre / Post condition</STRONG></P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>X::boost_extensions_tag</TD>
+               <TD width="231">An unspecified type.</TD>
+               <TD>When present, all of the extensions listed in this table must be present.</TD>
+            </TR>
+            <TR>
+               <TD>
+                  <P>v.syntax_type(c)</P>
+               </TD>
+               <TD width="231"><A href="../../../boost/regex/v4/syntax_type.hpp">regex_constants::syntax_type</A></TD>
+               <TD>
+                  <P>Returns a symbolic value of type <CODE>regex_constants::syntax_type </CODE>that 
+                     signifies the meaning of character <CODE>c</CODE> within the regular expression 
+                     grammar.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>v.escape_syntax_type(c)</TD>
+               <TD width="231"><A href="../../../boost/regex/v4/syntax_type.hpp">regex_constants::escape_syntax_type</A></TD>
+               <TD>
+                  <P>Returns a symbolic value of type <CODE>regex_constants::escape_syntax_type</CODE>, 
+                     that signifies the meaning of character <CODE>c</CODE>&nbsp;within the regular 
+                     expression grammar, when <CODE>c</CODE> has been preceded by an escape 
+                     character. Precondition: if <CODE>b</CODE> is the character preceding <CODE>c</CODE>
+                     in the expression being parsed then: <CODE>v.syntax_type(b) == syntax_escape</CODE></P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>
+                  <P>v.translate(c, b)</P>
+               </TD>
+               <TD width="231">X::char_type</TD>
+               <TD>
+                  <P>Returns a character <CODE>d</CODE> such that: for any character <CODE>d</CODE> that 
+                     is to be considered equivalent to <CODE>c</CODE>&nbsp;then <CODE>v.translate(c,false)==v.translate(d,false)</CODE>. 
+                     Likewise for all characters <CODE>C</CODE> that are to be considered equivalent 
+                     to <CODE>c</CODE> when comparisons are to be performed without regard to case, 
+                     then <CODE>v.translate(c,true)==v.translate(C,true)</CODE>.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>
+                  <P>v.toi(I1, I2, i)</P>
+               </TD>
+               <TD width="231">An integer type capable of holding either a charT or an int.</TD>
+               <TD>
+                  <P>Behaves as follows: if <CODE>p==q</CODE> or if <CODE>*p </CODE>is not a digit 
+                     character then returns -1. Otherwise performs formatted numeric input on the 
+                     sequence [p,q) and returns the result as an int. Postcondition: either <CODE>p == 
+                        q</CODE> or <CODE>*p</CODE> is a non-digit character.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>
+                  <P>v.error_string(i)</P>
+               </TD>
+               <TD width="231">std::string</TD>
+               <TD>
+                  <P>Returns a human readable error string for the error condition <CODE>i</CODE>, 
+                     where <CODE>i</CODE> is one of the values enumerated by type <CODE><A href="error_type.html">
+                           regex_constants::error_type</A></CODE>.&nbsp; If the value <CODE>i</CODE> 
+                     is not recognized then returns the string "Unknown error" or a localized 
+                     equivalent.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>v.tolower(c)</TD>
+               <TD width="231">X::char_type</TD>
+               <TD>Converts c to lower case, used for Perl-style \l and \L formating operations.</TD>
+            </TR>
+            <TR>
+               <TD>v.toupper(c)</TD>
+               <TD width="231">X::char_type</TD>
+               <TD>Converts c to upper case, used for Perl-style \u and \U formating operations.</TD>
+            </TR>
+         </TABLE>
+      </P>
+      <H3><A name="iterator"></A>Iterator Rrequirements</H3>
+      <P>
+      <P>The regular expression algorithms (and iterators) take all require a 
+         Bidirectional-Iterator.</P>
+      <P>
+         <HR>
+      </P>
+      <P></P>
+      <p>Revised 
+         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
+         24&nbsp;June 2004&nbsp; 
+         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
+      <p><i>© Copyright John Maddock&nbsp;1998- 
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+      <P><I>Use, modification and distribution are subject to the Boost Software License, 
+            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
+            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
+   </body>
+</html>
diff --git a/doc/Attic/configuration.html b/doc/Attic/configuration.html
index 52498739..6d3dbbdf 100644
--- a/doc/Attic/configuration.html
+++ b/doc/Attic/configuration.html
@@ -1,225 +1,155 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
-<head>
-<title>Boost.Regex: Configuration and setup</title>
-<meta name="generator" content="HTML Tidy, see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../../../boost.css">
-</head>
-<body>
-<table id="Table1" cellspacing="1" cellpadding="1" width="100%"
-border="0">
-<tr>
-<td valign="top" width="300">
-<h3><a href="../../../index.htm"><img height="86" width="277" alt=
-"C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
-</td>
-<td width="353">
-<h1 align="center">Boost.Regex</h1>
-
-<h2 align="center">Configuration and setup</h2>
-</td>
-<td width="50">
-<h3><a href="index.html"><img height="45" width="43" alt=
-"Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<hr>
-<h2>Contents</h2>
-
-<dl class="index">
-<dt><a href="#compiler">Compiler setup</a></dt>
-
-<dt><a href="#locale">Locale and traits class selection</a></dt>
-
-<dt><a href="#linkage">Linkage Options</a></dt>
-
-<dt><a href="#algorithm">Algorithm Selection</a></dt>
-
-<dt><a href="#tuning">Algorithm Tuning</a></dt>
-</dl>
-
-<h3><a name="compiler"></a>Compiler setup.</h3>
-
-<p>You shouldn't need to do anything special to configure
-boost.regex for use with your compiler - the <a href="../../config/index.html">boost.config</a> subsystem should already
-take care of it, if you do have problems (or you are using a
-particularly obscure compiler or platform) then <a href="../../config/index.html">boost.config</a>&nbsp;has a&nbsp;<a href="../../config/config.htm#config_script">configure</a> script.</p>
-
-<h3><a name="locale"></a>Locale and traits class selection.</h3>
-
-<p>The following macros (see <a href="../../../boost/regex/user.hpp">user.hpp</a>) control how
-boost.regex interacts with the user's locale:</p>
-
-<table id="Table2" cellspacing="1" cellpadding="1" width="100%"
-border="1">
-<tr>
-<td width="265">BOOST_REGEX_USE_C_LOCALE</td>
-<td>Forces boost.regex to use the global C locale in its traits
-class support: this is the default behavior on non-windows
-platforms, but MS Windows platforms normally use the Win32 API for
-locale support.</td>
-</tr>
-
-<tr>
-<td width="265">BOOST_REGEX_USE_CPP_LOCALE</td>
-<td>Forces boost.regex to use std::locale in it's default traits
-class, regular expressions can then be imbued with an
-instance&nbsp;specific locale.</td>
-</tr>
-
-<tr>
-<td width="265">BOOST_REGEX_NO_W32</td>
-<td>Tells boost.regex not to use any Win32 API's even when
-available (implies BOOST_REGEX_USE_C_LOCALE unless
-BOOST_REGEX_USE_CPP_LOCALE is set).</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<h3><a name="linkage"></a>Linkage Options</h3>
-
-<table id="Table3" cellspacing="1" cellpadding="1" width="100%"
-border="1">
-<tr>
-<td>BOOST_REGEX_DYN_LINK</td>
-<td>For Microsoft and Borland C++ builds, this tells boost.regex
-that it should link to the dll build of the boost.regex.&nbsp; By
-default boost.regex will link to its static library build, even if
-the dynamic C runtime library is in use.</td>
-</tr>
-
-<tr>
-<td>BOOST_REGEX_NO_LIB</td>
-<td>For Microsoft and Borland C++ builds, this tells boost.regex
-that it should not automatically select the library to link
-to.</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<h3><a name="algorithm"></a>Algorithm Selection</h3>
-
-<table id="Table4" cellspacing="1" cellpadding="1" width="100%"
-border="1">
-<tr>
-<td width="253">BOOST_REGEX_V3</td>
-<td>Tells boost.regex to use the boost-1.30.0 matching algorithm,
-define only if you need maximum compatibility with previous
-behavior.</td>
-</tr>
-
-<tr>
-<td width="253">BOOST_REGEX_RECURSIVE</td>
-<td>Tells boost.regex to use a stack-recursive matching
-algorithm.&nbsp; This is generally the fastest option (although
-there is very little in it), but can cause stack overflow in
-extreme cases, on Win32 this can be handled safely, but this is not
-the case on other platforms.</td>
-</tr>
-
-<tr>
-<td width="253">BOOST_REGEX_NON_RECURSIVE</td>
-<td>Tells boost.regex to use a non-stack recursive matching
-algorithm, this can be slightly slower than the alternative, but is
-always safe no matter how pathological the regular
-expression.&nbsp; This is the default on non-Win32 platforms.</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<h3><a name="tuning"></a>Algorithm Tuning</h3>
-
-<p>The following option applies only if BOOST_REGEX_RECURSIVE is
-set.</p>
-
-<table id="Table6" cellspacing="1" cellpadding="1" width="100%"
-border="1">
-<tr>
-<td>BOOST_REGEX_HAS_MS_STACK_GUARD</td>
-<td>Tells boost.regex that Microsoft style __try - __except blocks
-are supported, and can be used to safely trap stack overflow.</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<p>The following options apply only if BOOST_REGEX_NON_RECURSIVE is
-set.</p>
-
-<table id="Table5" cellspacing="1" cellpadding="1" width="100%"
-border="1">
-<tr>
-<td>BOOST_REGEX_BLOCKSIZE</td>
-<td>In non-recursive mode, boost.regex uses largish blocks of
-memory to act as a stack for the state machine, the larger the
-block size then the fewer allocations that will take place.&nbsp;
-This defaults to 4096 bytes, which is large enough to match the
-vast majority of regular expressions&nbsp;without further
-allocations, however, you can choose smaller or larger values
-depending upon your platforms characteristics.</td>
-</tr>
-
-<tr>
-<td>BOOST_REGEX_MAX_BLOCKS</td>
-<td>Tells boost.regex how many blocks of size BOOST_REGEX_BLOCKSIZE
-it is permitted to use.&nbsp; If this value is exceeded then
-boost.regex will stop trying to find a match and throw a
-std::runtime_error.&nbsp; Defaults to 1024, don't forget to tweek
-this value if you alter BOOST_REGEX_BLOCKSIZE by much.</td>
-</tr>
-
-<tr>
-<td>BOOST_REGEX_MAX_CACHE_BLOCKS</td>
-<td>Tells boost.regex how many memory blocks to store in it's
-internal cache - memory blocks are taken from this cache rather
-than by calling ::operator new.&nbsp; Generally speeking this can
-be an order of magnitude faster than calling ::opertator new each
-time a memory block is required, but has the downside that
-boost.regex can end up caching a large chunk of memory (by default
-up to 16 blocks each of BOOST_REGEX_BLOCKSIZE size).&nbsp; If
-memory is tight then try defining this to 0 (disables all caching),
-or if that is too slow, then a value of 1 or 2, may be
-sufficient.&nbsp; On the other hand, on large multi-processor,
-multi-threaded systems, you may find that a higher value is in
-order.</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<hr>
-      <p>Revised 
+   <head>
+      <title>Boost.Regex: Configuration and setup</title>
+      <meta name="generator" content="HTML Tidy, see www.w3.org">
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+      <link rel="stylesheet" type="text/css" href="../../../boost.css">
+   </head>
+   <body>
+      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
+         <tr>
+            <td valign="top" width="300">
+               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
+            </td>
+            <td width="353">
+               <h1 align="center">Boost.Regex</h1>
+               <h2 align="center">Configuration and setup</h2>
+            </td>
+            <td width="50">
+               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
+            </td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <hr>
+      <h2>Contents</h2>
+      <dl class="index">
+         <dt><a href="#compiler">Compiler setup</a> <dt><a href="#locale">Locale and traits class 
+                  selection</a> <dt><a href="#linkage">Linkage Options</a> <dt><a href="#algorithm">Algorithm 
+                        Selection</a> <dt><a href="#tuning">Algorithm Tuning</a></dt>
+      </dl>
+      <h3><a name="compiler"></a>Compiler setup.</h3>
+      <p>You shouldn't need to do anything special to configure boost.regex for use with 
+         your compiler - the <a href="../../config/index.html">boost.config</a> subsystem 
+         should already take care of it, if you do have problems (or you are using a 
+         particularly obscure compiler or platform) then <a href="../../config/index.html">boost.config</a>&nbsp;has 
+         a&nbsp;<a href="../../config/config.htm#config_script">configure</a> script.</p>
+      <h3><a name="locale"></a>Locale and traits class selection.</h3>
+      <p>The following macros (see <a href="../../../boost/regex/user.hpp">user.hpp</a>) 
+         control how boost.regex interacts with the user's locale:</p>
+      <table id="Table2" cellspacing="1" cellpadding="1" width="100%" border="1">
+         <tr>
+            <td width="265">BOOST_REGEX_USE_C_LOCALE</td>
+            <td>
+               Forces boost.regex to use the global C locale in its traits class support: this 
+               is now deprecated in favour of the C++ locale.</td>
+         </tr>
+         <tr>
+            <td width="265">BOOST_REGEX_USE_CPP_LOCALE</td>
+            <td>Forces boost.regex to use std::locale in it's default traits class, regular 
+               expressions can then be imbued with an instance&nbsp;specific locale.&nbsp; 
+               This is the default behaviour on non-Windows platforms.</td>
+         </tr>
+         <tr>
+            <td width="265">BOOST_REGEX_NO_W32</td>
+            <td>Tells boost.regex not to use any Win32 API's even when available (implies 
+               BOOST_REGEX_USE_CPP_LOCALE unless BOOST_REGEX_USE_C_LOCALE is set).</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <h3><a name="linkage"></a>Linkage Options</h3>
+      <table id="Table3" cellspacing="1" cellpadding="1" width="100%" border="1">
+         <tr>
+            <td>BOOST_REGEX_DYN_LINK</td>
+            <td>For Microsoft and Borland C++ builds, this tells boost.regex that it should 
+               link to the dll build of the boost.regex.&nbsp; By default boost.regex will 
+               link to its static library build, even if the dynamic C runtime library is in 
+               use.</td>
+         </tr>
+         <tr>
+            <td>BOOST_REGEX_NO_LIB</td>
+            <td>For Microsoft and Borland C++ builds, this tells boost.regex that it should 
+               not automatically select the library to link to.</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <h3><a name="algorithm"></a>Algorithm Selection</h3>
+      <table id="Table4" cellspacing="1" cellpadding="1" width="100%" border="1">
+         <tr>
+            <td width="253">BOOST_REGEX_RECURSIVE</td>
+            <td>Tells boost.regex to use a stack-recursive matching algorithm.&nbsp; This is 
+               generally the fastest option (although there is very little in it), but can 
+               cause stack overflow in extreme cases, on Win32 this can be handled safely, but 
+               this is not the case on other platforms.</td>
+         </tr>
+         <tr>
+            <td width="253">BOOST_REGEX_NON_RECURSIVE</td>
+            <td>Tells boost.regex to use a non-stack recursive matching algorithm, this can be 
+               slightly slower than the alternative, but is always safe no matter how 
+               pathological the regular expression.&nbsp; This is the default on non-Win32 
+               platforms.</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <h3><a name="tuning"></a>Algorithm Tuning</h3>
+      <p>The following option applies only if BOOST_REGEX_RECURSIVE is set.</p>
+      <table id="Table6" cellspacing="1" cellpadding="1" width="100%" border="1">
+         <tr>
+            <td>BOOST_REGEX_HAS_MS_STACK_GUARD</td>
+            <td>Tells boost.regex that Microsoft style __try - __except blocks are supported, 
+               and can be used to safely trap stack overflow.</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <p>The following options apply only if BOOST_REGEX_NON_RECURSIVE is set.</p>
+      <table id="Table5" cellspacing="1" cellpadding="1" width="100%" border="1">
+         <tr>
+            <td>BOOST_REGEX_BLOCKSIZE</td>
+            <td>In non-recursive mode, boost.regex uses largish blocks of memory to act as a 
+               stack for the state machine, the larger the block size then the fewer 
+               allocations that will take place.&nbsp; This defaults to 4096 bytes, which is 
+               large enough to match the vast majority of regular expressions&nbsp;without 
+               further allocations, however, you can choose smaller or larger values depending 
+               upon your platforms characteristics.</td>
+         </tr>
+         <tr>
+            <td>BOOST_REGEX_MAX_BLOCKS</td>
+            <td>Tells boost.regex how many blocks of size BOOST_REGEX_BLOCKSIZE it is 
+               permitted to use.&nbsp; If this value is exceeded then boost.regex will stop 
+               trying to find a match and throw a std::runtime_error.&nbsp; Defaults to 1024, 
+               don't forget to tweek this value if you alter BOOST_REGEX_BLOCKSIZE by much.</td>
+         </tr>
+         <tr>
+            <td>BOOST_REGEX_MAX_CACHE_BLOCKS</td>
+            <td>Tells boost.regex how many memory blocks to store in it's internal cache - 
+               memory blocks are taken from this cache rather than by calling ::operator 
+               new.&nbsp; Generally speeking this can be an order of magnitude faster than 
+               calling ::opertator new each time a memory block is required, but has the 
+               downside that boost.regex can end up caching a large chunk of memory (by 
+               default up to 16 blocks each of BOOST_REGEX_BLOCKSIZE size).&nbsp; If memory is 
+               tight then try defining this to 0 (disables all caching), or if that is too 
+               slow, then a value of 1 or 2, may be sufficient.&nbsp; On the other hand, on 
+               large multi-processor, multi-threaded systems, you may find that a higher value 
+               is in order.</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <hr>
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         23 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-</body>
+   </body>
 </html>
-
-
diff --git a/doc/Attic/error_type.html b/doc/Attic/error_type.html
new file mode 100644
index 00000000..ed99c350
--- /dev/null
+++ b/doc/Attic/error_type.html
@@ -0,0 +1,140 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+   <head>
+      <title>Boost.Regex: Algorithm regex_search</title>
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
+   <body>
+      <P>
+         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
+            <TR>
+               <td vAlign="top" width="300">
+                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../c++boost.gif" width="277" border="0"></A></h3>
+               </td>
+               <TD width="353">
+                  <H1 align="center">Boost.Regex</H1>
+                  <H2 align="center">error_type</H2>
+               </TD>
+               <td width="50">
+                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
+               </td>
+            </TR>
+         </TABLE>
+      </P>
+      <HR>
+      <H3>Contents</H3>
+      <dl class="index">
+         <dt><A href="#synopsis">Synopsis</A> <dt><a href="#description">Description</a></dt></dl>
+      <H3><A name="synopsis"></A>Synopsis</H3>
+      <P>Type error type represents the different types of errors that can be raised by 
+         the library when parsing a regular expression.</P>
+      <pre>
+namespace boost{ namespace regex_constants{
+
+typedef implementation-specific-type error_type;
+
+static const error_type error_collate;
+static const error_type error_ctype;
+static const error_type error_escape;
+static const error_type error_backref;
+static const error_type error_brack;
+static const error_type error_paren;
+static const error_type error_brace;
+static const error_type error_badbrace;
+static const error_type error_range;
+static const error_type error_space;
+static const error_type error_badrepeat;
+static const error_type error_complexity;
+static const error_type error_stack;
+static const error_type error_bad_pattern;
+
+} // namespace regex_constants
+} // namespace boost
+</pre>
+      <P>&nbsp;</P>
+      <H3><A name="description"></A>Description</H3>
+      <P>The type error_type is an implementation-specific enumeration type that may 
+         take one of the following values:</P>
+      <P>
+         <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="100%" border="1">
+            <TR>
+               <TD><STRONG>Constant</STRONG></TD>
+               <TD><STRONG>Meaning</STRONG></TD>
+            </TR>
+            <TR>
+               <TD>error_collate</TD>
+               <TD>An invalid collating element was specified in a [[.name.]] block.</TD>
+            </TR>
+            <TR>
+               <TD>error_ctype</TD>
+               <TD>An invalid character class name was specified in a [[:name:]] block.</TD>
+            </TR>
+            <TR>
+               <TD>error_escape</TD>
+               <TD>An invalid or trailing escape was encountered.</TD>
+            </TR>
+            <TR>
+               <TD>error_backref</TD>
+               <TD>A back-reference to a non-existant marked sub-expression was encountered.</TD>
+            </TR>
+            <TR>
+               <TD>error_brack</TD>
+               <TD>An invalid character set [...] was encountered.</TD>
+            </TR>
+            <TR>
+               <TD>error_paren</TD>
+               <TD>
+                  <P>Mismatched '(' and ')'.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>error_brace</TD>
+               <TD>Mismatched '{' and '}'.</TD>
+            </TR>
+            <TR>
+               <TD>error_badbrace</TD>
+               <TD>Invalid contents of a {...} block.</TD>
+            </TR>
+            <TR>
+               <TD>error_range</TD>
+               <TD>A character range was invalid, for example [d-a].</TD>
+            </TR>
+            <TR>
+               <TD>error_space</TD>
+               <TD>Out of memory.</TD>
+            </TR>
+            <TR>
+               <TD>error_badrepeat</TD>
+               <TD>An attempt to repeat something that can not be repeated - for example a*+</TD>
+            </TR>
+            <TR>
+               <TD>error_complexity</TD>
+               <TD>The expression became too complex to handle.</TD>
+            </TR>
+            <TR>
+               <TD>error_stack</TD>
+               <TD>Out of program stack space.</TD>
+            </TR>
+            <TR>
+               <TD>error_bad_pattern</TD>
+               <TD>Other unspecified errors.</TD>
+            </TR>
+         </TABLE>
+      </P>
+      <H3><A name="examples"></A>
+         <HR>
+      </H3>
+      <p>Revised&nbsp; 
+         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
+         24 June 2004&nbsp; 
+         <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
+      </p>
+      <P><I>© Copyright <a href="mailto:jm@regex.fsnet.co.uk">John Maddock</a>&nbsp;1998-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></I></P>
+      <P align="left"><I>Permission to use, copy, modify, distribute and sell this software 
+            and its documentation for any purpose is hereby granted without fee, provided 
+            that the above copyright notice appear in all copies and that both that 
+            copyright notice and this permission notice appear in supporting documentation. 
+            Dr John Maddock makes no representations about the suitability of this software 
+            for any purpose. It is provided "as is" without express or implied warranty.</I></P>
+   </body>
+</html>
diff --git a/doc/Attic/examples.html b/doc/Attic/examples.html
index 6754a72d..1b74077c 100644
--- a/doc/Attic/examples.html
+++ b/doc/Attic/examples.html
@@ -25,36 +25,71 @@
       <BR>
       <BR>
       <HR>
-      <P>There are three demo applications that ship with this library, they all come 
-         with makefiles for Borland, Microsoft and gcc compilers, otherwise you will 
-         have to create your own makefiles.</P>
-      <H5>regress.exe:</H5>
+      <H3>Test Programs</H3>
+      <H4>regress:</H4>
       <P>A regression test application that gives the matching/searching algorithms a 
          full workout. The presence of this program is your guarantee that the library 
          will behave as claimed - at least as far as those items tested are concerned - 
          if anyone spots anything that isn't being tested I'd be glad to hear about it.</P>
-      <P>Files: <A href="../test/regress/parse.cpp">parse.cpp</A>, <A href="../test/regress/regress.cpp">
-            regress.cpp</A>, <A href="../test/regress/tests.cpp">tests.cpp</A>.</P>
-      <H5>jgrep.exe</H5>
+      <P>Directory: <A href="../test/regress">libs/regex/test/regress</A>.</P>
+      <P>Files: <A href="../test/regress/basic_tests.cpp">basic_tests.cpp</A> <A href="../test/regress/test_deprecated.cpp">
+            test_deprecated.cpp</A> <A href="../test/regress/main.cpp">main.cpp</A>.</P>
+      <H4>bad_expression_test:</H4>
+      <P>Verifies that "bad" regular expressions don't cause the matcher to go into 
+         infinite loops, but to throw an exception instead.</P>
+      <P>Directory: <A href="../test/pathology">libs/regex/test/pathology</A>.</P>
+      <P>Files: <A href="../test/pathology/bad_expression_test.cpp">bad_expression_test.cpp</A>.</P>
+      <H4>recursion_test:</H4>
+      <P>Verifies that the matcher can't overrun the stack (no matter what the 
+         expression).</P>
+      <P>Directory: <A href="../test/pathology">libs/regex/test/pathology</A>.</P>
+      <P>Files: <A href="../test/pathology/recursion_test.cpp">recursion_test.cpp</A>.</P>
+      <H4>concepts:</H4>
+      <P>Verifies that the library meets all documented concepts (a compile only test).</P>
+      <P>Directory: <A href="../test/concepts">libs/regex/test/concepts</A>.</P>
+      <P>Files: <A href="../test/concepts/concept_check.cpp">concept_check.cpp</A>.</P>
+      <H4>captures_test:</H4>
+      <P>Test code for captures.</P>
+      <P>Directory: <A href="../test/captures">libs/test/captures</A>.</P>
+      <P>Files: <A href="../test/captures/captures_test.cpp">captures_test.cpp</A>.</P>
+      <H3>Example programs</H3>
+      <H4>jgrep.exe</H4>
       <P>A simple grep implementation, run with no command line options to find out its 
          usage. Look at <A href="../src/fileiter.cpp">fileiter.cpp</A>/fileiter.hpp and 
          the mapfile class to see an example of a "smart" bidirectional iterator that 
          can be used with boost.regex or any other STL algorithm.</P>
       <P>Files: <A href="../example/jgrep/jgrep.cpp">jgrep.cpp</A>, <A href="../example/jgrep/main.cpp">
             main.cpp</A>.</P>
-      <H5>timer.exe</H5>
+      <H4>timer.exe</H4>
       <P>A simple interactive expression matching application, the results of all 
          matches are timed, allowing the programmer to optimize their regular 
          expressions where performance is critical.</P>
       <P>Files: <A href="../example/timer/regex_timer.cpp">regex_timer.cpp</A>.</P>
-      <H5>Code snippets</H5>
+      <H4>Code snippets</H4>
       <P>The snippets examples contain the code examples used in the documentation:</P>
+      <P><A href="../example/snippets/captures_example.cpp">captures_example.cpp</A>: 
+         Demonstrates the use of captures.</P>
       <P><A href="../example/snippets/credit_card_example.cpp">credit_card_example.cpp</A>: 
          Credit card number formatting code.</P>
       <P><A href="../example/snippets/partial_regex_grep.cpp">partial_regex_grep.cpp</A>: 
          Search example using partial matches.</P>
       <P><A href="../example/snippets/partial_regex_match.cpp">partial_regex_match.cpp</A>: 
          regex_match example using partial matches.</P>
+      <P><A href="../example/snippets/regex_iterator_example.cpp">regex_iterator_example.cpp</A>: 
+         Iterating through a series of matches.</P>
+      <P><A href="../example/snippets/regex_match_example.cpp">regex_match_example.cpp</A>: 
+         ftp based regex_match example.</P>
+      <P><A href="../example/snippets/regex_merge_example.cpp">regex_merge_example.cpp</A>: 
+         regex_merge example: converts a C++ file to syntax highlighted HTML.</P>
+      <P><A href="../example/snippets/regex_replace_example.cpp">regex_replace_example.cpp</A>: 
+         regex_replace example: converts a C++ file to syntax highlighted HTML</P>
+      <P><A href="../example/snippets/regex_search_example.cpp">regex_search_example.cpp</A>: 
+         regex_search example: searches a cpp file for class definitions.</P>
+      <P><A href="../example/snippets/regex_token_iterator_eg_1.cpp">regex_token_iterator_eg_1.cpp</A>: 
+         split a string into a series of tokens.</P>
+      <P><A href="../example/snippets/regex_token_iterator_eg_2.cpp">regex_token_iterator_eg_2.cpp</A>: 
+         enumerate the linked URL's in a HTML file.</P>
+      <P>The following are deprecated:</P>
       <P><A href="../example/snippets/regex_grep_example_1.cpp">regex_grep_example_1.cpp</A>: 
          regex_grep example 1: searches a cpp file for class definitions.</P>
       <P><A href="../example/snippets/regex_grep_example_2.cpp">regex_grep_example_2.cpp</A>: 
@@ -66,30 +101,20 @@
       <P><A href="../example/snippets/regex_grep_example_4.cpp">regex_grep_example_4.cpp</A>: 
          regex_grep example 2: searches a cpp file for class definitions, using a C++ 
          Builder closure as a callback.</P>
-      <P><A href="../example/snippets/regex_match_example.cpp">regex_match_example.cpp</A>: 
-         ftp based regex_match example.</P>
-      <P><A href="../example/snippets/regex_merge_example.cpp">regex_merge_example.cpp</A>: 
-         regex_merge example: converts a C++ file to syntax highlighted HTML.</P>
-      <P><A href="../example/snippets/regex_replace_example.cpp">regex_replace_example.cpp</A>: 
-         regex_replace example: converts a C++ file to syntax highlighted HTML</P>
-      <P><A href="../example/snippets/regex_search_example.cpp">regex_search_example.cpp</A>: 
-         regex_search example: searches a cpp file for class definitions.</P>
       <P><A href="../example/snippets/regex_split_example_1.cpp">regex_split_example_1.cpp</A>: 
          regex_split example: split a string into tokens.</P>
       <P><A href="../example/snippets/regex_split_example_2.cpp">regex_split_example_2.cpp</A>
          : regex_split example: spit out linked URL's.</P>
       <P></P>
       <HR>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         28 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
-
diff --git a/doc/Attic/headers.html b/doc/Attic/headers.html
index 46a4e34d..e72da0c4 100644
--- a/doc/Attic/headers.html
+++ b/doc/Attic/headers.html
@@ -25,9 +25,9 @@
       <HR>
       <p></p>
       <P>There are two main headers used by this library: &lt;boost/regex.hpp&gt; 
-         provides full access to the entire library, while &lt;boost/cregex.hpp&gt; 
-         provides access to just the high level class RegEx, and the POSIX API 
-         functions.
+         provides full access to the main template library, while 
+         &lt;boost/cregex.hpp&gt; provides access to the (deprecated) high level class 
+         RegEx, and the POSIX API functions.
       </P>
       <P>There is also a header containing only forward declarations 
          &lt;boost/regex_fwd.hpp&gt; for use when an interface is dependent upon 
@@ -35,16 +35,14 @@
       <P>
          <HR>
       <P></P>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         28 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
-
diff --git a/doc/Attic/history.html b/doc/Attic/history.html
index 67f54508..f94c67bb 100644
--- a/doc/Attic/history.html
+++ b/doc/Attic/history.html
@@ -24,6 +24,19 @@
       </P>
       <HR>
       <p></p>
+      <P>Boost 1.33.0.</P>
+      <UL>
+         <LI>
+            Completely rewritten expression parsing code, and traits class support; now 
+            conforms to the standardization proposal.</LI>
+         <LI>
+            Added support for (?imsx-imsx) constructs.</LI>
+         <LI>
+            Added support for lookbehind expressions (?&lt;=positive-lookbehind) and 
+            (?&lt;!negative-lookbehind).</LI>
+         <LI>
+            Added support for conditional expressions 
+            (?(assertion)true-expresion|false-expression).</LI></UL>
       <P>Boost 1.31.0.</P>
       <UL>
          <LI>
@@ -55,12 +68,12 @@
       <P>
          <HR>
       <P></P>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         22 Dec 2003 
+         28 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/Attic/localisation.html b/doc/Attic/localisation.html
index 770a5485..5d4685c1 100644
--- a/doc/Attic/localisation.html
+++ b/doc/Attic/localisation.html
@@ -1,1023 +1,808 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
-<head>
-<meta name="generator" content="HTML Tidy, see www.w3.org">
-<title>Boost.Regex: Localisation</title>
-<meta http-equiv="Content-Type" content=
-"text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../../../boost.css">
-</head>
-<body>
-<p></p>
-
-<table id="Table1" cellspacing="1" cellpadding="1" width="100%"
-border="0">
-<tr>
-<td valign="top" width="300">
-<h3><a href="../../../index.htm"><img height="86" width="277" alt=
-"C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
-</td>
-<td width="353">
-<h1 align="center">Boost.Regex</h1>
-
-<h2 align="center">Localisation</h2>
-</td>
-<td width="50">
-<h3><a href="index.html"><img height="45" width="43" alt=
-"Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<hr>
-<p>Boost.regex&nbsp;provides extensive support for run-time
-localization, the localization model used can be split into two
-parts: front-end and back-end.</p>
-
-<p>Front-end localization deals with everything which the user sees
-- error messages, and the regular expression syntax itself. For
-example a French application could change [[:word:]] to [[:mot:]]
-and \w to \m. Modifying the front end locale requires active
-support from the developer, by providing the library with a message
-catalogue to load, containing the localized strings. Front-end
-locale is affected by the LC_MESSAGES category only.</p>
-
-<p>Back-end localization deals with everything that occurs after
-the expression has been parsed - in other words everything that the
-user does not see or interact with directly. It deals with case
-conversion, collation, and character class membership. The back-end
-locale does not require any intervention from the developer - the
-library will acquire all the information it requires for the
-current locale from the underlying operating system / run time
-library. This means that if the program user does not interact with
-regular expressions directly - for example if the expressions are
-embedded in your C++ code - then no explicit localization is
-required, as the library will take care of everything for you. For
-example embedding the expression [[:word:]]+ in your code will
-always match a whole word, if the program is run on a machine with,
-for example, a Greek locale, then it will still match a whole word,
-but in Greek characters rather than Latin ones. The back-end locale
-is affected by the LC_TYPE and LC_COLLATE categories.</p>
-
-<p>There are three separate localization mechanisms supported by
-boost.regex:</p>
-
-<h3>Win32 localization model.</h3>
-
-<p>This is the default model when the library is compiled under
-Win32, and is encapsulated by the traits class w32_regex_traits.
-When this model is in effect there is a single global locale as
-defined by the user's control panel settings, and returned by
-GetUserDefaultLCID. All the settings used by boost.regex are
-acquired directly from the operating system bypassing the C run
-time library. Front-end localization requires a resource dll,
-containing a string table with the user-defined strings. The traits
-class exports the function:</p>
-
-<p>static std::string set_message_catalogue(const std::string&amp;
-s);</p>
-
-<p>which needs to be called with a string identifying the name of
-the resource dll, <i>before</i> your code compiles any regular
-expressions (but not necessarily before you construct any <i>
-basic_regex</i> instances):</p>
-
-<p>
-boost::w32_regex_traits&lt;char&gt;::set_message_catalogue("mydll.dll");</p>
-
-<p>Note that this API sets the dll name for <i>both</i> the narrow
-and wide character specializations of w32_regex_traits.</p>
-
-<p>This model does not currently support thread specific locales
-(via SetThreadLocale under Windows NT), the library provides full
-Unicode support under NT, under Windows 9x the library degrades
-gracefully - characters 0 to 255 are supported, the remainder are
-treated as "unknown" graphic characters.</p>
-
-<h3>C localization model.</h3>
-
-<p>This is the default model when the library is compiled under an
-operating system other than Win32, and is encapsulated by the
-traits class <i>c_regex_traits</i>, Win32 users can force this
-model to take effect by defining the pre-processor symbol
-BOOST_REGEX_USE_C_LOCALE. When this model is in effect there is a
-single global locale, as set by <i>setlocale</i>. All settings are
-acquired from your run time library, consequently Unicode support
-is dependent upon your run time library implementation. Front end
-localization requires a POSIX message catalogue. The traits class
-exports the function:</p>
-
-<p>static std::string set_message_catalogue(const std::string&amp;
-s);</p>
-
-<p>which needs to be called with a string identifying the name of
-the message catalogue, <i>before</i> your code compiles any regular
-expressions (but not necessarily before you construct any <i>
-basic_regex</i> instances):</p>
-
-<p>
-boost::c_regex_traits&lt;char&gt;::set_message_catalogue("mycatalogue");</p>
-
-<p>Note that this API sets the dll name for <i>both</i> the narrow
-and wide character specializations of c_regex_traits. If your run
-time library does not support POSIX message catalogues, then you
-can either provide your own implementation of &lt;nl_types.h&gt; or
-define BOOST_RE_NO_CAT to disable front-end localization via
-message catalogues.</p>
-
-<p>Note that calling <i>setlocale</i> invalidates all compiled
-regular expressions, calling <tt>setlocale(LC_ALL, "C")</tt> will
-make this library behave equivalent to most traditional regular
-expression libraries including version 1 of this library.</p>
-
-<h3>C++ localization model.</h3>
-
-<p>This model is only in effect if the library is built with the
-pre-processor symbol BOOST_REGEX_USE_CPP_LOCALE defined. When this
-model is in effect each instance of basic_regex&lt;&gt; has its own
-instance of std::locale, class basic_regex&lt;&gt; also has a
-member function <i>imbue</i> which allows the locale for the
-expression to be set on a per-instance basis. Front end
-localization requires a POSIX message catalogue, which will be
-loaded via the std::messages facet of the expression's locale, the
-traits class exports the symbol:</p>
-
-<p>static std::string set_message_catalogue(const std::string&amp;
-s);</p>
-
-<p>which needs to be called with a string identifying the name of
-the message catalogue, <i>before</i> your code compiles any regular
-expressions (but not necessarily before you construct any <i>
-basic_regex</i> instances):</p>
-
-<p>
-boost::cpp_regex_traits&lt;char&gt;::set_message_catalogue("mycatalogue");</p>
-
-<p>Note that calling basic_regex&lt;&gt;::imbue will invalidate any
-expression currently compiled in that instance of
-basic_regex&lt;&gt;. This model is the one which closest fits the
-ethos of the C++ standard library, however it is the model which
-will produce the slowest code, and which is the least well
-supported by current standard library implementations, for example
-I have yet to find an implementation of std::locale which supports
-either message catalogues, or locales other than "C" or
-"POSIX".</p>
-
-<p>Finally note that if you build the library with a non-default
-localization model, then the appropriate pre-processor symbol
-(BOOST_REGEX_USE_C_LOCALE or BOOST_REGEX_USE_CPP_LOCALE) must be
-defined both when you build the support library, and when you
-include &lt;boost/regex.hpp&gt; or &lt;boost/cregex.hpp&gt; in your
-code. The best way to ensure this is to add the #define to
-&lt;boost/regex/user.hpp&gt;.</p>
-
-<h3>Providing a message catalogue:</h3>
-
-<p>In order to localize the front end of the library, you need to
-provide the library with the appropriate message strings contained
-either in a resource dll's string table (Win32 model), or a POSIX
-message catalogue (C or C++ models). In the latter case the
-messages must appear in message set zero of the catalogue. The
-messages and their id's are as follows:<br>
- &nbsp;</p>
-
-<p></p>
-
-<table id="Table2" cellspacing="0" cellpadding="6" width="624"
-border="0">
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">Message id</td>
-<td valign="top" width="32%">Meaning</td>
-<td valign="top" width="29%">Default value</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">101</td>
-<td valign="top" width="32%">The character used to start a
-sub-expression.</td>
-<td valign="top" width="29%">"("</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">102</td>
-<td valign="top" width="32%">The character used to end a
-sub-expression declaration.</td>
-<td valign="top" width="29%">")"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">103</td>
-<td valign="top" width="32%">The character used to denote an end of
-line assertion.</td>
-<td valign="top" width="29%">"$"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">104</td>
-<td valign="top" width="32%">The character used to denote the start
-of line assertion.</td>
-<td valign="top" width="29%">"^"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">105</td>
-<td valign="top" width="32%">The character used to denote the
-"match any character expression".</td>
-<td valign="top" width="29%">"."</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">106</td>
-<td valign="top" width="32%">The match zero or more times
-repetition operator.</td>
-<td valign="top" width="29%">"*"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">107</td>
-<td valign="top" width="32%">The match one or more repetition
-operator.</td>
-<td valign="top" width="29%">"+"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">108</td>
-<td valign="top" width="32%">The match zero or one repetition
-operator.</td>
-<td valign="top" width="29%">"?"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">109</td>
-<td valign="top" width="32%">The character set opening
-character.</td>
-<td valign="top" width="29%">"["</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">110</td>
-<td valign="top" width="32%">The character set closing
-character.</td>
-<td valign="top" width="29%">"]"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">111</td>
-<td valign="top" width="32%">The alternation operator.</td>
-<td valign="top" width="29%">"|"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">112</td>
-<td valign="top" width="32%">The escape character.</td>
-<td valign="top" width="29%">"\\"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">113</td>
-<td valign="top" width="32%">The hash character (not currently
-used).</td>
-<td valign="top" width="29%">"#"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">114</td>
-<td valign="top" width="32%">The range operator.</td>
-<td valign="top" width="29%">"-"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">115</td>
-<td valign="top" width="32%">The repetition operator opening
-character.</td>
-<td valign="top" width="29%">"{"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">116</td>
-<td valign="top" width="32%">The repetition operator closing
-character.</td>
-<td valign="top" width="29%">"}"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">117</td>
-<td valign="top" width="32%">The digit characters.</td>
-<td valign="top" width="29%">"0123456789"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">118</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the word boundary assertion.</td>
-<td valign="top" width="29%">"b"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">119</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the non-word boundary
-assertion.</td>
-<td valign="top" width="29%">"B"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">120</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the word-start boundary
-assertion.</td>
-<td valign="top" width="29%">"&lt;"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">121</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the word-end boundary
-assertion.</td>
-<td valign="top" width="29%">"&gt;"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">122</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any word character.</td>
-<td valign="top" width="29%">"w"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">123</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents a non-word character.</td>
-<td valign="top" width="29%">"W"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">124</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents a start of buffer assertion.</td>
-<td valign="top" width="29%">"`A"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">125</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents an end of buffer assertion.</td>
-<td valign="top" width="29%">"'z"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">126</td>
-<td valign="top" width="32%">The newline character.</td>
-<td valign="top" width="29%">"\n"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">127</td>
-<td valign="top" width="32%">The comma separator.</td>
-<td valign="top" width="29%">","</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">128</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the bell character.</td>
-<td valign="top" width="29%">"a"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">129</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the form feed character.</td>
-<td valign="top" width="29%">"f"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">130</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the newline character.</td>
-<td valign="top" width="29%">"n"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">131</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the carriage return character.</td>
-<td valign="top" width="29%">"r"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">132</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the tab character.</td>
-<td valign="top" width="29%">"t"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">133</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the vertical tab character.</td>
-<td valign="top" width="29%">"v"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">134</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the start of a hexadecimal character
-constant.</td>
-<td valign="top" width="29%">"x"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">135</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the start of an ASCII escape
-character.</td>
-<td valign="top" width="29%">"c"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">136</td>
-<td valign="top" width="32%">The colon character.</td>
-<td valign="top" width="29%">":"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">137</td>
-<td valign="top" width="32%">The equals character.</td>
-<td valign="top" width="29%">"="</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">138</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the ASCII escape character.</td>
-<td valign="top" width="29%">"e"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">139</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any lower case character.</td>
-<td valign="top" width="29%">"l"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">140</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any non-lower case character.</td>
-<td valign="top" width="29%">"L"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">141</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any upper case character.</td>
-<td valign="top" width="29%">"u"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">142</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any non-upper case character.</td>
-<td valign="top" width="29%">"U"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">143</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any space character.</td>
-<td valign="top" width="29%">"s"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">144</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any non-space character.</td>
-<td valign="top" width="29%">"S"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">145</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any digit character.</td>
-<td valign="top" width="29%">"d"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">146</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any non-digit character.</td>
-<td valign="top" width="29%">"D"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">147</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the end quote operator.</td>
-<td valign="top" width="29%">"E"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">148</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the start quote operator.</td>
-<td valign="top" width="29%">"Q"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">149</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents a Unicode combining character
-sequence.</td>
-<td valign="top" width="29%">"X"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">150</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any single character.</td>
-<td valign="top" width="29%">"C"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">151</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents end of buffer operator.</td>
-<td valign="top" width="29%">"Z"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">152</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the continuation assertion.</td>
-<td valign="top" width="29%">"G"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td>&nbsp;</td>
-<td>153</td>
-<td>The character which when preceeded by (? indicates a zero width
-negated forward lookahead assert.</td>
-<td>!</td>
-<td>&nbsp;</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<p>Custom error messages are loaded as follows:&nbsp;</p>
-
-<p></p>
-
-<table id="Table3" cellspacing="0" cellpadding="7" width="624"
-border="0">
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">Message ID</td>
-<td valign="top" width="32%">Error message ID</td>
-<td valign="top" width="31%">Default string</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">201</td>
-<td valign="top" width="32%">REG_NOMATCH</td>
-<td valign="top" width="31%">"No match"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">202</td>
-<td valign="top" width="32%">REG_BADPAT</td>
-<td valign="top" width="31%">"Invalid regular expression"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">203</td>
-<td valign="top" width="32%">REG_ECOLLATE</td>
-<td valign="top" width="31%">"Invalid collation character"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">204</td>
-<td valign="top" width="32%">REG_ECTYPE</td>
-<td valign="top" width="31%">"Invalid character class name"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">205</td>
-<td valign="top" width="32%">REG_EESCAPE</td>
-<td valign="top" width="31%">"Trailing backslash"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">206</td>
-<td valign="top" width="32%">REG_ESUBREG</td>
-<td valign="top" width="31%">"Invalid back reference"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">207</td>
-<td valign="top" width="32%">REG_EBRACK</td>
-<td valign="top" width="31%">"Unmatched [ or [^"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">208</td>
-<td valign="top" width="32%">REG_EPAREN</td>
-<td valign="top" width="31%">"Unmatched ( or \\("</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">209</td>
-<td valign="top" width="32%">REG_EBRACE</td>
-<td valign="top" width="31%">"Unmatched \\{"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">210</td>
-<td valign="top" width="32%">REG_BADBR</td>
-<td valign="top" width="31%">"Invalid content of \\{\\}"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">211</td>
-<td valign="top" width="32%">REG_ERANGE</td>
-<td valign="top" width="31%">"Invalid range end"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">212</td>
-<td valign="top" width="32%">REG_ESPACE</td>
-<td valign="top" width="31%">"Memory exhausted"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">213</td>
-<td valign="top" width="32%">REG_BADRPT</td>
-<td valign="top" width="31%">"Invalid preceding regular
-expression"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">214</td>
-<td valign="top" width="32%">REG_EEND</td>
-<td valign="top" width="31%">"Premature end of regular
-expression"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">215</td>
-<td valign="top" width="32%">REG_ESIZE</td>
-<td valign="top" width="31%">"Regular expression too big"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">216</td>
-<td valign="top" width="32%">REG_ERPAREN</td>
-<td valign="top" width="31%">"Unmatched ) or \\)"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">217</td>
-<td valign="top" width="32%">REG_EMPTY</td>
-<td valign="top" width="31%">"Empty expression"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">218</td>
-<td valign="top" width="32%">REG_E_UNKNOWN</td>
-<td valign="top" width="31%">"Unknown error"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<p>Custom character class names are loaded as followed:&nbsp;</p>
-
-<p></p>
-
-<table id="Table4" cellspacing="0" cellpadding="7" width="624"
-border="0">
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">Message ID</td>
-<td valign="top" width="32%">Description</td>
-<td valign="top" width="31%">Equivalent default class name</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">300</td>
-<td valign="top" width="32%">The character class name for
-alphanumeric characters.</td>
-<td valign="top" width="31%">"alnum"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">301</td>
-<td valign="top" width="32%">The character class name for
-alphabetic characters.</td>
-<td valign="top" width="31%">"alpha"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">302</td>
-<td valign="top" width="32%">The character class name for control
-characters.</td>
-<td valign="top" width="31%">"cntrl"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">303</td>
-<td valign="top" width="32%">The character class name for digit
-characters.</td>
-<td valign="top" width="31%">"digit"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">304</td>
-<td valign="top" width="32%">The character class name for graphics
-characters.</td>
-<td valign="top" width="31%">"graph"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">305</td>
-<td valign="top" width="32%">The character class name for lower
-case characters.</td>
-<td valign="top" width="31%">"lower"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">306</td>
-<td valign="top" width="32%">The character class name for printable
-characters.</td>
-<td valign="top" width="31%">"print"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">307</td>
-<td valign="top" width="32%">The character class name for
-punctuation characters.</td>
-<td valign="top" width="31%">"punct"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">308</td>
-<td valign="top" width="32%">The character class name for space
-characters.</td>
-<td valign="top" width="31%">"space"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">309</td>
-<td valign="top" width="32%">The character class name for upper
-case characters.</td>
-<td valign="top" width="31%">"upper"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">310</td>
-<td valign="top" width="32%">The character class name for
-hexadecimal characters.</td>
-<td valign="top" width="31%">"xdigit"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">311</td>
-<td valign="top" width="32%">The character class name for blank
-characters.</td>
-<td valign="top" width="31%">"blank"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">312</td>
-<td valign="top" width="32%">The character class name for word
-characters.</td>
-<td valign="top" width="31%">"word"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">313</td>
-<td valign="top" width="32%">The character class name for Unicode
-characters.</td>
-<td valign="top" width="31%">"unicode"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<p>Finally, custom collating element names are loaded starting from
-message id 400, and terminating when the first load thereafter
-fails. Each message looks something like: "tagname string" where
-<i>tagname</i> is the name used inside [[.tagname.]] and <i>
-string</i> is the actual text of the collating element. Note that
-the value of collating element [[.zero.]] is used for the
-conversion of strings to numbers - if you replace this with another
-value then that will be used for string parsing - for example use
-the Unicode character 0x0660 for [[.zero.]] if you want to use
-Unicode Arabic-Indic digits in your regular expressions in place of
-Latin digits.</p>
-
-<p>Note that the POSIX defined names for character classes and
-collating elements are always available - even if custom names are
-defined, in contrast, custom error messages, and custom syntax
-messages replace the default ones.</p>
-
-<p></p>
-
-<hr>
-      <p>Revised 
+   <head>
+      <title>Boost.Regex: Localisation</title>
+      <meta name="generator" content="HTML Tidy, see www.w3.org">
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+      <link rel="stylesheet" type="text/css" href="../../../boost.css">
+   </head>
+   <body>
+      <p></p>
+      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
+         <tr>
+            <td valign="top" width="300">
+               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
+            </td>
+            <td width="353">
+               <h1 align="center">Boost.Regex</h1>
+               <h2 align="center">Localisation</h2>
+            </td>
+            <td width="50">
+               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
+            </td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <hr>
+      <p>Boost.regex&nbsp;provides extensive support for run-time localization, the 
+         localization model used can be split into two parts: front-end and back-end.</p>
+      <p>Front-end localization deals with everything which the user sees - error 
+         messages, and the regular expression syntax itself. For example a French 
+         application could change [[:word:]] to [[:mot:]] and \w to \m. Modifying the 
+         front end locale requires active support from the developer, by providing the 
+         library with a message catalogue to load, containing the localized strings. 
+         Front-end locale is affected by the LC_MESSAGES category only.</p>
+      <p>Back-end localization deals with everything that occurs after the expression 
+         has been parsed - in other words everything that the user does not see or 
+         interact with directly. It deals with case conversion, collation, and character 
+         class membership. The back-end locale does not require any intervention from 
+         the developer - the library will acquire all the information it requires for 
+         the current locale from the underlying operating system / run time library. 
+         This means that if the program user does not interact with regular expressions 
+         directly - for example if the expressions are embedded in your C++ code - then 
+         no explicit localization is required, as the library will take care of 
+         everything for you. For example embedding the expression [[:word:]]+ in your 
+         code will always match a whole word, if the program is run on a machine with, 
+         for example, a Greek locale, then it will still match a whole word, but in 
+         Greek characters rather than Latin ones. The back-end locale is affected by the 
+         LC_TYPE and LC_COLLATE categories.</p>
+      <p>There are three separate localization mechanisms supported by boost.regex:</p>
+      <h3>Win32 localization model.</h3>
+      <p>This is the default model when the library is compiled under Win32, and is 
+         encapsulated by the traits class w32_regex_traits. When this model is in effect 
+         each basic_regex object gets it's own LCID, by default this is the users 
+         default setting as returned by GetUserDefaultLCID, but you can call <EM>imbue</EM>
+         on the basic_regex object to set it's locale to some other LCID if you wish. 
+         All the settings used by boost.regex are acquired directly from the operating 
+         system bypassing the C run time library. Front-end localization requires a 
+         resource dll, containing a string table with the user-defined strings. The 
+         traits class exports the function:</p>
+      <p>static std::string set_message_catalogue(const std::string&amp; s);</p>
+      <p>which needs to be called with a string identifying the name of the resource 
+         dll, <i>before</i> your code compiles any regular expressions (but not 
+         necessarily before you construct any <i>basic_regex</i> instances):</p>
+      <p>
+         boost::w32_regex_traits&lt;char&gt;::set_message_catalogue("mydll.dll");</p>
+      <p>
+         The library provides full Unicode support under NT, under Windows 9x the 
+         library degrades gracefully - characters 0 to 255 are supported, the remainder 
+         are treated as "unknown" graphic characters.</p>
+      <h3>C localization model.</h3>
+      <p>This model has been deprecated in favor of the C++ localoe for all non-Windows 
+         compilers that support&nbsp;it.&nbsp; This locale is encapsulated by the traits 
+         class <i>c_regex_traits</i>, Win32 users can force this model to take effect by 
+         defining the pre-processor symbol BOOST_REGEX_USE_C_LOCALE. When this model is 
+         in effect there is a single global locale, as set by <i>setlocale</i>. All 
+         settings are acquired from your run time library, consequently Unicode support 
+         is dependent upon your run time library implementation.</p>
+      <P>Front end localization is not supported.</P>
+      <P>Note that calling <i>setlocale</i> invalidates all compiled regular 
+         expressions, calling <tt>setlocale(LC_ALL, "C")</tt> will make this library 
+         behave equivalent to most traditional regular expression libraries including 
+         version 1 of this library.</P>
+      <h3>C++ localization model.</h3>
+      <p>This model is the default for non-Windows compilers.</p>
+      <P>
+         When this model is in effect each instance of basic_regex&lt;&gt; has its own 
+         instance of std::locale, class basic_regex&lt;&gt; also has a member function <i>imbue</i>
+         which allows the locale for the expression to be set on a per-instance basis. 
+         Front end localization requires a POSIX message catalogue, which will be loaded 
+         via the std::messages facet of the expression's locale, the traits class 
+         exports the symbol:</P>
+      <p>static std::string set_message_catalogue(const std::string&amp; s);</p>
+      <p>which needs to be called with a string identifying the name of the message 
+         catalogue, <i>before</i> your code compiles any regular expressions (but not 
+         necessarily before you construct any <i>basic_regex</i> instances):</p>
+      <p>
+         boost::cpp_regex_traits&lt;char&gt;::set_message_catalogue("mycatalogue");</p>
+      <p>Note that calling basic_regex&lt;&gt;::imbue will invalidate any expression 
+         currently compiled in that instance of basic_regex&lt;&gt;.</p>
+      <P>Finally note that if you build the library with a non-default localization 
+         model, then the appropriate pre-processor symbol (BOOST_REGEX_USE_C_LOCALE or 
+         BOOST_REGEX_USE_CPP_LOCALE) must be defined both when you build the support 
+         library, and when you include &lt;boost/regex.hpp&gt; or 
+         &lt;boost/cregex.hpp&gt; in your code. The best way to ensure this is to add 
+         the #define to &lt;boost/regex/user.hpp&gt;.</P>
+      <h3>Providing a message catalogue:</h3>
+      <p>
+         In order to localize the front end of the library, you need to provide the 
+         library with the appropriate message strings contained either in a resource 
+         dll's string table (Win32 model), or a POSIX message catalogue (C++ models). In 
+         the latter case the messages must appear in message set zero of the catalogue. 
+         The messages and their id's are as follows:<br>
+         &nbsp;</p>
+      <p></p>
+      <table id="Table2" cellspacing="0" cellpadding="6" width="624" border="0">
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">Message id</td>
+            <td valign="top" width="32%">Meaning</td>
+            <td valign="top" width="29%">Default value</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">101</td>
+            <td valign="top" width="32%">The character used to start a sub-expression.</td>
+            <td valign="top" width="29%">"("</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">102</td>
+            <td valign="top" width="32%">The character used to end a sub-expression 
+               declaration.</td>
+            <td valign="top" width="29%">")"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">103</td>
+            <td valign="top" width="32%">The character used to denote an end of line 
+               assertion.</td>
+            <td valign="top" width="29%">"$"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">104</td>
+            <td valign="top" width="32%">The character used to denote the start of line 
+               assertion.</td>
+            <td valign="top" width="29%">"^"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">105</td>
+            <td valign="top" width="32%">The character used to denote the "match any character 
+               expression".</td>
+            <td valign="top" width="29%">"."</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">106</td>
+            <td valign="top" width="32%">The match zero or more times repetition operator.</td>
+            <td valign="top" width="29%">"*"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">107</td>
+            <td valign="top" width="32%">The match one or more repetition operator.</td>
+            <td valign="top" width="29%">"+"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">108</td>
+            <td valign="top" width="32%">The match zero or one repetition operator.</td>
+            <td valign="top" width="29%">"?"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">109</td>
+            <td valign="top" width="32%">The character set opening character.</td>
+            <td valign="top" width="29%">"["</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">110</td>
+            <td valign="top" width="32%">The character set closing character.</td>
+            <td valign="top" width="29%">"]"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">111</td>
+            <td valign="top" width="32%">The alternation operator.</td>
+            <td valign="top" width="29%">"|"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">112</td>
+            <td valign="top" width="32%">The escape character.</td>
+            <td valign="top" width="29%">"\\"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">113</td>
+            <td valign="top" width="32%">The hash character (not currently used).</td>
+            <td valign="top" width="29%">"#"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">114</td>
+            <td valign="top" width="32%">The range operator.</td>
+            <td valign="top" width="29%">"-"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">115</td>
+            <td valign="top" width="32%">The repetition operator opening character.</td>
+            <td valign="top" width="29%">"{"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">116</td>
+            <td valign="top" width="32%">The repetition operator closing character.</td>
+            <td valign="top" width="29%">"}"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">117</td>
+            <td valign="top" width="32%">The digit characters.</td>
+            <td valign="top" width="29%">"0123456789"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">118</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the word boundary assertion.</td>
+            <td valign="top" width="29%">"b"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">119</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the non-word boundary assertion.</td>
+            <td valign="top" width="29%">"B"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">120</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the word-start boundary assertion.</td>
+            <td valign="top" width="29%">"&lt;"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">121</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the word-end boundary assertion.</td>
+            <td valign="top" width="29%">"&gt;"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">122</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any word character.</td>
+            <td valign="top" width="29%">"w"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">123</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents a non-word character.</td>
+            <td valign="top" width="29%">"W"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">124</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents a start of buffer assertion.</td>
+            <td valign="top" width="29%">"`A"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">125</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents an end of buffer assertion.</td>
+            <td valign="top" width="29%">"'z"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">126</td>
+            <td valign="top" width="32%">The newline character.</td>
+            <td valign="top" width="29%">"\n"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">127</td>
+            <td valign="top" width="32%">The comma separator.</td>
+            <td valign="top" width="29%">","</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">128</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the bell character.</td>
+            <td valign="top" width="29%">"a"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">129</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the form feed character.</td>
+            <td valign="top" width="29%">"f"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">130</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the newline character.</td>
+            <td valign="top" width="29%">"n"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">131</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the carriage return character.</td>
+            <td valign="top" width="29%">"r"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">132</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the tab character.</td>
+            <td valign="top" width="29%">"t"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">133</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the vertical tab character.</td>
+            <td valign="top" width="29%">"v"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">134</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the start of a hexadecimal character constant.</td>
+            <td valign="top" width="29%">"x"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">135</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the start of an ASCII escape character.</td>
+            <td valign="top" width="29%">"c"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">136</td>
+            <td valign="top" width="32%">The colon character.</td>
+            <td valign="top" width="29%">":"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">137</td>
+            <td valign="top" width="32%">The equals character.</td>
+            <td valign="top" width="29%">"="</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">138</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the ASCII escape character.</td>
+            <td valign="top" width="29%">"e"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">139</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any lower case character.</td>
+            <td valign="top" width="29%">"l"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">140</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any non-lower case character.</td>
+            <td valign="top" width="29%">"L"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">141</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any upper case character.</td>
+            <td valign="top" width="29%">"u"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">142</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any non-upper case character.</td>
+            <td valign="top" width="29%">"U"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">143</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any space character.</td>
+            <td valign="top" width="29%">"s"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">144</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any non-space character.</td>
+            <td valign="top" width="29%">"S"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">145</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any digit character.</td>
+            <td valign="top" width="29%">"d"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">146</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any non-digit character.</td>
+            <td valign="top" width="29%">"D"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">147</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the end quote operator.</td>
+            <td valign="top" width="29%">"E"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">148</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the start quote operator.</td>
+            <td valign="top" width="29%">"Q"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">149</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents a Unicode combining character sequence.</td>
+            <td valign="top" width="29%">"X"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">150</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any single character.</td>
+            <td valign="top" width="29%">"C"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">151</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents end of buffer operator.</td>
+            <td valign="top" width="29%">"Z"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">152</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the continuation assertion.</td>
+            <td valign="top" width="29%">"G"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td>&nbsp;</td>
+            <td>153</td>
+            <td>The character which when preceeded by (? indicates a zero width negated 
+               forward lookahead assert.</td>
+            <td>!</td>
+            <td>&nbsp;</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <p>Custom error messages are loaded as follows:&nbsp;</p>
+      <p></p>
+      <table id="Table3" cellspacing="0" cellpadding="7" width="624" border="0">
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">Message ID</td>
+            <td valign="top" width="32%">Error message ID</td>
+            <td valign="top" width="31%">Default string</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">201</td>
+            <td valign="top" width="32%">REG_NOMATCH</td>
+            <td valign="top" width="31%">"No match"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">202</td>
+            <td valign="top" width="32%">REG_BADPAT</td>
+            <td valign="top" width="31%">"Invalid regular expression"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">203</td>
+            <td valign="top" width="32%">REG_ECOLLATE</td>
+            <td valign="top" width="31%">"Invalid collation character"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">204</td>
+            <td valign="top" width="32%">REG_ECTYPE</td>
+            <td valign="top" width="31%">"Invalid character class name"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">205</td>
+            <td valign="top" width="32%">REG_EESCAPE</td>
+            <td valign="top" width="31%">"Trailing backslash"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">206</td>
+            <td valign="top" width="32%">REG_ESUBREG</td>
+            <td valign="top" width="31%">"Invalid back reference"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">207</td>
+            <td valign="top" width="32%">REG_EBRACK</td>
+            <td valign="top" width="31%">"Unmatched [ or [^"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">208</td>
+            <td valign="top" width="32%">REG_EPAREN</td>
+            <td valign="top" width="31%">"Unmatched ( or \\("</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">209</td>
+            <td valign="top" width="32%">REG_EBRACE</td>
+            <td valign="top" width="31%">"Unmatched \\{"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">210</td>
+            <td valign="top" width="32%">REG_BADBR</td>
+            <td valign="top" width="31%">"Invalid content of \\{\\}"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">211</td>
+            <td valign="top" width="32%">REG_ERANGE</td>
+            <td valign="top" width="31%">"Invalid range end"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">212</td>
+            <td valign="top" width="32%">REG_ESPACE</td>
+            <td valign="top" width="31%">"Memory exhausted"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">213</td>
+            <td valign="top" width="32%">REG_BADRPT</td>
+            <td valign="top" width="31%">"Invalid preceding regular expression"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">214</td>
+            <td valign="top" width="32%">REG_EEND</td>
+            <td valign="top" width="31%">"Premature end of regular expression"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">215</td>
+            <td valign="top" width="32%">REG_ESIZE</td>
+            <td valign="top" width="31%">"Regular expression too big"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">216</td>
+            <td valign="top" width="32%">REG_ERPAREN</td>
+            <td valign="top" width="31%">"Unmatched ) or \\)"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">217</td>
+            <td valign="top" width="32%">REG_EMPTY</td>
+            <td valign="top" width="31%">"Empty expression"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">218</td>
+            <td valign="top" width="32%">REG_E_UNKNOWN</td>
+            <td valign="top" width="31%">"Unknown error"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <p>Custom character class names are loaded as followed:&nbsp;</p>
+      <p></p>
+      <table id="Table4" cellspacing="0" cellpadding="7" width="624" border="0">
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">Message ID</td>
+            <td valign="top" width="32%">Description</td>
+            <td valign="top" width="31%">Equivalent default class name</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">300</td>
+            <td valign="top" width="32%">The character class name for alphanumeric characters.</td>
+            <td valign="top" width="31%">"alnum"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">301</td>
+            <td valign="top" width="32%">The character class name for alphabetic characters.</td>
+            <td valign="top" width="31%">"alpha"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">302</td>
+            <td valign="top" width="32%">The character class name for control characters.</td>
+            <td valign="top" width="31%">"cntrl"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">303</td>
+            <td valign="top" width="32%">The character class name for digit characters.</td>
+            <td valign="top" width="31%">"digit"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">304</td>
+            <td valign="top" width="32%">The character class name for graphics characters.</td>
+            <td valign="top" width="31%">"graph"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">305</td>
+            <td valign="top" width="32%">The character class name for lower case characters.</td>
+            <td valign="top" width="31%">"lower"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">306</td>
+            <td valign="top" width="32%">The character class name for printable characters.</td>
+            <td valign="top" width="31%">"print"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">307</td>
+            <td valign="top" width="32%">The character class name for punctuation characters.</td>
+            <td valign="top" width="31%">"punct"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">308</td>
+            <td valign="top" width="32%">The character class name for space characters.</td>
+            <td valign="top" width="31%">"space"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">309</td>
+            <td valign="top" width="32%">The character class name for upper case characters.</td>
+            <td valign="top" width="31%">"upper"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">310</td>
+            <td valign="top" width="32%">The character class name for hexadecimal characters.</td>
+            <td valign="top" width="31%">"xdigit"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">311</td>
+            <td valign="top" width="32%">The character class name for blank characters.</td>
+            <td valign="top" width="31%">"blank"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">312</td>
+            <td valign="top" width="32%">The character class name for word characters.</td>
+            <td valign="top" width="31%">"word"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">313</td>
+            <td valign="top" width="32%">The character class name for Unicode characters.</td>
+            <td valign="top" width="31%">"unicode"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <p>Finally, custom collating element names are loaded starting from message id 
+         400, and terminating when the first load thereafter fails. Each message looks 
+         something like: "tagname string" where <i>tagname</i> is the name used inside 
+         [[.tagname.]] and <i>string</i> is the actual text of the collating element. 
+         Note that the value of collating element [[.zero.]] is used for the conversion 
+         of strings to numbers - if you replace this with another value then that will 
+         be used for string parsing - for example use the Unicode character 0x0660 for 
+         [[.zero.]] if you want to use Unicode Arabic-Indic digits in your regular 
+         expressions in place of Latin digits.</p>
+      <p>Note that the POSIX defined names for character classes and collating elements 
+         are always available - even if custom names are defined, in contrast, custom 
+         error messages, and custom syntax messages replace the default ones.</p>
+      <p></p>
+      <hr>
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         26 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-</body>
+   </body>
 </html>
-
-
diff --git a/doc/Attic/match_results.html b/doc/Attic/match_results.html
index 3350ec1c..1382f026 100644
--- a/doc/Attic/match_results.html
+++ b/doc/Attic/match_results.html
@@ -51,7 +51,7 @@
       <p>Class template match_results is most commonly used as one of the typedefs 
          cmatch, wcmatch, smatch, or wsmatch:</p>
       <pre>template &lt;class BidirectionalIterator,
-          class Allocator = allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
+          class Allocator = std::allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
 class match_results;
 
 typedef match_results&lt;const char*&gt; cmatch;
@@ -60,7 +60,7 @@ typedef match_results&lt;string::const_iterator&gt; smatch;
 typedef match_results&lt;wstring::const_iterator&gt; wsmatch;
 
 template &lt;class BidirectionalIterator,
-          class Allocator = allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
+          class Allocator = std::allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
 class match_results
 { 
 public: 
@@ -455,4 +455,3 @@ void swap(match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m1,
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
-
diff --git a/doc/Attic/redistributables.html b/doc/Attic/redistributables.html
index d93bdf9e..65d43b64 100644
--- a/doc/Attic/redistributables.html
+++ b/doc/Attic/redistributables.html
@@ -32,51 +32,22 @@
          your application, and not in the PC's directory path. Note that if you link to 
          a static version of your run time library, then you will also link to a static 
          version of boost.regex and no dll's will need to be distributed. The possible 
-         boost.regex dll and library names are computed according to the following 
-         formula:<BR>
+         boost.regex dll and library names are computed according to the <A href="../../../more/getting_started.html#step5">
+            formula given in the getting started guide</A>.
+      </P>
+      <P>Note: you can disable automatic library selection by defining the symbol 
+         BOOST_REGEX_NO_LIB when compiling, this is useful if you want to build 
+         Boost.Regex yourself in your IDE, or if you need to debug boost.regex.
       </P>
-      <P></P>
-      <P>BOOST_LIB_PREFIX<BR>
-         + "boost_regex_"<BR>
-         + BOOST_LIB_TOOLSET<BR>
-         + "_"<BR>
-         + BOOST_LIB_THREAD_OPT<BR>
-         + BOOST_LIB_RT_OPT<BR>
-         + BOOST_LIB_DEBUG_OPT<BR>
-         <BR>
-         These are defined as:</P>
-      <P>BOOST_LIB_PREFIX: Either "lib" if this is a static link library, 
-         or&nbsp;nothing for dynamic / shared&nbsp;libraries.<BR>
-         <BR>
-         BOOST_LIB_TOOLSET: The compiler toolset name (vc6, vc7, bcb5 etc).<BR>
-         <BR>
-         BOOST_LIB_THREAD_OPT: "s" for single thread builds,<BR>
-         "m" for multithread builds.<BR>
-         <BR>
-         BOOST_LIB_RT_OPT: "s" for static runtime,<BR>
-         "d" for dynamic runtime.<BR>
-         <BR>
-         BOOST_LIB_LINK_OPT: "s" for static link,<BR>
-         "i" for dynamic link.<BR>
-         <BR>
-         BOOST_LIB_DEBUG_OPT: nothing for release builds,<BR>
-         "d" for debug builds,<BR>
-         "dd" for debug-diagnostic builds (_STLP_DEBUG).</P>
-      <P>
-      Note: you can disable automatic library selection by defining the symbol 
-      BOOST_REGEX_NO_LIB when compiling, this is useful if you want to statically 
-      link even though you're using the dll version of your run time library, or if 
-      you need to debug boost.regex.
       <P>
          <HR>
       <P></P>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         28 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/Attic/regex_grep.html b/doc/Attic/regex_grep.html
index e2e4c355..0996aeb9 100644
--- a/doc/Attic/regex_grep.html
+++ b/doc/Attic/regex_grep.html
@@ -37,11 +37,11 @@
          locate all the (non-overlapping) matches with a given regular expression. The 
          function is declared as:</p>
       <pre>
-<b>template</b> &lt;<b>class</b> Predicate, <b>class</b> iterator, <b>class</b> charT, <b>class</b> traits, <b>class</b> Allocator&gt;
+<b>template</b> &lt;<b>class</b> Predicate, <b>class</b> iterator, <b>class</b> charT, <b>class</b> traits&gt;
 <b>unsigned</b> <b>int</b> regex_grep(Predicate foo,
                          iterator first,
                          iterator last,
-                         <b>const</b> basic_regex&lt;charT, traits, Allocator&gt;&amp; e,
+                         <b>const</b> basic_regex&lt;charT, traits&gt;&amp; e,
                          boost::match_flag_type flags = match_default)
 </pre>
       <p>The library also defines the following convenience versions, which take either 
@@ -49,16 +49,16 @@
          iterators [note - these versions may not be available, or may be available in a 
          more limited form, depending upon your compilers capabilities]:</p>
       <pre>
-<b>template</b> &lt;<b>class</b> Predicate, <b>class</b> charT, <b>class</b> Allocator, <b>class</b> traits&gt;
+<b>template</b> &lt;<b>class</b> Predicate, <b>class</b> charT, <b>class</b> traits&gt;
 <b>unsigned</b> <b>int</b> regex_grep(Predicate foo, 
               <b>const</b> charT* str, 
-              <b>const</b> basic_regex&lt;charT, traits, Allocator&gt;&amp; e, 
+              <b>const</b> basic_regex&lt;charT, traits&gt;&amp; e, 
               boost::match_flag_type flags = match_default);
 
-<b>template</b> &lt;<b>class</b> Predicate, <b>class</b> ST, <b>class</b> SA, <b>class</b> Allocator, <b>class</b> charT, <b>class</b> traits&gt;
+<b>template</b> &lt;<b>class</b> Predicate, <b>class</b> ST, <b>class</b> SA, <b>class</b> charT, <b>class</b> traits&gt;
 <b>unsigned</b> <b>int</b> regex_grep(Predicate foo, 
               <b>const</b> std::basic_string&lt;charT, ST, SA&gt;&amp; s, 
-              <b>const</b> basic_regex&lt;charT, traits, Allocator&gt;&amp; e, 
+              <b>const</b> basic_regex&lt;charT, traits&gt;&amp; e, 
               boost::match_flag_type flags = match_default);
 </pre>
       <p>The parameters for the primary version of regex_grep have the following 
@@ -101,23 +101,19 @@
       <br>
       <br>
       <p>The algorithm finds all of the non-overlapping matches of the expression e, for 
-         each match it fills a <a href="#reg_match">match_results</a>&lt;iterator, 
-         Allocator&gt; structure, which contains information on what matched, and calls 
-         the predicate foo, passing the match_results&lt;iterator, Allocator&gt; as a 
-         single argument. If the predicate returns true, then the grep operation 
-         continues, otherwise it terminates without searching for further matches. The 
-         function returns the number of matches found.</p>
+         each match it fills a <a href="#reg_match">match_results</a>&lt;iterator&gt; 
+         structure, which contains information on what matched, and calls the predicate 
+         foo, passing the match_results&lt;iterator&gt; as a single argument. If the 
+         predicate returns true, then the grep operation continues, otherwise it 
+         terminates without searching for further matches. The function returns the 
+         number of matches found.</p>
       <p>The general form of the predicate is:</p>
       <pre>
 <b>struct</b> grep_predicate
 {
- <b>  bool</b> <b>operator</b>()(<b>const</b> match_results&lt;iterator_type, typename expression_type::alloc_type::template rebind&lt;sub_match&lt;BidirectionalIterator&gt; &gt;::other&gt;&amp; m);
+ <b>  bool</b> <b>operator</b>()(<b>const</b> match_results&lt;iterator_type&gt;&amp; m);
 };
 </pre>
-      <p>Note that in almost every case the allocator parameter can be omitted, when 
-         specifying the <a href="match_results.html">match_results</a> type, 
-         alternatively one of the typedefs cmatch, wcmatch, smatch or wsmatch can be 
-         used.</p>
       <p>For example the regular expression "a*b" would find one match in the string 
          "aaaaab" and two in the string "aaabb".</p>
       <p>Remember this algorithm can be used for a lot more than implementing a version 
@@ -370,7 +366,7 @@ index[std::string(what[5].first, what[5].second) + std::string(what[6].first, wh
       <hr>
       <p>Revised 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         04 Feb 2004 
+         26 June 2004 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
             <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
diff --git a/doc/Attic/regex_iterator.html b/doc/Attic/regex_iterator.html
index 7e77f6b7..f5b88ed1 100644
--- a/doc/Attic/regex_iterator.html
+++ b/doc/Attic/regex_iterator.html
@@ -37,12 +37,11 @@
       <pre>
 template &lt;class BidirectionalIterator, 
           class charT = iterator_traits&lt;BidirectionalIterator&gt;::value_type,
-          class traits = regex_traits&lt;charT&gt;,
-          class Allocator = allocator&lt;charT&gt; &gt;
+          class traits = regex_traits&lt;charT&gt; &gt;
 class regex_iterator 
 {
 public:
-   typedef          <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator&gt;                   regex_type;
+   typedef          <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;                              regex_type;
    typedef          <A href="match_results.html">match_results</A>&lt;BidirectionalIterator&gt;                    value_type;
    typedef typename iterator_traits&lt;BidirectionalIterator&gt;::difference_type difference_type;
    typedef          const value_type*                                       pointer;
@@ -419,9 +418,9 @@ color=
 }
 </pre>
       <hr>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         26 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
             <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
diff --git a/doc/Attic/regex_match.html b/doc/Attic/regex_match.html
index fd8e5bd7..3d65d8cc 100644
--- a/doc/Attic/regex_match.html
+++ b/doc/Attic/regex_match.html
@@ -42,46 +42,44 @@
          If you want to match a prefix of the character string then use <A href="regex_search.html">
             regex_search</A> with the flag <A href="match_flag_type.html">match_continuous</A>
          set.
-         <PRE>template &lt;class BidirectionalIterator, class Allocator, class charT,
-          class traits, class Allocator2&gt;
+         <PRE>
+template &lt;class BidirectionalIterator, class Allocator, class charT, class traits&gt;
 bool <A href="#f1">regex_match</A>(BidirectionalIterator first, BidirectionalIterator last,
                  <A href="match_results.html">match_results</A>&lt;BidirectionalIterator, Allocator&gt;&amp; m,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
-                 
-template &lt;class BidirectionalIterator, class charT, class traits, class Allocator2&gt;
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
+                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
+
+template &lt;class BidirectionalIterator, class charT, class traits&gt;
 bool <A href="#f2">regex_match</A>(BidirectionalIterator first, BidirectionalIterator last,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
-                 
-template &lt;class charT, class Allocator, class traits, class Allocator2&gt;
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
+                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
+
+template &lt;class charT, class Allocator, class traits&gt;
 bool <A href="#f3">regex_match</A>(const charT* str, <A href="match_results.html">match_results</A>&lt;const charT*, Allocator&gt;&amp; m,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
-                 
-template &lt;class ST, class SA, class Allocator, class charT,
-          class traits, class Allocator2&gt;
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
+                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
+
+template &lt;class ST, class SA, class Allocator, class charT, class traits&gt;
 bool <A href="#f4">regex_match</A>(const basic_string&lt;charT, ST, SA&gt;&amp; s,
                  <A href="match_results.html">match_results</A>&lt;typename basic_string&lt;charT, ST, SA&gt;::const_iterator, Allocator&gt;&amp; m, 
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e, 
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
-                 
-template &lt;class charT, class traits, class Allocator2&gt;
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e, 
+                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
+
+template &lt;class charT, class traits&gt;
 bool <A href="#f5">regex_match</A>(const charT* str,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
-                 
-template &lt;class ST, class SA, class charT, class traits, class Allocator2&gt;
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
+                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
+
+template &lt;class ST, class SA, class charT, class traits&gt;
 bool <A href="#f6">regex_match</A>(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
                  <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
 </PRE>
          <H3><A name="description"></A>Description</H3>
-         <PRE><A name=f1></A>template &lt;class BidirectionalIterator, class Allocator, class charT,
-          class traits, class Allocator2&gt;
+         <PRE><A name=f1></A>template &lt;class BidirectionalIterator, class Allocator, class charT, class traits&gt;
 bool regex_match(BidirectionalIterator first, BidirectionalIterator last,
                  <A href="match_results.html">match_results</A>&lt;BidirectionalIterator, Allocator&gt;&amp; m,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
                  <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
       <P><B> Requires:</B> Type BidirectionalIterator meets the requirements of a 
          Bidirectional Iterator (24.1.4).</P>
@@ -237,36 +235,36 @@ bool regex_match(BidirectionalIterator first, BidirectionalIterator last,
       <P></P>
       <DIV></DIV>
       <PRE>&nbsp;</PRE>
-      <PRE><A name=f2></A>template &lt;class BidirectionalIterator, class charT, class traits, class Allocator2&gt;
+      <PRE><A name=f2></A>template &lt;class BidirectionalIterator, class charT, class traits&gt;
 bool regex_match(BidirectionalIterator first, BidirectionalIterator last,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
                  <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
       <P><B> Effects:</B> Behaves "as if" by constructing an instance of <CODE><A href="match_results.html">
                match_results</A>&lt;</CODE>BidirectionalIterator<CODE>&gt; what</CODE>, 
          and then returning the result of <CODE>regex_match(first, last, what, e, flags)</CODE>.</P>
-      <PRE><A name=f3></A>template &lt;class charT, class Allocator, class traits, class Allocator2&gt;
+      <PRE><A name=f3></A>template &lt;class charT, class Allocator, class traits&gt;
 bool regex_match(const charT* str, <A href="match_results.html">match_results</A>&lt;const charT*, Allocator&gt;&amp; m,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
                  <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
       <P><B> Effects:</B> Returns the result of <CODE>regex_match(str, str + 
             char_traits&lt;charT&gt;::length(str), m, e, flags)</CODE>.</P>
-      <PRE><A name=f4></A>template &lt;class ST, class SA, class Allocator, class charT,
-          class traits, class Allocator2&gt;
+      <PRE><A name=f4></A>template &lt;class ST, class SA, class Allocator,
+          class charT, class traits&gt;
 bool regex_match(const basic_string&lt;charT, ST, SA&gt;&amp; s,
                  <A href="match_results.html">match_results</A>&lt;typename basic_string&lt;charT, ST, SA&gt;::const_iterator, Allocator&gt;&amp; m, 
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e, 
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e, 
                  <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
       <P><B> Effects:</B> Returns the result of <CODE>regex_match(s.begin(), s.end(), m, e, 
             flags)</CODE>.</P>
-      <PRE><A name=f5></A>template &lt;class charT, class traits, class Allocator2&gt;
+      <PRE><A name=f5></A>template &lt;class charT, class traits&gt;
 bool regex_match(const charT* str,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
                  <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
       <P><B> Effects:</B> Returns the result of <CODE>regex_match(str, str + 
             char_traits&lt;charT&gt;::length(str), e, flags)</CODE>.</P>
-      <PRE><A name=f6></A>template &lt;class ST, class SA, class charT, class traits, class Allocator2&gt;
+      <PRE><A name=f6></A>template &lt;class ST, class SA, class charT, class traits&gt;
 bool regex_match(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
                  <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
       <P><B> Effects:</B> Returns the result of <CODE>regex_match(s.begin(), s.end(), e, 
             flags)</CODE>.
@@ -307,13 +305,12 @@ regex expression(<FONT color=#000080>"([0-9]+)(\\-| |$)(.*)"</FONT>);
       <P>
          <HR></PRE>
       <P></P>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         26 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/Attic/regex_replace.html b/doc/Attic/regex_replace.html
index 1f2fc6f6..1cdf1d9b 100644
--- a/doc/Attic/regex_replace.html
+++ b/doc/Attic/regex_replace.html
@@ -35,29 +35,27 @@
          unchanged only if the <EM>flags</EM> parameter does not have the flag <A href="match_flag_type.html">
             format_no_copy</A> set. If the flag <A href="match_flag_type.html">format_first_only</A>
          is set then only the first occurrence is replaced rather than all 
-         occurrences.&nbsp;<PRE>template &lt;class OutputIterator, class BidirectionalIterator, class traits,
-          class Allocator, class charT&gt;
+         occurrences.&nbsp;<PRE>template &lt;class OutputIterator, class BidirectionalIterator, class traits, class charT&gt;
 OutputIterator <A href="#f1">regex_replace</A>(OutputIterator out,
                            BidirectionalIterator first,
                            BidirectionalIterator last,
-                           const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator&gt;&amp; e,
+                           const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;&amp; e,
                            const basic_string&lt;charT&gt;&amp; fmt,
                            <A href="match_flag_type.html">match_flag_type flags = match_default</A>);
 
-template &lt;class traits, class Allocator, class charT&gt;
+template &lt;class traits, class charT&gt;
 basic_string&lt;charT&gt; <A href="#f2">regex_replace</A>(const basic_string&lt;charT&gt;&amp; s,
-                            const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator&gt;&amp; e,
+                            const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;&amp; e,
                             const basic_string&lt;charT&gt;&amp; fmt,
                             <A href="match_flag_type.html">match_flag_type flags = match_default</A>);
 
 </PRE>
          <H3><A name="description"></A>Description</H3>
-         <PRE><A name=f1></A>template &lt;class OutputIterator, class BidirectionalIterator, class traits,
-          class Allocator, class charT&gt;
+         <PRE><A name=f1></A>template &lt;class OutputIterator, class BidirectionalIterator, class traits, class charT&gt;
 OutputIterator regex_replace(OutputIterator out,
                            BidirectionalIterator first,
                            BidirectionalIterator last,
-                           const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator&gt;&amp; e,
+                           const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;&amp; e,
                            const basic_string&lt;charT&gt;&amp; fmt,
                            <A href="match_flag_type.html">match_flag_type flags = match_default</A>);</PRE>
       <P>Enumerates all the occurences of expression <EM>e</EM> in the sequence [first, 
@@ -126,9 +124,9 @@ OutputIterator regex_replace(OutputIterator out,
             configured</A> in non-recursive mode).</P>
       <P><B> Returns:</B> <CODE>out</CODE>.
       </P>
-      <PRE><A name=f2></A>template &lt;class traits, class Allocator, class charT&gt;
+      <PRE><A name=f2></A>template &lt;class traits, class charT&gt;
 basic_string&lt;charT&gt; regex_replace(const basic_string&lt;charT&gt;&amp; s,
-                            const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator&gt;&amp; e,
+                            const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;&amp; e,
                             const basic_string&lt;charT&gt;&amp; fmt,
                             <A href="match_flag_type.html">match_flag_type flags = match_default</A>);</PRE>
       <P><B> Effects:</B> Constructs an object <CODE>basic_string&lt;charT&gt; result</CODE>, 
@@ -245,13 +243,12 @@ boost::regex e1, e2;
 <B>const</B> <B>char</B>* footer_text = <FONT color=#0000ff>"&lt;/PRE&gt;\n&lt;/BODY&gt;\n\n"</FONT>;
       </PRE>
       <HR>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         26 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/Attic/regex_search.html b/doc/Attic/regex_search.html
index f0e8f6a3..53a0f1bc 100644
--- a/doc/Attic/regex_search.html
+++ b/doc/Attic/regex_search.html
@@ -35,55 +35,47 @@
          match could conceivably start at that position. The algorithm is defined as 
          follows:
          <PRE>template &lt;class BidirectionalIterator, 
-          class Allocator, class charT,
-          class traits, class Allocator2&gt;
+          class Allocator, class charT, class traits&gt;
 bool <A href="#f1">regex_search</A>(BidirectionalIterator first, BidirectionalIterator last,
                   <a href="match_results.html">match_results</a>&lt;BidirectionalIterator, Allocator&gt;&amp; m,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator2&gt;&amp; e,
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default);
                   
 template &lt;class ST, class SA, 
-          class Allocator, class charT,
-          class traits, class Allocator2&gt; 
+          class Allocator, class charT, class traits&gt; 
 bool <A href="#f2">regex_search</A>(const basic_string&lt;charT, ST, SA&gt;&amp; s, 
                   <a href="match_results.html">match_results</a>&lt;
                       typename basic_string&lt;charT, ST,SA&gt;::const_iterator, 
                       Allocator&gt;&amp; m, 
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator2&gt;&amp; e, 
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e, 
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default); 
           
-template&lt;class charT, class Allocator, class traits, 
-         class Allocator2&gt; 
+template&lt;class charT, class Allocator, class traits&gt; 
 bool <A href="#f3">regex_search</A>(const charT* str, 
                   <a href="match_results.html">match_results</a>&lt;const charT*, Allocator&gt;&amp; m, 
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator2&gt;&amp; e,
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default);
                   
-template &lt;class BidirectionalIterator, class Allocator,
-          class charT, class traits&gt;                
+template &lt;class BidirectionalIterator, class charT, class traits&gt;                
 bool <A href="#f4">regex_search</A>(BidirectionalIterator first, BidirectionalIterator last, 
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator&gt;&amp; e, 
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e, 
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default); 
                   
-template &lt;class charT, class Allocator, 
-          class traits&gt; 
+template &lt;class charT, class traits&gt; 
 bool <A href="#f5">regex_search</A>(const charT* str, 
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator&gt;&amp; e, 
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e, 
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default); 
                   
-template&lt;class ST, class SA,
-         class Allocator, class charT, 
-         class traits&gt;
+template&lt;class ST, class SA, class charT, class traits&gt;
 bool <A href="#f6">regex_search</A>(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator&gt;&amp; e,
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default);
 </PRE>
          <H3><A name="description"></A>Description</H3>
-         <PRE><A name=f1></A>template &lt;class BidirectionalIterator, class Allocator, class charT,
-          class traits, class Allocator2&gt;
+         <PRE><A name=f1></A>template &lt;class BidirectionalIterator, class Allocator, class charT, class traits&gt;
 bool regex_search(BidirectionalIterator first, BidirectionalIterator last,
                   <a href="match_results.html">match_results</a>&lt;BidirectionalIterator, Allocator&gt;&amp; m,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator2&gt;&amp; e,
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
       <P><B> Requires:</B> Type BidirectionalIterator meets the requirements of a 
          Bidirectional Iterator (24.1.4).</P>
@@ -234,38 +226,36 @@ bool regex_search(BidirectionalIterator first, BidirectionalIterator last,
                </TD></TR></TABLE>
          </CENTER>
       </DIV>
-      <PRE><A name=f2></A>template &lt;class charT, class Allocator, class traits, class Allocator2&gt;
+      <PRE><A name=f2></A>template &lt;class charT, class Allocator, class traits&gt;
 bool regex_search(const charT* str, <a href="match_results.html">match_results</a>&lt;const charT*, Allocator&gt;&amp; m,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator2&gt;&amp; e,
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
       <P><B> Effects:</B> Returns the result of <CODE>regex_search(str, str + 
             char_traits&lt;charT&gt;::length(str), m, e, flags)</CODE>.</P>
       <PRE><A name=f3></A>template &lt;class ST, class SA, class Allocator, class charT,
-          class traits, class Allocator2&gt;
+          class traits&gt;
 bool regex_search(const basic_string&lt;charT, ST, SA&gt;&amp; s,
                   <a href="match_results.html">match_results</a>&lt;typename basic_string&lt;charT, ST, SA&gt;::const_iterator, Allocator&gt;&amp; m,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator2&gt;&amp; e,
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
       <P><B> Effects:</B> Returns the result of <CODE>regex_search(s.begin(), s.end(), m, 
             e, flags)</CODE>.</P>
-      <PRE><A name=f4></A>template &lt;class iterator, class Allocator, class charT,
-          class traits&gt;
+      <PRE><A name=f4></A>template &lt;class iterator, class charT, class traits&gt;
 bool regex_search(iterator first, iterator last,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator&gt;&amp; e,
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
       <P><B> Effects:</B> Behaves "as if" by constructing an instance of <CODE><a href="match_results.html">
                match_results</a>&lt;</CODE>BidirectionalIterator<CODE>&gt; what</CODE>, 
          and then returning the result of <CODE>regex_search(first, last, what, e, flags)</CODE>.</P>
-      <PRE><A name=f5></A>template &lt;class charT, class Allocator, class traits&gt;
+      <PRE><A name=f5></A>template &lt;class charT, class traits&gt;
 bool regex_search(const charT* str
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator&gt;&amp; e,
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
       <P><B> Effects:</B> Returns the result of <CODE>regex_search(str, str + 
             char_traits&lt;charT&gt;::length(str), e, flags)</CODE>.</P>
-      <PRE><A name=f6></A>template &lt;class ST, class SA, class Allocator, class charT,
-          class traits&gt;
+      <PRE><A name=f6></A>template &lt;class ST, class SA, class charT, class traits&gt;
 bool regex_search(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator&gt;&amp; e,
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
       <P><B> Effects:</B> Returns the result of <CODE>regex_search(s.begin(), s.end(), e, 
             flags)</CODE>.
@@ -314,7 +304,7 @@ void</B> IndexClasses(map_type&amp; m, <B>const</B> std::string&amp; file)
       <HR>
       <p>Revised 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         04 Feb 2004 
+         23 June 2004 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
             <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
diff --git a/doc/Attic/regex_split.html b/doc/Attic/regex_split.html
index 3b2ed99e..45be346e 100644
--- a/doc/Attic/regex_split.html
+++ b/doc/Attic/regex_split.html
@@ -35,17 +35,17 @@
       <P>Algorithm regex_split performs a similar operation to the perl split operation, 
          and comes in three overloaded forms:
       </P>
-      <PRE><B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1, <B>class</B> Traits2, <B>class</B> Alloc2&gt;
+      <PRE><B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1, <B>class</B> Traits2&gt;
 std::size_t regex_split(OutputIterator out,&nbsp;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; std::basic_string&lt;charT, Traits1, Alloc1&gt;&amp; s,&nbsp;
-&nbsp;<B> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2, Alloc2&gt;&amp; e,
+&nbsp;<B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2&gt;&amp; e,
 &nbsp;<STRONG>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</STRONG>boost::match_flag_type flags,
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; std::size_t max_split);
 
-<B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1, <B>class</B> Traits2, <B>class</B> Alloc2&gt;
+<B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1, <B>class</B> Traits2&gt;
 std::size_t regex_split(OutputIterator out,&nbsp;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; std::basic_string&lt;charT, Traits1, Alloc1&gt;&amp; s,&nbsp;
-&nbsp;<B> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2, Alloc2&gt;&amp; e,
+&nbsp;<B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2&gt;&amp; e,
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; boost::match_flag_type flags = match_default);
 
 <B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1&gt;
@@ -132,9 +132,9 @@ boost::regex e(<FONT color=#000080>"&lt;\\s*A\\s+[^&gt;]*href\\s*=\\s*\"([^\"]*)
    <B>return</B> 0;
 }</PRE>
       <HR>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         04 Feb 2004 
+         26 June&nbsp;2004 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
             <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
diff --git a/doc/Attic/regex_token_iterator.html b/doc/Attic/regex_token_iterator.html
index ef06779c..2e504189 100644
--- a/doc/Attic/regex_token_iterator.html
+++ b/doc/Attic/regex_token_iterator.html
@@ -41,14 +41,12 @@
       <PRE>
 template &lt;class BidirectionalIterator, 
           class charT = iterator_traits&lt;BidirectionalIterator&gt;::value_type,
-          class traits = regex_traits&lt;charT&gt;,
-          class Allocator = allocator&lt;charT&gt; &gt;
+          class traits = regex_traits&lt;charT&gt; &gt;
 class regex_token_iterator 
 {
 public:
-   typedef          <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator&gt;                   regex_type;
-   typedef          <A href="sub_match.html">sub_match</A>                     
-             &lt;BidirectionalIterator&gt;                                     value_type;
+   typedef          <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;                              regex_type;
+   typedef          <A href="sub_match.html">sub_match</A>&lt;BidirectionalIterator&gt;                        value_type;
    typedef typename iterator_traits&lt;BidirectionalIterator&gt;::difference_type difference_type;
    typedef          const value_type*                                       pointer;
    typedef          const value_type&amp;                                       reference;
@@ -280,12 +278,12 @@ boost::regex e(<FONT color=#0000ff>"&lt;\\s*A\\s+[^&gt;]*href\\s*=\\s*\"([^\"]*)
 }
 </pre>
       <HR>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         26 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/Attic/regex_traits.html b/doc/Attic/regex_traits.html
index a95dc662..9b2a8c4d 100644
--- a/doc/Attic/regex_traits.html
+++ b/doc/Attic/regex_traits.html
@@ -23,22 +23,63 @@
          </TABLE>
       </P>
       <HR>
-      <p></p>
-      <P>
-         Under construction: the current design will be replaced by that specified in 
-         the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">regular 
-            expression standardization proposal</A>, the current (obsolete) design has 
-         it's <A href="http://cvs.sourceforge.net/viewcvs.py/*checkout*/boost/boost/libs/regex/Attic/traits_class_ref.htm?rev=1.11">
-            documentation archived online</A>.</P>
-      <P>
-         <HR>
+      <H3>Contents</H3>
+      <dl class="index">
+         <dt><A href="#synopsis">Synopsis</A> <dt><a href="#description">Description</a></dt>
+      </dl>
+      <H3><A name="synopsis"></A>Synopsis</H3>
+      <pre>
+namespace boost{
+
+template &lt;class charT, class implementationT = sensible_default_choice&gt;
+struct regex_traits : public implementationT
+{
+   regex_traits() : implementationT() {}
+};
+
+template &lt;class charT&gt;
+struct c_regex_traits;
+
+template &lt;class charT&gt;
+struct cpp_regex_traits;
+
+template &lt;class charT&gt;
+struct w32_regex_traits;
+
+} // namespace boost
+</pre>
+      <H3><A name="description"></A>Description</H3>
+      <P>The class regex_traits is just a thin wrapper around an actual implemention 
+         class, which may be one of:</P>
+      <UL>
+         <LI>
+            c_regex_traits: this class is deprecated, it wraps the C locale, and is used as 
+            the default implementation when the platform is not Win32, and the C++ locale 
+            is not available.</LI>
+         <LI>
+            cpp_regex_traits: the default traits class for non-Win32 platforms, allows the 
+            regex class to be imbued with a std::locale instance.</LI>
+         <LI>
+            w32_regex_traits: the default traits class implementation on Win32 platforms, 
+            allows the regex class to be imbued with an LCID.</LI></UL>
+      <P>The default behavior can be altered by defining one of the following 
+         configuration macros in <A href="../../../boost/regex/user.hpp">boost/regex/user.hpp</A>:</P>
+      <UL>
+         <LI>
+            BOOST_REGEX_USE_C_LOCALE: makes c_regex_traits the default.</LI>
+         <LI>
+            BOOST_REGEX_USE_CPP_LOCALE: makes cpp_regex_traits the default.</LI></UL>
+      <P>All these traits classes fulfil the <A href="concepts.html#traits">traits class 
+            requirements</A>.</P>
+      <HR>
       <P></P>
       <p>Revised 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         24&nbsp;June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->
+            2004</i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/Attic/standards.html b/doc/Attic/standards.html
index a3e1d9cb..eef33b26 100644
--- a/doc/Attic/standards.html
+++ b/doc/Attic/standards.html
@@ -27,8 +27,7 @@
       <P>Boost.regex is intended to conform to the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">
             regular expression standardization proposal</A>, which will appear in a 
          future C++ standard technical report (and hopefully in a future version of the 
-         standard).&nbsp; Currently there are some differences in how the regular 
-         expression traits classes are defined, these will be fixed in a future release.</P>
+         standard).&nbsp;</P>
       <H3>ECMAScript / JavaScript</H3>
       <P>All of the ECMAScript regular expression syntax features are supported, except 
          that:</P>
@@ -39,16 +38,26 @@
          Unicode escape sequences.</P>
       <H3>Perl</H3>
       <P>Almost all Perl features are supported, except for:</P>
-      <P>\N{name}&nbsp; Use [[:name:]] instead.</P>
-      <P>\pP and \PP</P>
-      <P>(?imsx-imsx)</P>
-      <P>(?&lt;=pattern)</P>
-      <P>(?&lt;!pattern)</P>
-      <P>(?{code})</P>
-      <P>(??{code})</P>
-      <P>(?(condition)yes-pattern) and (?(condition)yes-pattern|no-pattern)</P>
-      <P>These embarrassments / limitations will be removed in due course, mainly 
-         dependent upon user demand.</P>
+      <P>
+         <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="100%" border="0">
+            <TR>
+               <TD>\N{name}</TD>
+               <TD>Use [[.name.]] instead.</TD>
+            </TR>
+            <TR>
+               <TD>\pP and \PP</TD>
+               <TD>Use [[:P:]] instead.</TD>
+            </TR>
+            <TR>
+               <TD>(?{code})</TD>
+               <TD>Not implementable in a compiled strongly typed language.</TD>
+            </TR>
+            <TR>
+               <TD>(??{code})</TD>
+               <TD>Not implementable in a compiled strongly typed language.</TD>
+            </TR>
+         </TABLE>
+      </P>
       <H3>POSIX</H3>
       <P>All the POSIX basic and extended regular expression features are supported, 
          except that:</P>
@@ -60,18 +69,15 @@
          string sort keys produced by the system; if you need this, and the default 
          implementation doesn't work on your platform, then you will need to supply a 
          custom traits class.</P>
-         <HR>
-      <p>Revised 
+      <HR>
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         28 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
-
-
diff --git a/doc/Attic/syntax_option_type.html b/doc/Attic/syntax_option_type.html
index 984105b1..6da58afc 100644
--- a/doc/Attic/syntax_option_type.html
+++ b/doc/Attic/syntax_option_type.html
@@ -23,40 +23,49 @@
          </TABLE>
       </P>
       <HR>
-      <H3>Synopsis</H3>
+      <H3>Contents</H3>
+      <dl class="index">
+         <dt><a href="#synopsis">Synopsis</a> <dt><a href="#description">Description</a>
+               <dd>
+                  <dl class="index">
+                     <dt><a href="#perl">Options for Perl Regular Expressions</a> <dt><a href="#extended">Options 
+                              for POSIX Extended Regular Expressions</a> <dt><a href="#basic">Options for POSIX 
+                                 Basic Regular Expressions</a> <dt><a href="#literals">Options for String Literals</a></dt>
+                  </dl>
+               </dd>
+      </dl>
+      <H3><A name="synopsis"></A>Synopsis</H3>
       <P>Type syntax_option type is an implementation specific bitmask type that 
          controls how a regular expression string is to be interpreted.&nbsp; For 
          convenience note that all the constants listed here, are also duplicated within 
          the scope of class template <A href="basic_regex.html">basic_regex</A>.</P>
       <PRE>namespace std{ namespace regex_constants{
 
-typedef <EM>implementation-specific-bitmask-type</EM>   
-
-  syntax_option_type;
+typedef <EM>implementation-specific-bitmask-type</EM> syntax_option_type;<BR>
 // these flags are standardized:
 static const syntax_option_type normal;
-static const syntax_option_type icase;
-static const syntax_option_type nosubs;
-static const syntax_option_type optimize;
-static const syntax_option_type collate;
 static const syntax_option_type ECMAScript = normal;
 static const syntax_option_type JavaScript = normal;
 static const syntax_option_type JScript = normal;
-static const syntax_option_type basic;
+static const syntax_option_type perl = normal;<BR>static const syntax_option_type basic;
+static const syntax_option_type sed = basic;
 static const syntax_option_type extended;
 static const syntax_option_type awk;
 static const syntax_option_type grep;
 static const syntax_option_type egrep;
-static const syntax_option_type sed = basic;
-static const syntax_option_type perl;<BR>// these are boost.regex specific:<BR>static const syntax_option_type escape_in_lists;<BR>static const syntax_option_type char_classes;<BR>static const syntax_option_type intervals;<BR>static const syntax_option_type limited_ops;<BR>static const syntax_option_type newline_alt;<BR>static const syntax_option_type bk_plus_qm;<BR>static const syntax_option_type bk_braces;<BR>static const syntax_option_type bk_parens;<BR>static const syntax_option_type bk_refs;<BR>static const syntax_option_type bk_vbar;<BR>static const syntax_option_type use_except;<BR>static const syntax_option_type failbit;<BR>static const syntax_option_type literal;<BR>static const syntax_option_type nocollate;<BR>static const syntax_option_type perlex;<BR>static const syntax_option_type emacs;<BR>
+static const syntax_option_type icase;
+static const syntax_option_type nosubs;
+static const syntax_option_type optimize;
+static const syntax_option_type collate;
+// other boost.regex specific options are listed below<BR>
 } // namespace regex_constants
 } // namespace std</PRE>
-      <H3>Description</H3>
+      <H3><A name="description"></A>Description</H3>
       <P>The type <CODE>syntax_option_type</CODE> is an implementation specific bitmask 
          type (17.3.2.1.2). Setting its elements has the effects listed in the table 
          below, a valid value of type <CODE>syntax_option_type</CODE> will always have 
-         exactly one of the elements <CODE>normal, basic, extended, awk, grep, egrep, sed 
-            or perl</CODE> set.</P>
+         exactly one of the elements <CODE>normal, basic, extended, awk, grep, egrep, sed, 
+            literal&nbsp;or perl</CODE> set.</P>
       <P>Note that for convenience all the constants listed here are duplicated within 
          the scope of class template basic_regex, so you can use any of:</P>
       <PRE>boost::regex_constants::constant_name</PRE>
@@ -65,52 +74,81 @@ static const syntax_option_type perl;<BR>// these are boost.regex specific:<BR>s
       <P>or</P>
       <PRE>boost::wregex::constant_name</PRE>
       <P>in an interchangeable manner.</P>
+      <H4><A name="perl"></A>Options for Perl Regular Expressions:</H4>
+      <P>One of the following must always be set for perl regular expressions:</P>
       <P>
-         <TABLE id="Table2" height="1274" cellSpacing="1" cellPadding="7" width="100%" border="0">
+         <TABLE id="Table4" cellSpacing="1" cellPadding="1" width="100%" border="1">
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>Element</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>Effect if set</P>
-               </TD>
+               <TD><STRONG>Element</STRONG></TD>
+               <TD><STRONG>Standardized</STRONG></TD>
+               <TD><STRONG>Effect when set</STRONG></TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>normal</P>
+               <TD>
+                  <P>ECMAScript</P>
                </TD>
-               <TD vAlign="top" width="50%">
+               <TD>Yes</TD>
+               <TD>
                   <P>Specifies that the grammar recognized by the regular expression engine uses its 
                      normal semantics: that is the same as that given in the ECMA-262, ECMAScript 
                      Language Specification, Chapter 15 part 10, RegExp (Regular Expression) Objects 
                      (FWD.1).</P>
-                  <P>boost.regex also recognizes most perl-compatible extensions in this mode.</P>
+                  <P>boost.regex also recognizes all of the perl-compatible (?...) extensions in 
+                     this mode.</P>
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>icase</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <TD>perl</TD>
+               <TD>No</TD>
+               <TD>As above.</TD>
+            </TR>
+            <TR>
+               <TD>normal</TD>
+               <TD>No</TD>
+               <TD>As above.</TD>
+            </TR>
+            <TR>
+               <TD>JavaScript</TD>
+               <TD>No</TD>
+               <TD>As above.</TD>
+            </TR>
+            <TR>
+               <TD>JScript</TD>
+               <TD>No</TD>
+               <TD>As above.</TD>
+            </TR>
+         </TABLE>
+      </P>
+      <P>The following options may also be set when using perl-style regular 
+         expressions:</P>
+      <P>
+         <TABLE id="Table5" cellSpacing="1" cellPadding="1" width="100%" border="1">
+            <TR>
+               <TD><STRONG>Element</STRONG></TD>
+               <TD><STRONG>Standardized</STRONG></TD>
+               <TD><STRONG>Effect when set</STRONG></TD>
+            </TR>
+            <TR>
+               <TD>icase</TD>
+               <TD>Yes</TD>
+               <TD>
                   <P>Specifies that matching of regular expressions against a character container 
                      sequence shall be performed without regard to case.</P>
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>nosubs</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <TD>nosubs</TD>
+               <TD>Yes</TD>
+               <TD>
                   <P>Specifies that when a regular expression is matched against a character 
                      container sequence, then no sub-expression matches are to be stored in the 
                      supplied match_results structure.</P>
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>optimize</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <TD>optimize</TD>
+               <TD>Yes</TD>
+               <TD>
                   <P>Specifies that the regular expression engine should pay more attention to the 
                      speed with which regular expressions are matched, and less to the speed with 
                      which regular expression objects are constructed. Otherwise it has no 
@@ -119,91 +157,80 @@ static const syntax_option_type perl;<BR>// these are boost.regex specific:<BR>s
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>collate</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <TD>collate</TD>
+               <TD>Yes</TD>
+               <TD>
                   <P>Specifies that character ranges of the form "[a-b]" should be locale sensitive.</P>
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>ECMAScript</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as normal.</P>
-               </TD>
+               <TD>newline_alt</TD>
+               <TD>No</TD>
+               <TD>Specifies that the \n character has the same effect as the alternation 
+                  operator |.&nbsp; Allows newline separated lists to be used as a list of 
+                  alternatives.</TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>JavaScript</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as normal.</P>
-               </TD>
+               <TD>no_mod_m</TD>
+               <TD>No</TD>
+               <TD>Normally Boost.Regex behaves as if the Perl m-modifier is on: so the 
+                  assertions ^ and $ match after and before embedded newlines respectively, 
+                  setting this flags is eqivalent to prefixing the expression with (?-m).</TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>JScript</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as normal.</P>
-               </TD>
+               <TD>no_mod_s</TD>
+               <TD>No</TD>
+               <TD>Normally whether Boost.Regex will match "." against a newline character is 
+                  determined by the <A href="match_flag_type.html">match flag</A> match_dot_not_newline.&nbsp; 
+                  Specifying this flag is equivalent to prefixing the expression with (?-s) and 
+                  therefore causes "." not to match a newline character regardless of whether 
+                  match_not_dot_newline is set in the match flags.</TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>basic</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>Specifies that the grammar recognized by the regular expression engine is the 
-                     same as that used by POSIX basic regular expressions in IEEE Std 1003.1-2001, 
-                     Portable Operating System Interface (POSIX ), Base Definitions and Headers, 
-                     Section 9, Regular Expressions (FWD.1).
-                  </P>
-               </TD>
+               <TD>mod_s</TD>
+               <TD>No</TD>
+               <TD>Normally whether Boost.Regex will match "." against a newline character is 
+                  determined by the <A href="match_flag_type.html">match flag</A> match_dot_not_newline.&nbsp; 
+                  Specifying this flag is equivalent to prefixing the expression with (?s) and 
+                  therefore causes "." to match a newline character regardless of whether 
+                  match_not_dot_newline is set in the match flags.</TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>extended</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <TD>mod_x</TD>
+               <TD>No</TD>
+               <TD>Turns on the perl x-modifier: causes unescaped whitespace in the expression to 
+                  be ignored.</TD>
+            </TR>
+         </TABLE>
+      </P>
+      <H4><A name="extended"></A>Options for POSIX Extended Regular Expressions:</H4>
+      <P>Exactly one of the following must always be set for POSIX extended regular 
+         expressions:</P>
+      <P>
+         <TABLE id="Table6" cellSpacing="1" cellPadding="1" width="100%" border="1">
+            <TR>
+               <TD>Element</TD>
+               <TD>Standardized</TD>
+               <TD>Effect when set</TD>
+            </TR>
+            <TR>
+               <TD>extended</TD>
+               <TD>Yes</TD>
+               <TD>
                   <P>Specifies that the grammar recognized by the regular expression engine is the 
                      same as that used by POSIX extended regular expressions in IEEE Std 
                      1003.1-2001, Portable Operating System Interface (POSIX ), Base Definitions and 
-                     Headers, Section 9, Regular Expressions (FWD.1).</P>
+                     Headers, Section 9, Regular Expressions (FWD.1).&nbsp;
+                  </P>
+                  <P>In addition some perl-style escape sequences are supported (The POSIX standard 
+                     specifies that only "special" characters may be escaped, all other escape 
+                     sequences result in undefined behavior).</P>
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>awk</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>Specifies that the grammar recognized by the regular expression engine is the 
-                     same as that used by POSIX utility awk in IEEE Std 1003.1-2001, Portable 
-                     Operating System Interface (POSIX ), Shells and Utilities, Section 4, awk 
-                     (FWD.1).</P>
-                  <P>That is to say: the same as POSIX extended syntax, but with escape sequences in 
-                     character classes permitted.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="316">
-                  <P>grep</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>Specifies that the grammar recognized by the regular expression engine is the 
-                     same as that used by POSIX utility grep in IEEE Std 1003.1-2001, Portable 
-                     Operating System Interface (POSIX ), Shells and Utilities, Section 4, 
-                     Utilities, grep (FWD.1).</P>
-                  <P>That is to say, the same as POSIX basic syntax, but with the newline character 
-                     acting as an alternation character in addition to "|".</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="316">
-                  <P>egrep</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <TD>egrep</TD>
+               <TD>Yes</TD>
+               <TD>
                   <P>Specifies that the grammar recognized by the regular expression engine is the 
                      same as that used by POSIX utility grep when given the -E option in IEEE Std 
                      1003.1-2001, Portable Operating System Interface (POSIX ), Shells and 
@@ -213,116 +240,243 @@ static const syntax_option_type perl;<BR>// these are boost.regex specific:<BR>s
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>sed</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as basic.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="316">
-                  <P>perl</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as normal.</P>
+               <TD>awk</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that the grammar recognized by the regular expression engine is the 
+                     same as that used by POSIX utility awk in IEEE Std 1003.1-2001, Portable 
+                     Operating System Interface (POSIX ), Shells and Utilities, Section 4, awk 
+                     (FWD.1).</P>
+                  <P>That is to say: the same as POSIX extended syntax, but with escape sequences in 
+                     character classes permitted.</P>
+                  <P>In addition some perl-style escape sequences are supported (actually the awk 
+                     syntax requires \a \b \t \v \f \n and \r to be recognised,&nbsp;but other 
+                     escape sequences invoke undefined behaviour according to the POSIX standard).</P>
                </TD>
             </TR>
          </TABLE>
       </P>
-      <P>The following constants are specific to this particular regular expression 
-         implementation and do not appear in the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">
-            regular expression standardization proposal</A>:</P>
+      <P>The following options may also be set when using POSIX extended regular 
+         expressions:</P>
       <P>
-         <TABLE id="Table3" cellSpacing="0" cellPadding="7" width="100%" border="0">
+         <TABLE id="Table7" cellSpacing="1" cellPadding="1" width="100%" border="1">
             <TR>
-               <TD vAlign="top" width="45%">regbase::escape_in_lists</TD>
-               <TD vAlign="top" width="45%">Allows the use of the escape "\" character in sets of 
-                  characters, for example [\]] represents the set of characters containing only 
-                  "]". If this flag is not set then "\" is an ordinary character inside sets.</TD>
+               <TD><STRONG>Element</STRONG></TD>
+               <TD><STRONG>Standardized</STRONG></TD>
+               <TD><STRONG>Effect when set</STRONG></TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="45%">regbase::char_classes</TD>
-               <TD vAlign="top" width="45%">When this bit is set, character classes [:classname:] 
-                  are allowed inside character set declarations, for example "[[:word:]]" 
-                  represents the set of all characters that belong to the character class "word".</TD>
+               <TD>icase</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that matching of regular expressions against a character container 
+                     sequence shall be performed without regard to case.</P>
+               </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="45%">regbase:: intervals</TD>
-               <TD vAlign="top" width="45%">When this bit is set, repetition intervals are 
-                  allowed, for example "a{2,4}" represents a repeat of between 2 and 4 letter 
-                  a's.</TD>
+               <TD>nosubs</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that when a regular expression is matched against a character 
+                     container sequence, then no sub-expression matches are to be stored in the 
+                     supplied match_results structure.</P>
+               </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="45%">regbase:: limited_ops</TD>
-               <TD vAlign="top" width="45%">When this bit is set all of "+", "?" and "|" are 
-                  ordinary characters in all situations.</TD>
+               <TD>optimize</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that the regular expression engine should pay more attention to the 
+                     speed with which regular expressions are matched, and less to the speed with 
+                     which regular expression objects are constructed. Otherwise it has no 
+                     detectable effect on the program output.&nbsp; This currently has no effect for 
+                     boost.regex.</P>
+               </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="45%">regbase:: newline_alt</TD>
-               <TD vAlign="top" width="45%">When this bit is set, then the newline character "\n" 
-                  has the same effect as the alternation operator "|".</TD>
+               <TD>collate</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that character ranges of the form "[a-b]" should be locale sensitive.</P>
+               </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="45%">regbase:: bk_plus_qm</TD>
-               <TD vAlign="top" width="45%">When this bit is set then "\+" represents the one or 
-                  more repetition operator and "\?" represents the zero or one repetition 
-                  operator. When this bit is not set then "+" and "?" are used instead.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: bk_braces</TD>
-               <TD vAlign="top" width="45%">When this bit is set then "\{" and "\}" are used for 
-                  bounded repetitions and "{" and "}" are normal characters. This is the opposite 
-                  of default behavior.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: bk_parens</TD>
-               <TD vAlign="top" width="45%">When this bit is set then "\(" and "\)" are used to 
-                  group sub-expressions and "(" and ")" are ordinary characters, this is the 
-                  opposite of default behavior.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: bk_refs</TD>
-               <TD vAlign="top" width="45%">When this bit is set then back references are 
-                  allowed.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: bk_vbar</TD>
-               <TD vAlign="top" width="45%">When this bit is set then "\|" represents the 
-                  alternation operator and "|" is an ordinary character. This is the opposite of 
-                  default behavior.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: use_except</TD>
-               <TD vAlign="top" width="45%">When this bit is set then a <A href="#bad_expression">bad_expression</A>
-                  exception will be thrown on error.&nbsp; Use of this flag is deprecated - 
-                  basic_regex will always throw on error.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: failbit</TD>
-               <TD vAlign="top" width="45%">This bit is set on error, if regbase::use_except is 
-                  not set, then this bit should be checked to see if a regular expression is 
-                  valid before usage.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase::literal</TD>
-               <TD vAlign="top" width="45%">All characters in the string are treated as literals, 
-                  there are no special characters or escape sequences.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%" height="24">regbase::emacs</TD>
-               <TD vAlign="top" width="45%" height="24">Provides compatability with the emacs 
-                  editor, eqivalent to: bk_braces | bk_parens | bk_refs | bk_vbar.</TD>
+               <TD>newline_alt</TD>
+               <TD>No</TD>
+               <TD>Specifies that the \n character has the same effect as the alternation 
+                  operator |.&nbsp; Allows newline separated lists to be used as a list of 
+                  alternatives.</TD>
             </TR>
          </TABLE>
       </P>
+      <H4><A name="basic"></A>Options for POSIX Basic Regular Expressions:</H4>
+      <P>Exactly one of the following must always be set for POSIX basic regular 
+         expressions:</P>
+      <P>
+         <TABLE id="Table8" cellSpacing="1" cellPadding="1" width="100%" border="1">
+            <TR>
+               <TD>Element</TD>
+               <TD>Standardized</TD>
+               <TD>Effect When Set</TD>
+            </TR>
+            <TR>
+               <TD>basic</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that the grammar recognized by the regular expression engine is the 
+                     same as that used by POSIX basic regular expressions in IEEE Std 1003.1-2001, 
+                     Portable Operating System Interface (POSIX ), Base Definitions and Headers, 
+                     Section 9, Regular Expressions (FWD.1).
+                  </P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>sed</TD>
+               <TD>No</TD>
+               <TD>As Above.</TD>
+            </TR>
+            <TR>
+               <TD>grep</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that the grammar recognized by the regular expression engine is the 
+                     same as that used by POSIX utility grep in IEEE Std 1003.1-2001, Portable 
+                     Operating System Interface (POSIX ), Shells and Utilities, Section 4, 
+                     Utilities, grep (FWD.1).</P>
+                  <P>That is to say, the same as POSIX basic syntax, but with the newline character 
+                     acting as an alternation character in addition to "|".</P>
+               </TD>
+            </TR>
+         </TABLE>
+      </P>
+      <P>The following options may also be set when using POSIX basic regular 
+         expressions:</P>
+      <P>
+         <TABLE id="Table9" cellSpacing="1" cellPadding="1" width="100%" border="1">
+            <TR>
+               <TD><STRONG>Element</STRONG></TD>
+               <TD><STRONG>Standardized</STRONG></TD>
+               <TD><STRONG>Effect when set</STRONG></TD>
+            </TR>
+            <TR>
+               <TD>icase</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that matching of regular expressions against a character container 
+                     sequence shall be performed without regard to case.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>nosubs</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that when a regular expression is matched against a character 
+                     container sequence, then no sub-expression matches are to be stored in the 
+                     supplied match_results structure.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>optimize</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that the regular expression engine should pay more attention to the 
+                     speed with which regular expressions are matched, and less to the speed with 
+                     which regular expression objects are constructed. Otherwise it has no 
+                     detectable effect on the program output.&nbsp; This currently has no effect for 
+                     boost.regex.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>collate</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that character ranges of the form "[a-b]" should be locale sensitive.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>newline_alt</TD>
+               <TD>No</TD>
+               <TD>Specifies that the \n character has the same effect as the alternation 
+                  operator |.&nbsp; Allows newline separated lists to be used as a list of 
+                  alternatives.</TD>
+            </TR>
+            <TR>
+               <TD>no_char_classes</TD>
+               <TD>No</TD>
+               <TD>When set then character classes such as [[:alnum:]] are not allowed.</TD>
+            </TR>
+            <TR>
+               <TD>no_intervals</TD>
+               <TD>No</TD>
+               <TD>When set then bounded repeats such as a{2,3} are not permitted.</TD>
+            </TR>
+            <TR>
+               <TD>bk_plus_qm</TD>
+               <TD>No</TD>
+               <TD>When set then \? acts as a zero-or-one repeat operator, and \+ acts as a 
+                  one-or-more repeat operator.</TD>
+            </TR>
+            <TR>
+               <TD>bk_vbar</TD>
+               <TD>No</TD>
+               <TD>When set then \| acts as the alternation operator.</TD>
+            </TR>
+         </TABLE>
+      </P>
+      <H4><A name="literals"></A>Options for Literal Strings:</H4>
+      <P>The following must always be set to interpret the expression as a string 
+         literal:</P>
+      <P>
+         <TABLE id="Table10" cellSpacing="1" cellPadding="1" width="100%" border="1">
+            <TR>
+               <TD>Element</TD>
+               <TD>Standardized</TD>
+               <TD>Effect when set</TD>
+            </TR>
+            <TR>
+               <TD>literal</TD>
+               <TD>Yes</TD>
+               <TD>Treat the string as a literal (no special characters).</TD>
+            </TR>
+         </TABLE>
+      </P>
+      <P>The following options may also be combined with the <EM>literal</EM> flag:</P>
+      <P>
+         <TABLE id="Table11" cellSpacing="1" cellPadding="1" width="100%" border="1">
+            <TR>
+               <TD>Element</TD>
+               <TD>Standardized</TD>
+               <TD>Effect when set</TD>
+            </TR>
+            <TR>
+               <TD>icase</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that matching of regular expressions against a character container 
+                     sequence shall be performed without regard to case.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>optimize</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that the regular expression engine should pay more attention to the 
+                     speed with which regular expressions are matched, and less to the speed with 
+                     which regular expression objects are constructed. Otherwise it has no 
+                     detectable effect on the program output.&nbsp; This currently has no effect for 
+                     boost.regex.</P>
+               </TD>
+            </TR>
+         </TABLE>
+      </P>
+      <P>&nbsp;</P>
       <HR>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         23 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/bad_expression.html b/doc/bad_expression.html
index 00523b5a..6fa0b886 100644
--- a/doc/bad_expression.html
+++ b/doc/bad_expression.html
@@ -15,7 +15,7 @@
             </td>
             <td width="353">
                <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">class bad_expression</h2>
+               <h2 align="center">class regex_error</h2>
             </td>
             <td width="50">
                <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
@@ -27,49 +27,52 @@
       <hr>
       <h3>Synopsis</h3>
       <p>#include &lt;<a href="../../../boost/regex/pattern_except.hpp">boost/pattern_except.hpp</a>&gt;</p>
-      <p>The class <code>bad_expression</code> defines the type of objects thrown as 
+      <p>The class <code>regex_error</code> defines the type of objects thrown as 
          exceptions to report errors during the conversion from a string representing a 
          regular expression to a finite state machine.&nbsp;&nbsp;</p>
       <pre>
 <b>namespace</b> boost{
 
-<b>class</b> bad_pattern : <b>public</b> std::runtime_error
+<b>class</b> regex_error : <b>public</b> std::runtime_error
 {
 <b>public</b>:
-   <b>explicit</b> bad_pattern(<b>const</b> std::string&amp; s) : std::runtime_error(s){};
-};
-
-<b>class</b> bad_expression : <b>public</b> bad_pattern
-{
-<b>public</b>:
-   bad_expression(<b>const</b> std::string&amp; s) : bad_pattern(s) {}
+   <b>explicit</b> regex_error(<b>const</b> std::string& s, <a href="error_type.html">regex_constants::error_type err</a>, std::ptrdiff_t pos);
+   <b>explicit</b> regex_error(<a href="error_type.html">boost::regex_constants::error_type err</a>);
+   <a href="error_type.html">boost::regex_constants::error_type</a> code()<b>const</b>;
+   std::ptrdiff_t position()<b>const</b>;
 };
 
+typedef regex_error bad_pattern; // for backwards compatibily
+typedef regex_error bad_expression; // for backwards compatibility
 
 } // namespace boost
 </pre>
       <h3>Description</h3>
       <pre>
-bad_expression(const string&amp; what_arg);
-</pre>
-      <p><b>Effects:</b> Constructs an object of class <code>bad_expression</code>.</p>
-      <b></b>
-      <p><b>Postcondition:</b> <code>strcmp(what(), what_arg.c_str()) == 0</code>.</p>
-      <p>Footnotes: the class <i>bad_pattern</i> forms the base class for all 
-         pattern-matching exceptions, of which <i>bad_expression</i> is one. The choice 
-         of <i>std::runtime_error</i> as the base class for <i>bad_pattern</i> is moot; 
-         depending upon how the library is used exceptions may be either logic errors 
-         (programmer supplied expressions) or run time errors (user supplied 
-         expressions).</p>
+regex_error(<b>const</b> std::string& s, <a href="error_type.html">regex_constants::error_type</a> err, std::ptrdiff_t pos);
+regex_error(<a href="error_type.html">boost::regex_constants::error_type err</a>);</pre>
+      <p><b>Effects:</b> Constructs an object of class <code>regex_error</code>.</p>
+      <pre>
+<a href="error_type.html">boost::regex_constants::error_type</a> code()<b>const</b>;</pre>
+      <p><b>Effects:</b> returns the error code that represents parsing error that occured.</p>
+      <pre>
+std::ptrdiff_t position()<b>const</b>; </pre>
+      <p><b>Effects:</b> returns the location in the expression where parsing stopped.</p>
+      <P>Footnotes: the choice of <code>std::runtime_error</code> as the base class for <code>
+            regex_error</code> is moot; depending upon how the library is used 
+         exceptions may be either logic errors (programmer supplied expressions) or run 
+         time errors (user supplied expressions).&nbsp; The library previously used <code>bad_pattern</code>
+         and <code>bad_expression</code> for errors, these have been replaced by the 
+         single class <code>regex_error</code> to keep the library in synchronisation 
+         with the standardization proposal.</P>
       <p></p>
       <hr>
       <p>Revised 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         24&nbsp;June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/basic_regex.html b/doc/basic_regex.html
index 77e476b5..0a35289f 100644
--- a/doc/basic_regex.html
+++ b/doc/basic_regex.html
@@ -29,23 +29,22 @@
 #include &lt;<a href="../../../boost/regex.hpp">boost/regex.hpp</a>&gt;
 </pre>
       <p>The template class <em>basic_regex</em> encapsulates regular expression parsing 
-         and compilation. The class takes three template parameters:</p>
+         and compilation. The class takes two template parameters:</p>
       <p><b><i>charT</i></b>: determines the character type, i.e. either char or 
-         wchar_t.</p>
+         wchar_t; see <EM><A href="concepts.html#charT">charT concept</A></EM>.</p>
       <p><b><i>traits</i></b>: determines the behavior of the character type, for 
          example which character class names are recognized. A default traits class is 
-         provided: <a href="regex_traits.html">regex_traits&lt;charT&gt;</a>.</p>
-      <p><b><i>Allocator</i></b>: the allocator class used to allocate memory by the 
-         class.</p>
+         provided: <a href="regex_traits.html">regex_traits&lt;charT&gt;</a>.&nbsp; See 
+         also <EM><A href="concepts.html#traits">traits concept</A></EM>.</p>
       <p>For ease of use there are two typedefs that define the two standard <i>basic_regex</i>
-         instances, unless you want to use custom traits classes or allocators, you 
-         won't need to use anything other than these:</p>
+         instances, unless you want to use custom traits classes or non-standard 
+         character types, you won't need to use anything other than these:</p>
       <pre>
 <b>namespace</b> boost{
-<b>template</b> &lt;<b>class</b> charT, <b>class</b> traits = regex_traits&lt;charT&gt;, <b>class</b> Allocator = std::allocator&lt;charT&gt;  &gt;
+<b>template</b> &lt;<b>class</b> charT, <b>class</b> traits = regex_traits&lt;charT&gt;  &gt;
 <b>class</b> basic_regex;
-<b>typedef</b> basic_regex&lt;<b>char</b>&gt; regex;
-<b>typedef</b> basic_regex&lt;<b>wchar_t&gt;</b> wregex;
+<b>typedef</b> basic_regex&lt;<b>char</b>&gt;      regex;
+<b>typedef</b> basic_regex&lt;<b>wchar_t&gt;</b>   wregex;
 }
 </pre>
       <p>The definition of <i>basic_regex</i> follows: it is based very closely on class 
@@ -53,60 +52,60 @@
       <pre>
 namespace boost{
 
-template &lt;class charT,
-          class traits = regex_traits&lt;charT&gt;,
-          class Allocator = allocator&lt;charT&gt; &gt;
-class basic_regex
-{
-public:
+template &lt;class  charT, class traits = regex_traits&lt;charT&gt; &gt;
+class basic_regex {
+   public:          
    // types:
    typedef          charT                                value_type;
-   typedef          implementation defined               const_iterator;
-   typedef          const_iterator                       iterator;
-   typedef typename Allocator::reference                 reference;
-   typedef typename Allocator::const_reference           const_reference;
-   typedef typename Allocator::difference_type           difference_type;
-   typedef typename Allocator::size_type                 size_type;
-   typedef          Allocator                            allocator_type;
+   typedef          implementation-specific              const_iterator;
+   typedef          const_iterator                       iterator;                 
+   typedef          charT&amp;                               reference;           
+   typedef          const charT&amp;                         const_reference;           
+   typedef          std::ptrdiff_t                       difference_type;                 
+   typedef          std::size_t                          size_type;
    typedef          regex_constants::syntax_option_type  flag_type;
    typedef typename traits::locale_type                  locale_type;
 
    // constants:
-   static const regex_constants::syntax_option_type normal = regex_constants::normal;
-   static const regex_constants::syntax_option_type icase = regex_constants::icase;
-   static const regex_constants::syntax_option_type nosubs = regex_constants::nosubs;
-   static const regex_constants::syntax_option_type optimize = regex_constants::optimize;
-   static const regex_constants::syntax_option_type collate = regex_constants::collate;
-   static const regex_constants::syntax_option_type ECMAScript = normal;
-   static const regex_constants::syntax_option_type JavaScript = normal;
-   static const regex_constants::syntax_option_type JScript = normal;
-   // these flags are optional, if the functionality is supported
-   // then the flags shall take these names.
-   static const regex_constants::syntax_option_type basic = regex_constants::basic;
-   static const regex_constants::syntax_option_type extended = regex_constants::extended;
-   static const regex_constants::syntax_option_type awk = regex_constants::awk;
-   static const regex_constants::syntax_option_type grep = regex_constants::grep;
-   static const regex_constants::syntax_option_type egrep = regex_constants::egrep;
-   static const regex_constants::syntax_option_type sed = basic = regex_constants::sed;
-   static const regex_constants::syntax_option_type perl = regex_constants::perl;
+   // main option selection:
+   static const regex_constants::syntax_option_type normal          = regex_constants::normal;
+   static const regex_constants::syntax_option_type ECMAScript      = normal;
+   static const regex_constants::syntax_option_type JavaScript      = normal;
+   static const regex_constants::syntax_option_type JScript         = normal;
+   static const regex_constants::syntax_option_type basic           = regex_constants::basic;
+   static const regex_constants::syntax_option_type extended        = regex_constants::extended;
+   static const regex_constants::syntax_option_type awk             = regex_constants::awk;
+   static const regex_constants::syntax_option_type grep            = regex_constants::grep;
+   static const regex_constants::syntax_option_type egrep           = regex_constants::egrep;
+   static const regex_constants::syntax_option_type sed             = basic = regex_constants::sed;
+   static const regex_constants::syntax_option_type perl            = regex_constants::perl;
+   static const regex_constants::syntax_option_type literal         = regex_constants::literal;
+   // modifiers specific to perl expressions:
+   static const regex_constants::syntax_option_type no_mod_m        = regex_constants::no_mod_m;
+   static const regex_constants::syntax_option_type no_mod_s        = regex_constants::no_mod_s;
+   static const regex_constants::syntax_option_type mod_s           = regex_constants::mod_s;
+   static const regex_constants::syntax_option_type mod_x           = regex_constants::mod_x;
+   // modifiers specific to POSIX basic expressions:
+   static const regex_constants::syntax_option_type bk_plus_qm      = regex_constants::bk_plus_qm;
+   static const regex_constants::syntax_option_type bk_vbar         = regex_constants::bk_vbar
+   static const regex_constants::syntax_option_type no_char_classes = regex_constants::no_char_classes
+   static const regex_constants::syntax_option_type no_intervals    = regex_constants::no_intervals
+   // common modifiers:
+   static const regex_constants::syntax_option_type nosubs          = regex_constants::nosubs;
+   static const regex_constants::syntax_option_type optimize        = regex_constants::optimize;
+   static const regex_constants::syntax_option_type collate         = regex_constants::collate;
+   static const regex_constants::syntax_option_type newline_alt     = regex_constants::newline_alt;
 
    // construct/copy/destroy:
-   explicit <A href="#c1">basic_regex</A>(const Allocator&amp; a = Allocator());
-   explicit <A href="#c2">basic_regex</A>(const charT* p, flag_type f = regex_constants::normal,
-                        const Allocator&amp; a = Allocator());
-   <A href="#c3">basic_regex</A>(const charT* p1, const charT* p2, flag_type f = regex_constants::normal,
-               const Allocator&amp; a = Allocator());
-   <A href="#c4">basic_regex</A>(const charT* p, size_type len, flag_type f,
-               const Allocator&amp; a = Allocator());
+   explicit <A href="#c1">basic_regex</A> ();
+   explicit <A href="#c2">basic_regex</A>(const  charT* p, flag_type f = regex_constants::normal);
+   <A href="#c3">basic_regex</A>(const charT* p1, const  charT* p2, flag_type f = regex_constants::normal);
+   <A href="#c4">basic_regex</A>(const charT* p, size_type len, flag_type  f);
    <A href="#c5">basic_regex</A>(const basic_regex&amp;);
    template &lt;class ST, class SA&gt;
-   explicit <A href="#c6">basic_regex</A>(const basic_string&lt;charT, ST, SA&gt;&amp; p,
-                        flag_type f = regex_constants::normal,
-                        const Allocator&amp; a = Allocator());
+   explicit <A href="#c6">basic_regex</A>(const basic_string&lt;charT, ST,  SA&gt;&amp; p, flag_type f = regex_constants::normal);
    template &lt;class InputIterator&gt;
-   <A href="#c7">basic_regex</A>(InputIterator first, inputIterator last,
-               flag_type f = regex_constants::normal,
-               const Allocator&amp; a = Allocator());
+   <A href="#c7">basic_regex</A>(InputIterator first,  InputIterator last, flag_type f = regex_constants::normal);
 
    ~basic_regex();
    basic_regex&amp; <A href="#o1">operator</A>=(const basic_regex&amp;);
@@ -134,7 +133,6 @@ public:
                        flag_type f = regex_constants::normal);
 
    // const operations:
-   Allocator <A href="#m7">get_allocator</A>() const;
    flag_type <A href="#m8">flags</A>() const;
    basic_string&lt;charT&gt; <A href="#m9">str</A>() const;
    int <A href="#m10">compare</A>(basic_regex&amp;) const;
@@ -182,21 +180,34 @@ typedef basic_regex&lt;wchar_t&gt; wregex;
       <p>Class&nbsp;<em>basic_regex</em> has the following public member functions:</p>
       <h4>basic_regex constants</h4>
       <pre>
-static const regex_constants::syntax_option_type normal = regex_constants::normal;
-static const regex_constants::syntax_option_type icase = regex_constants::icase;
-static const regex_constants::syntax_option_type nosubs = regex_constants::nosubs;
-static const regex_constants::syntax_option_type optimize = regex_constants::optimize;
-static const regex_constants::syntax_option_type collate = regex_constants::collate;
-static const regex_constants::syntax_option_type ECMAScript = normal;
-static const regex_constants::syntax_option_type JavaScript = normal;
-static const regex_constants::syntax_option_type JScript = normal;
-static const regex_constants::syntax_option_type basic = regex_constants::basic;
-static const regex_constants::syntax_option_type extended = regex_constants::extended;
-static const regex_constants::syntax_option_type awk = regex_constants::awk;
-static const regex_constants::syntax_option_type grep = regex_constants::grep;
-static const regex_constants::syntax_option_type egrep = regex_constants::egrep;
-static const regex_constants::syntax_option_type sed = basic = regex_constants::sed;
-static const regex_constants::syntax_option_type perl = regex_constants::perl;
+// main option selection:
+static const regex_constants::syntax_option_type normal           = regex_constants::normal;
+static const regex_constants::syntax_option_type ECMAScript       = normal;
+static const regex_constants::syntax_option_type JavaScript       = normal;
+static const regex_constants::syntax_option_type JScript          = normal;
+static const regex_constants::syntax_option_type basic            = regex_constants::basic;
+static const regex_constants::syntax_option_type extended         = regex_constants::extended;
+static const regex_constants::syntax_option_type awk              = regex_constants::awk;
+static const regex_constants::syntax_option_type grep             = regex_constants::grep;
+static const regex_constants::syntax_option_type egrep            = regex_constants::egrep;
+static const regex_constants::syntax_option_type sed              = regex_constants::sed;
+static const regex_constants::syntax_option_type perl             = regex_constants::perl;
+static const regex_constants::syntax_option_type literal          = regex_constants::literal;
+// modifiers specific to perl expressions:
+static const regex_constants::syntax_option_type no_mod_m         = regex_constants::no_mod_m;
+static const regex_constants::syntax_option_type no_mod_s         = regex_constants::no_mod_s;
+static const regex_constants::syntax_option_type mod_s            = regex_constants::mod_s;
+static const regex_constants::syntax_option_type mod_x            = regex_constants::mod_x;
+// modifiers specific to POSIX basic expressions:
+static const regex_constants::syntax_option_type bk_plus_qm       = regex_constants::bk_plus_qm;
+static const regex_constants::syntax_option_type bk_vbar          = regex_constants::bk_vbar
+static const regex_constants::syntax_option_type no_char_classes  = regex_constants::no_char_classes
+static const regex_constants::syntax_option_type no_intervals     = regex_constants::no_intervals
+// common modifiers:
+static const regex_constants::syntax_option_type nosubs           = regex_constants::nosubs;
+static const regex_constants::syntax_option_type optimize         = regex_constants::optimize;
+static const regex_constants::syntax_option_type collate          = regex_constants::collate;
+static const regex_constants::syntax_option_type newline_alt      = regex_constants::newline_alt;
 </pre>
       <p>The static constant members are provided as synonyms for the constants declared 
          in namespace <code>boost::regex_constants</code>; for each constant of type <code><A href="syntax_option_type.html">
@@ -204,11 +215,7 @@ static const regex_constants::syntax_option_type perl = regex_constants::perl;
          then a constant with the same name, type and value is declared within the scope 
          of <code>basic_regex</code>.</p>
       <h4>basic_regex constructors</h4>
-      <p>In all <code>basic_regex</code> constructors, a copy of the <code>Allocator</code>
-         argument is used for any memory allocation performed by the constructor or 
-         member functions during the lifetime of the object.</p>
-      <pre>
-basic_regex(const Allocator&amp; a = Allocator());
+      <pre> basic_regex();
 </pre>
       <P><b>Effects:</b> Constructs an object of class <code>basic_regex</code>. The 
          postconditions of this function are indicated in the table:</P>
@@ -252,7 +259,7 @@ basic_regex(const Allocator&amp; a = Allocator());
             </table>
          </center>
       </div>
-      <pre> <A name=c2></A>basic_regex(const charT* p, flag_type f = regex_constants::normal, const Allocator&amp; a = Allocator());
+      <pre><BR> basic_regex(const charT* p, flag_type f = regex_constants::normal);
  
 </pre>
       <P><b>Requires:</b> <i>p</i> shall not be a null pointer.</P>
@@ -322,7 +329,7 @@ basic_regex(const Allocator&amp; a = Allocator());
       <pre>
  
 </pre>
-      <PRE><A name=c3></A>basic_regex(const charT* p1, const charT* p2, flag_type f = regex_constants::normal, const Allocator&amp; a = Allocator());</PRE>
+      <PRE><A name=c3></A>basic_regex(const charT* p1, const charT* p2, flag_type f = regex_constants::normal);</PRE>
       <p><b>Requires:</b> <i>p1</i> and <i>p2</i> are not null pointers, <code>p1 &lt; p2</code>.</p>
       <p><b>Throws:</b> <code>bad_expression</code> if [p1,p2) is not a valid regular 
          expression.</p>
@@ -390,8 +397,7 @@ basic_regex(const Allocator&amp; a = Allocator());
       <pre>
  
 </pre>
-      <pre><A name=c4></A>
-basic_regex(const charT* p, size_type len, flag_type f, const Allocator&amp; a = Allocator());
+      <pre><A name=c4></A>basic_regex(const charT* p, size_type len, flag_type f);
 </pre>
       <p><b>Requires:</b> <i>p</i> shall not be a null pointer, <code>len &lt; max_size()</code>.</p>
       <p><b>Throws:</b> <code>bad_expression</code> if <i>p</i> is not a valid regular 
@@ -457,11 +463,7 @@ basic_regex(const charT* p, size_type len, flag_type f, const Allocator&amp; a =
             </table>
          </center>
       </div>
-      <pre>
-  
-</pre>
-      <pre><A name=c5></A>
-basic_regex(const basic_regex&amp; e);
+      <pre><A name=c5></A><BR>basic_regex(const basic_regex&amp; e);
 </pre>
       <p><b>Effects:</b> Constructs an object of class <code>basic_regex</code> as a 
          copy of the object <i>e</i>. The postconditions of this function are indicated 
@@ -522,14 +524,9 @@ basic_regex(const basic_regex&amp; e);
             </table>
          </center>
       </div>
-      <pre>
- 
-</pre>
-      <pre>
+      <pre><BR>
 template &lt;class ST, class SA&gt;
-<A name=c6></A>
-basic_regex(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-            flag_type f = regex_constants::normal, const Allocator&amp; a = Allocator());
+<A name=c6></A>basic_regex(const basic_string&lt;charT, ST, SA&gt;&amp; s, flag_type f = regex_constants::normal);
 </pre>
       <p><b>Throws:</b> <code>bad_expression</code> if <i>s</i> is not a valid regular 
          expression.</p>
@@ -594,14 +591,9 @@ basic_regex(const basic_string&lt;charT, ST, SA&gt;&amp; s,
             </table>
          </center>
       </div>
-      <pre>
- 
-</pre>
-      <pre>
+      <pre><BR>
 template &lt;class ForwardIterator&gt;
-<A name=c7></A>
-basic_regex(ForwardIterator first, ForwardIterator last,
-            flag_type f = regex_constants::normal, const Allocator&amp; a = Allocator());
+<A name=c7></A>basic_regex(ForwardIterator first, ForwardIterator last, flag_type f = regex_constants::normal);
 </pre>
       <p><b>Throws:</b> <code>bad_expression</code> if the sequence <i>[first, last)</i> 
          is not a valid regular expression.</p>
@@ -667,15 +659,11 @@ basic_regex(ForwardIterator first, ForwardIterator last,
             </table>
          </center>
       </div>
-      <pre>
-  
-</pre>
       <pre><A name=o1></A>
 basic_regex&amp; operator=(const basic_regex&amp; e);
 </pre>
       <p><b>Effects:</b> Returns the result of <code>assign(e.str(), e.flags())</code>.</p>
-      <pre><A name=o2></A>
-basic_regex&amp; operator=(const charT* ptr);
+      <pre><A name=o2></A>basic_regex&amp; operator=(const charT* ptr);
 </pre>
       <p><b>Requires:</b> <i>p</i> shall not be a null pointer.</p>
       <p><b>Effects:</b> Returns the result of <code>assign(ptr)</code>.</p>
@@ -685,23 +673,23 @@ basic_regex&amp; operator=(const basic_string&lt;charT, ST, SA&gt;&amp; p);
 </pre>
       <p><b>Effects:</b> Returns the result of <code>assign(p)</code>.</p>
       <h4>basic_regex iterators</h4>
-      <pre><A name=m1></A>
+      <pre>
 const_iterator begin() const;
 </pre>
       <p><b>Effects:</b> Returns a starting iterator to a sequence of characters 
          representing the regular expression.</p>
-      <pre><A name=m2></A>
+      <pre>
 const_iterator end() const;
 </pre>
       <p><b>Effects:</b> Returns termination iterator to a sequence of characters 
          representing the regular expression.</p>
       <h4>basic_regex capacity</h4>
-      <pre><A name=m3></A>
+      <pre>
 size_type size() const;
 </pre>
       <p><b>Effects:</b> Returns the length of the sequence of characters representing 
          the regular expression.</p>
-      <pre><A name=m4></A>
+      <pre>
 size_type max_size() const;
 </pre>
       <p><b>Effects:</b> Returns the maximum length of the sequence of characters 
@@ -716,7 +704,7 @@ bool empty() const;
       <p><b>Effects:</b> Returns the number of marked sub-expressions within the regular 
          expresion.</p>
       <h4>basic_regex assign</h4>
-      <pre><A name=a1></A>
+      <pre>
 basic_regex&amp; assign(const basic_regex&amp; that);
 </pre>
       <p><b>Effects:</b> Returns <code>assign(that.str(), that.flags())</code>.</p>
@@ -803,11 +791,7 @@ basic_regex&amp; assign(InputIterator first, InputIterator last,
          requirements (24.1.1).</p>
       <p><b>Effects:</b> Returns <code>assign(string_type(first, last), f)</code>.</p>
       <h4>basic_regex constant operations</h4>
-      <pre><A name=m7></A>Allocator get_allocator() const;
-</pre>
-      <p><b>Effects:</b> Returns a copy of the Allocator that was passed to the object's 
-         constructor.</p>
-      <pre><A name=m8></A>flag_type flags() const;
+      <pre><A name=m7></A><A name=m8></A>flag_type flags() const;
 </pre>
       <p><b>Effects:</b> Returns a copy of the regular expression syntax flags that were 
          passed to the object's constructor, or the last call to <code>assign.</code></p>
@@ -834,7 +818,7 @@ locale_type getloc() const;
             traits_inst</code> is a (default initialized) instance of the template 
          parameter <code>traits</code> stored within the object.</p>
       <h4>basic_regex swap</h4>
-      <pre><A name=m13></A>
+      <pre>
 void swap(basic_regex&amp; e) throw();
 </pre>
       <p><b>Effects:</b> Swaps the contents of the two regular expressions.</p>
@@ -902,11 +886,10 @@ void swap(basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
       <hr>
       <p>Revised 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         24&nbsp;June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/concepts.html b/doc/concepts.html
new file mode 100644
index 00000000..def336f5
--- /dev/null
+++ b/doc/concepts.html
@@ -0,0 +1,453 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+   <head>
+      <title>Boost.Regex: Index</title>
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+      <link rel="stylesheet" type="text/css" href="../../../boost.css">
+   </head>
+   <body>
+      <P>
+         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
+            <TR>
+               <td valign="top" width="300">
+                  <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
+               </td>
+               <TD width="353">
+                  <H1 align="center">Boost.Regex</H1>
+                  <H2 align="center">Concepts</H2>
+               </TD>
+               <td width="50">
+                  <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
+               </td>
+            </TR>
+         </TABLE>
+      </P>
+      <HR>
+      <p></p>
+      <H3><A name="charT"></A>charT requirements</H3>
+      <P>Type charT used a template argument to <A href="basic_regex.html">class template 
+            basic_regex</A>, must have a trivial default constructor, copy constructor, 
+         assignment operator, and destructor.&nbsp; In addition the following 
+         requirements must be met for objects; c of type charT, c1 and c2 of type charT 
+         const, and i of type int:</P>
+      <P>
+         <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="100%" border="1">
+            <TR>
+               <TD><STRONG>Expression</STRONG></TD>
+               <TD><STRONG>Return type</STRONG></TD>
+               <TD><STRONG>Assertion / Note / Pre- / Post-condition</STRONG></TD>
+            </TR>
+            <TR>
+               <TD>charT c</TD>
+               <TD>charT</TD>
+               <TD>Default constructor (must be trivial).</TD>
+            </TR>
+            <TR>
+               <TD>charT c(c1)</TD>
+               <TD>charT</TD>
+               <TD>Copy constructor (must be trivial).</TD>
+            </TR>
+            <TR>
+               <TD>c1 = c2</TD>
+               <TD>charT</TD>
+               <TD>Assignment operator (must be trivial).</TD>
+            </TR>
+            <TR>
+               <TD>c1 == c2</TD>
+               <TD>bool</TD>
+               <TD>true if&nbsp;c1 has the same value&nbsp;as c2.</TD>
+            </TR>
+            <TR>
+               <TD>c1 != c2</TD>
+               <TD>bool</TD>
+               <TD>true if c1 and c2 are not equal.</TD>
+            </TR>
+            <TR>
+               <TD>c1 &lt; c2</TD>
+               <TD>bool</TD>
+               <TD>true if the value of c1 is less than c2.</TD>
+            </TR>
+            <TR>
+               <TD>c1 &gt; c2</TD>
+               <TD>bool</TD>
+               <TD>true if the value of c1 is greater than c2.</TD>
+            </TR>
+            <TR>
+               <TD>c1 &lt;= c2</TD>
+               <TD>bool</TD>
+               <TD>true if c1 is less than or equal to c2.</TD>
+            </TR>
+            <TR>
+               <TD>c1 &gt;= c2</TD>
+               <TD>bool</TD>
+               <TD>true if c1 is greater than or equal to c2.</TD>
+            </TR>
+            <TR>
+               <TD>intmax_t i = c1</TD>
+               <TD>int</TD>
+               <TD>
+                  <P>charT must be convertible to an integral type.</P>
+                  <P>Note: type charT is not required to support this operation, if the traits class 
+                     used supports the full Boost-specific interface, rather than&nbsp;the minimal 
+                     standardised-interface (see traits class requirements below).</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>charT c(i);</TD>
+               <TD>charT</TD>
+               <TD>charT must be constructable from an integral type.</TD>
+            </TR>
+         </TABLE>
+      </P>
+      <H3><A name="traits"></A>traits requirements</H3>
+      <P>There are two sets of requirements for the traits template argument to 
+         basic_regex: a mininal interface (which is part of the regex standardization 
+         proposal), and an optional Boost-specific enhanced interface.</P>
+      <H4>Minimal requirements.</H4>
+      <P>In the following table X denotes a traits class defining types and functions 
+         for the character container type charT; u is an object of type X; v is an 
+         object of type const X; p is a value of type const charT*; I1 and I2 are Input 
+         Iterators; c is a value of type const charT; s is an object of type 
+         X::string_type; cs is an object of type const X::string_type; b is a value of 
+         type bool; I is a value of type int; F1 and F2 are values of type const charT*; 
+         and loc is an object of type X::locale_type.</P>
+      <P>
+         <TABLE id="Table3" cellSpacing="1" cellPadding="7" width="100%" border="1">
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P><STRONG>Expression</STRONG></P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P><STRONG>Return type</STRONG></P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P><STRONG>Assertion / Note
+                        <BR>
+                        Pre / Post condition</STRONG></P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>X::char_type</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>charT</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>The character container type used in the implementation of class template <CODE>basic_regex</CODE>.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>X::size_type</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>&nbsp;</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>An unsigned integer type, capable of holding the length of a null-terminated 
+                     string of charT's.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>X::string_type</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>std::basic_string&lt;charT&gt; or std::vector&lt;charT&gt;</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>&nbsp;</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>X::locale_type</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>Implementation defined</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>A copy constructible type that represents the locale used by the traits class.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>X::char_class_type</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>Implementation defined</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>A bitmask type representing a particular character classification. Multiple 
+                     values of this type can be bitwise-or'ed together to obtain a new valid value.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>X::length(p)</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>X::size_type</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Yields the smallest <CODE>i</CODE> such that <CODE>p[i] == 0</CODE>. Complexity 
+                     is linear in <CODE>i</CODE>.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.translate(c)</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>X::char_type</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Returns a character such that for any character d that is to be considered 
+                     equivalent to c then v.translate(c) == v.translate(d).</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.translate_nocase(c)</P>
+               </TD>
+               <TD vAlign="top" width="28%">X::char_type</TD>
+               <TD vAlign="top" width="45%">For all characters C that are to be considered 
+                  equivalent to c when comparisons are to be performed without regard to case, 
+                  then v.translate_- nocase(c) == v.translate_- nocase(C).</TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.transform(F1, F2)</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>X::string_type</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Returns a sort key for the character sequence designated by the iterator range 
+                     [F1, F2) such that if the character sequence [G1, G2) sorts before the 
+                     character sequence [H1, H2) then v.transform(G1, G2) &lt; v.transform(H1, 
+                     H2).&nbsp;</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.transform_primary(F1, F2)</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>X::string_type</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Returns a sort key for the character sequence designated by the iterator range 
+                     [F1, F2) such that if the character sequence [G1, G2) sorts before the 
+                     character sequence [H1, H2) when character case is not considered then 
+                     v.transform_primary(G1, G2) &lt; v.transform_- primary(H1, H2).</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.lookup_classname(F1, F2)</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>X::char_class_type</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Converts the character sequence designated by the iterator range [F1,F2) into a 
+                     bitmask type that can subsequently be passed to isctype. Values returned from 
+                     lookup_classname can be safely bitwise or'ed together. Returns 0 if the 
+                     character sequence is not the name of a character class recognized by X. The 
+                     value returned shall be independent of the case of the characters in the 
+                     sequence.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.lookup_collatename(F1, F2)</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>X::string_type</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Returns a sequence of characters that represents the collating element 
+                     consisting of the character sequence designated by the iterator range [F1, F2). 
+                     Returns an empty string if the character sequence is not a valid collating 
+                     element.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.isctype(c, v.lookup_classname (F1, F2))</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>bool</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Returns true if character c is a member of the character class designated by 
+                     the iterator range [F1, F2), false otherwise.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.value(c, i)</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>int</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Returns the value represented by the digit c in base I if the character c is a 
+                     valid digit in base I; otherwise returns -1. [Note: the value of I will only be 
+                     8, 10, or 16. -end note]</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>u.imbue(loc)</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>X::locale_type</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Imbues <CODE>u</CODE> with the locale <CODE>loc</CODE>, returns the previous 
+                     locale used by u if any.&nbsp;</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.getloc()</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>X::locale_type</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Returns the current locale used by <CODE>v</CODE> if any.&nbsp;</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD vAlign="top" width="28%">
+                  <P>v.error_string(i)</P>
+               </TD>
+               <TD vAlign="top" width="28%">
+                  <P>std::string</P>
+               </TD>
+               <TD vAlign="top" width="45%">
+                  <P>Returns a human readable error string for the error condition <CODE>i</CODE>, 
+                     where <CODE>i</CODE> is one of the values enumerated by type <CODE>regex_constants::error_type</CODE>.&nbsp; 
+                     If the value <CODE>i</CODE> is not recognized then returns the string "Unknown 
+                     error" or a localized equivalent.</P>
+               </TD>
+            </TR>
+         </TABLE>
+      </P>
+      <H4>Additional Optional Requirements</H4>
+      <P>The following additional requirements are strictly optional, however in order 
+         for basic_regex to take advantage of these additional interfaces, all of the 
+         following requirements must be met; basic_regex will detect the presence or 
+         absense of member <EM>boost_extensions_tag </EM>and configure itself 
+         appropriately.</P>
+      <P>
+         <TABLE id="Table4" cellSpacing="1" cellPadding="1" width="100%" border="1">
+            <TR>
+               <TD><STRONG>Expression</STRONG></TD>
+               <TD width="231"><STRONG>Result</STRONG></TD>
+               <TD>
+                  <P><STRONG>Assertion / Note
+                        <BR>
+                        Pre / Post condition</STRONG></P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>X::boost_extensions_tag</TD>
+               <TD width="231">An unspecified type.</TD>
+               <TD>When present, all of the extensions listed in this table must be present.</TD>
+            </TR>
+            <TR>
+               <TD>
+                  <P>v.syntax_type(c)</P>
+               </TD>
+               <TD width="231"><A href="../../../boost/regex/v4/syntax_type.hpp">regex_constants::syntax_type</A></TD>
+               <TD>
+                  <P>Returns a symbolic value of type <CODE>regex_constants::syntax_type </CODE>that 
+                     signifies the meaning of character <CODE>c</CODE> within the regular expression 
+                     grammar.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>v.escape_syntax_type(c)</TD>
+               <TD width="231"><A href="../../../boost/regex/v4/syntax_type.hpp">regex_constants::escape_syntax_type</A></TD>
+               <TD>
+                  <P>Returns a symbolic value of type <CODE>regex_constants::escape_syntax_type</CODE>, 
+                     that signifies the meaning of character <CODE>c</CODE>&nbsp;within the regular 
+                     expression grammar, when <CODE>c</CODE> has been preceded by an escape 
+                     character. Precondition: if <CODE>b</CODE> is the character preceding <CODE>c</CODE>
+                     in the expression being parsed then: <CODE>v.syntax_type(b) == syntax_escape</CODE></P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>
+                  <P>v.translate(c, b)</P>
+               </TD>
+               <TD width="231">X::char_type</TD>
+               <TD>
+                  <P>Returns a character <CODE>d</CODE> such that: for any character <CODE>d</CODE> that 
+                     is to be considered equivalent to <CODE>c</CODE>&nbsp;then <CODE>v.translate(c,false)==v.translate(d,false)</CODE>. 
+                     Likewise for all characters <CODE>C</CODE> that are to be considered equivalent 
+                     to <CODE>c</CODE> when comparisons are to be performed without regard to case, 
+                     then <CODE>v.translate(c,true)==v.translate(C,true)</CODE>.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>
+                  <P>v.toi(I1, I2, i)</P>
+               </TD>
+               <TD width="231">An integer type capable of holding either a charT or an int.</TD>
+               <TD>
+                  <P>Behaves as follows: if <CODE>p==q</CODE> or if <CODE>*p </CODE>is not a digit 
+                     character then returns -1. Otherwise performs formatted numeric input on the 
+                     sequence [p,q) and returns the result as an int. Postcondition: either <CODE>p == 
+                        q</CODE> or <CODE>*p</CODE> is a non-digit character.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>
+                  <P>v.error_string(i)</P>
+               </TD>
+               <TD width="231">std::string</TD>
+               <TD>
+                  <P>Returns a human readable error string for the error condition <CODE>i</CODE>, 
+                     where <CODE>i</CODE> is one of the values enumerated by type <CODE><A href="error_type.html">
+                           regex_constants::error_type</A></CODE>.&nbsp; If the value <CODE>i</CODE> 
+                     is not recognized then returns the string "Unknown error" or a localized 
+                     equivalent.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>v.tolower(c)</TD>
+               <TD width="231">X::char_type</TD>
+               <TD>Converts c to lower case, used for Perl-style \l and \L formating operations.</TD>
+            </TR>
+            <TR>
+               <TD>v.toupper(c)</TD>
+               <TD width="231">X::char_type</TD>
+               <TD>Converts c to upper case, used for Perl-style \u and \U formating operations.</TD>
+            </TR>
+         </TABLE>
+      </P>
+      <H3><A name="iterator"></A>Iterator Rrequirements</H3>
+      <P>
+      <P>The regular expression algorithms (and iterators) take all require a 
+         Bidirectional-Iterator.</P>
+      <P>
+         <HR>
+      </P>
+      <P></P>
+      <p>Revised 
+         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
+         24&nbsp;June 2004&nbsp; 
+         <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
+      <p><i>© Copyright John Maddock&nbsp;1998- 
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+      <P><I>Use, modification and distribution are subject to the Boost Software License, 
+            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
+            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
+   </body>
+</html>
diff --git a/doc/configuration.html b/doc/configuration.html
index 52498739..6d3dbbdf 100644
--- a/doc/configuration.html
+++ b/doc/configuration.html
@@ -1,225 +1,155 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
-<head>
-<title>Boost.Regex: Configuration and setup</title>
-<meta name="generator" content="HTML Tidy, see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../../../boost.css">
-</head>
-<body>
-<table id="Table1" cellspacing="1" cellpadding="1" width="100%"
-border="0">
-<tr>
-<td valign="top" width="300">
-<h3><a href="../../../index.htm"><img height="86" width="277" alt=
-"C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
-</td>
-<td width="353">
-<h1 align="center">Boost.Regex</h1>
-
-<h2 align="center">Configuration and setup</h2>
-</td>
-<td width="50">
-<h3><a href="index.html"><img height="45" width="43" alt=
-"Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<hr>
-<h2>Contents</h2>
-
-<dl class="index">
-<dt><a href="#compiler">Compiler setup</a></dt>
-
-<dt><a href="#locale">Locale and traits class selection</a></dt>
-
-<dt><a href="#linkage">Linkage Options</a></dt>
-
-<dt><a href="#algorithm">Algorithm Selection</a></dt>
-
-<dt><a href="#tuning">Algorithm Tuning</a></dt>
-</dl>
-
-<h3><a name="compiler"></a>Compiler setup.</h3>
-
-<p>You shouldn't need to do anything special to configure
-boost.regex for use with your compiler - the <a href="../../config/index.html">boost.config</a> subsystem should already
-take care of it, if you do have problems (or you are using a
-particularly obscure compiler or platform) then <a href="../../config/index.html">boost.config</a>&nbsp;has a&nbsp;<a href="../../config/config.htm#config_script">configure</a> script.</p>
-
-<h3><a name="locale"></a>Locale and traits class selection.</h3>
-
-<p>The following macros (see <a href="../../../boost/regex/user.hpp">user.hpp</a>) control how
-boost.regex interacts with the user's locale:</p>
-
-<table id="Table2" cellspacing="1" cellpadding="1" width="100%"
-border="1">
-<tr>
-<td width="265">BOOST_REGEX_USE_C_LOCALE</td>
-<td>Forces boost.regex to use the global C locale in its traits
-class support: this is the default behavior on non-windows
-platforms, but MS Windows platforms normally use the Win32 API for
-locale support.</td>
-</tr>
-
-<tr>
-<td width="265">BOOST_REGEX_USE_CPP_LOCALE</td>
-<td>Forces boost.regex to use std::locale in it's default traits
-class, regular expressions can then be imbued with an
-instance&nbsp;specific locale.</td>
-</tr>
-
-<tr>
-<td width="265">BOOST_REGEX_NO_W32</td>
-<td>Tells boost.regex not to use any Win32 API's even when
-available (implies BOOST_REGEX_USE_C_LOCALE unless
-BOOST_REGEX_USE_CPP_LOCALE is set).</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<h3><a name="linkage"></a>Linkage Options</h3>
-
-<table id="Table3" cellspacing="1" cellpadding="1" width="100%"
-border="1">
-<tr>
-<td>BOOST_REGEX_DYN_LINK</td>
-<td>For Microsoft and Borland C++ builds, this tells boost.regex
-that it should link to the dll build of the boost.regex.&nbsp; By
-default boost.regex will link to its static library build, even if
-the dynamic C runtime library is in use.</td>
-</tr>
-
-<tr>
-<td>BOOST_REGEX_NO_LIB</td>
-<td>For Microsoft and Borland C++ builds, this tells boost.regex
-that it should not automatically select the library to link
-to.</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<h3><a name="algorithm"></a>Algorithm Selection</h3>
-
-<table id="Table4" cellspacing="1" cellpadding="1" width="100%"
-border="1">
-<tr>
-<td width="253">BOOST_REGEX_V3</td>
-<td>Tells boost.regex to use the boost-1.30.0 matching algorithm,
-define only if you need maximum compatibility with previous
-behavior.</td>
-</tr>
-
-<tr>
-<td width="253">BOOST_REGEX_RECURSIVE</td>
-<td>Tells boost.regex to use a stack-recursive matching
-algorithm.&nbsp; This is generally the fastest option (although
-there is very little in it), but can cause stack overflow in
-extreme cases, on Win32 this can be handled safely, but this is not
-the case on other platforms.</td>
-</tr>
-
-<tr>
-<td width="253">BOOST_REGEX_NON_RECURSIVE</td>
-<td>Tells boost.regex to use a non-stack recursive matching
-algorithm, this can be slightly slower than the alternative, but is
-always safe no matter how pathological the regular
-expression.&nbsp; This is the default on non-Win32 platforms.</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<h3><a name="tuning"></a>Algorithm Tuning</h3>
-
-<p>The following option applies only if BOOST_REGEX_RECURSIVE is
-set.</p>
-
-<table id="Table6" cellspacing="1" cellpadding="1" width="100%"
-border="1">
-<tr>
-<td>BOOST_REGEX_HAS_MS_STACK_GUARD</td>
-<td>Tells boost.regex that Microsoft style __try - __except blocks
-are supported, and can be used to safely trap stack overflow.</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<p>The following options apply only if BOOST_REGEX_NON_RECURSIVE is
-set.</p>
-
-<table id="Table5" cellspacing="1" cellpadding="1" width="100%"
-border="1">
-<tr>
-<td>BOOST_REGEX_BLOCKSIZE</td>
-<td>In non-recursive mode, boost.regex uses largish blocks of
-memory to act as a stack for the state machine, the larger the
-block size then the fewer allocations that will take place.&nbsp;
-This defaults to 4096 bytes, which is large enough to match the
-vast majority of regular expressions&nbsp;without further
-allocations, however, you can choose smaller or larger values
-depending upon your platforms characteristics.</td>
-</tr>
-
-<tr>
-<td>BOOST_REGEX_MAX_BLOCKS</td>
-<td>Tells boost.regex how many blocks of size BOOST_REGEX_BLOCKSIZE
-it is permitted to use.&nbsp; If this value is exceeded then
-boost.regex will stop trying to find a match and throw a
-std::runtime_error.&nbsp; Defaults to 1024, don't forget to tweek
-this value if you alter BOOST_REGEX_BLOCKSIZE by much.</td>
-</tr>
-
-<tr>
-<td>BOOST_REGEX_MAX_CACHE_BLOCKS</td>
-<td>Tells boost.regex how many memory blocks to store in it's
-internal cache - memory blocks are taken from this cache rather
-than by calling ::operator new.&nbsp; Generally speeking this can
-be an order of magnitude faster than calling ::opertator new each
-time a memory block is required, but has the downside that
-boost.regex can end up caching a large chunk of memory (by default
-up to 16 blocks each of BOOST_REGEX_BLOCKSIZE size).&nbsp; If
-memory is tight then try defining this to 0 (disables all caching),
-or if that is too slow, then a value of 1 or 2, may be
-sufficient.&nbsp; On the other hand, on large multi-processor,
-multi-threaded systems, you may find that a higher value is in
-order.</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<hr>
-      <p>Revised 
+   <head>
+      <title>Boost.Regex: Configuration and setup</title>
+      <meta name="generator" content="HTML Tidy, see www.w3.org">
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+      <link rel="stylesheet" type="text/css" href="../../../boost.css">
+   </head>
+   <body>
+      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
+         <tr>
+            <td valign="top" width="300">
+               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
+            </td>
+            <td width="353">
+               <h1 align="center">Boost.Regex</h1>
+               <h2 align="center">Configuration and setup</h2>
+            </td>
+            <td width="50">
+               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
+            </td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <hr>
+      <h2>Contents</h2>
+      <dl class="index">
+         <dt><a href="#compiler">Compiler setup</a> <dt><a href="#locale">Locale and traits class 
+                  selection</a> <dt><a href="#linkage">Linkage Options</a> <dt><a href="#algorithm">Algorithm 
+                        Selection</a> <dt><a href="#tuning">Algorithm Tuning</a></dt>
+      </dl>
+      <h3><a name="compiler"></a>Compiler setup.</h3>
+      <p>You shouldn't need to do anything special to configure boost.regex for use with 
+         your compiler - the <a href="../../config/index.html">boost.config</a> subsystem 
+         should already take care of it, if you do have problems (or you are using a 
+         particularly obscure compiler or platform) then <a href="../../config/index.html">boost.config</a>&nbsp;has 
+         a&nbsp;<a href="../../config/config.htm#config_script">configure</a> script.</p>
+      <h3><a name="locale"></a>Locale and traits class selection.</h3>
+      <p>The following macros (see <a href="../../../boost/regex/user.hpp">user.hpp</a>) 
+         control how boost.regex interacts with the user's locale:</p>
+      <table id="Table2" cellspacing="1" cellpadding="1" width="100%" border="1">
+         <tr>
+            <td width="265">BOOST_REGEX_USE_C_LOCALE</td>
+            <td>
+               Forces boost.regex to use the global C locale in its traits class support: this 
+               is now deprecated in favour of the C++ locale.</td>
+         </tr>
+         <tr>
+            <td width="265">BOOST_REGEX_USE_CPP_LOCALE</td>
+            <td>Forces boost.regex to use std::locale in it's default traits class, regular 
+               expressions can then be imbued with an instance&nbsp;specific locale.&nbsp; 
+               This is the default behaviour on non-Windows platforms.</td>
+         </tr>
+         <tr>
+            <td width="265">BOOST_REGEX_NO_W32</td>
+            <td>Tells boost.regex not to use any Win32 API's even when available (implies 
+               BOOST_REGEX_USE_CPP_LOCALE unless BOOST_REGEX_USE_C_LOCALE is set).</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <h3><a name="linkage"></a>Linkage Options</h3>
+      <table id="Table3" cellspacing="1" cellpadding="1" width="100%" border="1">
+         <tr>
+            <td>BOOST_REGEX_DYN_LINK</td>
+            <td>For Microsoft and Borland C++ builds, this tells boost.regex that it should 
+               link to the dll build of the boost.regex.&nbsp; By default boost.regex will 
+               link to its static library build, even if the dynamic C runtime library is in 
+               use.</td>
+         </tr>
+         <tr>
+            <td>BOOST_REGEX_NO_LIB</td>
+            <td>For Microsoft and Borland C++ builds, this tells boost.regex that it should 
+               not automatically select the library to link to.</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <h3><a name="algorithm"></a>Algorithm Selection</h3>
+      <table id="Table4" cellspacing="1" cellpadding="1" width="100%" border="1">
+         <tr>
+            <td width="253">BOOST_REGEX_RECURSIVE</td>
+            <td>Tells boost.regex to use a stack-recursive matching algorithm.&nbsp; This is 
+               generally the fastest option (although there is very little in it), but can 
+               cause stack overflow in extreme cases, on Win32 this can be handled safely, but 
+               this is not the case on other platforms.</td>
+         </tr>
+         <tr>
+            <td width="253">BOOST_REGEX_NON_RECURSIVE</td>
+            <td>Tells boost.regex to use a non-stack recursive matching algorithm, this can be 
+               slightly slower than the alternative, but is always safe no matter how 
+               pathological the regular expression.&nbsp; This is the default on non-Win32 
+               platforms.</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <h3><a name="tuning"></a>Algorithm Tuning</h3>
+      <p>The following option applies only if BOOST_REGEX_RECURSIVE is set.</p>
+      <table id="Table6" cellspacing="1" cellpadding="1" width="100%" border="1">
+         <tr>
+            <td>BOOST_REGEX_HAS_MS_STACK_GUARD</td>
+            <td>Tells boost.regex that Microsoft style __try - __except blocks are supported, 
+               and can be used to safely trap stack overflow.</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <p>The following options apply only if BOOST_REGEX_NON_RECURSIVE is set.</p>
+      <table id="Table5" cellspacing="1" cellpadding="1" width="100%" border="1">
+         <tr>
+            <td>BOOST_REGEX_BLOCKSIZE</td>
+            <td>In non-recursive mode, boost.regex uses largish blocks of memory to act as a 
+               stack for the state machine, the larger the block size then the fewer 
+               allocations that will take place.&nbsp; This defaults to 4096 bytes, which is 
+               large enough to match the vast majority of regular expressions&nbsp;without 
+               further allocations, however, you can choose smaller or larger values depending 
+               upon your platforms characteristics.</td>
+         </tr>
+         <tr>
+            <td>BOOST_REGEX_MAX_BLOCKS</td>
+            <td>Tells boost.regex how many blocks of size BOOST_REGEX_BLOCKSIZE it is 
+               permitted to use.&nbsp; If this value is exceeded then boost.regex will stop 
+               trying to find a match and throw a std::runtime_error.&nbsp; Defaults to 1024, 
+               don't forget to tweek this value if you alter BOOST_REGEX_BLOCKSIZE by much.</td>
+         </tr>
+         <tr>
+            <td>BOOST_REGEX_MAX_CACHE_BLOCKS</td>
+            <td>Tells boost.regex how many memory blocks to store in it's internal cache - 
+               memory blocks are taken from this cache rather than by calling ::operator 
+               new.&nbsp; Generally speeking this can be an order of magnitude faster than 
+               calling ::opertator new each time a memory block is required, but has the 
+               downside that boost.regex can end up caching a large chunk of memory (by 
+               default up to 16 blocks each of BOOST_REGEX_BLOCKSIZE size).&nbsp; If memory is 
+               tight then try defining this to 0 (disables all caching), or if that is too 
+               slow, then a value of 1 or 2, may be sufficient.&nbsp; On the other hand, on 
+               large multi-processor, multi-threaded systems, you may find that a higher value 
+               is in order.</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <hr>
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         23 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-</body>
+   </body>
 </html>
-
-
diff --git a/doc/error_type.html b/doc/error_type.html
new file mode 100644
index 00000000..ed99c350
--- /dev/null
+++ b/doc/error_type.html
@@ -0,0 +1,140 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+   <head>
+      <title>Boost.Regex: Algorithm regex_search</title>
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+      <LINK href="../../../boost.css" type="text/css" rel="stylesheet"></head>
+   <body>
+      <P>
+         <TABLE id="Table1" cellSpacing="1" cellPadding="1" width="100%" border="0">
+            <TR>
+               <td vAlign="top" width="300">
+                  <h3><A href="../../../index.htm"><IMG height="86" alt="C++ Boost" src="../../../c++boost.gif" width="277" border="0"></A></h3>
+               </td>
+               <TD width="353">
+                  <H1 align="center">Boost.Regex</H1>
+                  <H2 align="center">error_type</H2>
+               </TD>
+               <td width="50">
+                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
+               </td>
+            </TR>
+         </TABLE>
+      </P>
+      <HR>
+      <H3>Contents</H3>
+      <dl class="index">
+         <dt><A href="#synopsis">Synopsis</A> <dt><a href="#description">Description</a></dt></dl>
+      <H3><A name="synopsis"></A>Synopsis</H3>
+      <P>Type error type represents the different types of errors that can be raised by 
+         the library when parsing a regular expression.</P>
+      <pre>
+namespace boost{ namespace regex_constants{
+
+typedef implementation-specific-type error_type;
+
+static const error_type error_collate;
+static const error_type error_ctype;
+static const error_type error_escape;
+static const error_type error_backref;
+static const error_type error_brack;
+static const error_type error_paren;
+static const error_type error_brace;
+static const error_type error_badbrace;
+static const error_type error_range;
+static const error_type error_space;
+static const error_type error_badrepeat;
+static const error_type error_complexity;
+static const error_type error_stack;
+static const error_type error_bad_pattern;
+
+} // namespace regex_constants
+} // namespace boost
+</pre>
+      <P>&nbsp;</P>
+      <H3><A name="description"></A>Description</H3>
+      <P>The type error_type is an implementation-specific enumeration type that may 
+         take one of the following values:</P>
+      <P>
+         <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="100%" border="1">
+            <TR>
+               <TD><STRONG>Constant</STRONG></TD>
+               <TD><STRONG>Meaning</STRONG></TD>
+            </TR>
+            <TR>
+               <TD>error_collate</TD>
+               <TD>An invalid collating element was specified in a [[.name.]] block.</TD>
+            </TR>
+            <TR>
+               <TD>error_ctype</TD>
+               <TD>An invalid character class name was specified in a [[:name:]] block.</TD>
+            </TR>
+            <TR>
+               <TD>error_escape</TD>
+               <TD>An invalid or trailing escape was encountered.</TD>
+            </TR>
+            <TR>
+               <TD>error_backref</TD>
+               <TD>A back-reference to a non-existant marked sub-expression was encountered.</TD>
+            </TR>
+            <TR>
+               <TD>error_brack</TD>
+               <TD>An invalid character set [...] was encountered.</TD>
+            </TR>
+            <TR>
+               <TD>error_paren</TD>
+               <TD>
+                  <P>Mismatched '(' and ')'.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>error_brace</TD>
+               <TD>Mismatched '{' and '}'.</TD>
+            </TR>
+            <TR>
+               <TD>error_badbrace</TD>
+               <TD>Invalid contents of a {...} block.</TD>
+            </TR>
+            <TR>
+               <TD>error_range</TD>
+               <TD>A character range was invalid, for example [d-a].</TD>
+            </TR>
+            <TR>
+               <TD>error_space</TD>
+               <TD>Out of memory.</TD>
+            </TR>
+            <TR>
+               <TD>error_badrepeat</TD>
+               <TD>An attempt to repeat something that can not be repeated - for example a*+</TD>
+            </TR>
+            <TR>
+               <TD>error_complexity</TD>
+               <TD>The expression became too complex to handle.</TD>
+            </TR>
+            <TR>
+               <TD>error_stack</TD>
+               <TD>Out of program stack space.</TD>
+            </TR>
+            <TR>
+               <TD>error_bad_pattern</TD>
+               <TD>Other unspecified errors.</TD>
+            </TR>
+         </TABLE>
+      </P>
+      <H3><A name="examples"></A>
+         <HR>
+      </H3>
+      <p>Revised&nbsp; 
+         <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
+         24 June 2004&nbsp; 
+         <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
+      </p>
+      <P><I>© Copyright <a href="mailto:jm@regex.fsnet.co.uk">John Maddock</a>&nbsp;1998-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></I></P>
+      <P align="left"><I>Permission to use, copy, modify, distribute and sell this software 
+            and its documentation for any purpose is hereby granted without fee, provided 
+            that the above copyright notice appear in all copies and that both that 
+            copyright notice and this permission notice appear in supporting documentation. 
+            Dr John Maddock makes no representations about the suitability of this software 
+            for any purpose. It is provided "as is" without express or implied warranty.</I></P>
+   </body>
+</html>
diff --git a/doc/examples.html b/doc/examples.html
index 6754a72d..1b74077c 100644
--- a/doc/examples.html
+++ b/doc/examples.html
@@ -25,36 +25,71 @@
       <BR>
       <BR>
       <HR>
-      <P>There are three demo applications that ship with this library, they all come 
-         with makefiles for Borland, Microsoft and gcc compilers, otherwise you will 
-         have to create your own makefiles.</P>
-      <H5>regress.exe:</H5>
+      <H3>Test Programs</H3>
+      <H4>regress:</H4>
       <P>A regression test application that gives the matching/searching algorithms a 
          full workout. The presence of this program is your guarantee that the library 
          will behave as claimed - at least as far as those items tested are concerned - 
          if anyone spots anything that isn't being tested I'd be glad to hear about it.</P>
-      <P>Files: <A href="../test/regress/parse.cpp">parse.cpp</A>, <A href="../test/regress/regress.cpp">
-            regress.cpp</A>, <A href="../test/regress/tests.cpp">tests.cpp</A>.</P>
-      <H5>jgrep.exe</H5>
+      <P>Directory: <A href="../test/regress">libs/regex/test/regress</A>.</P>
+      <P>Files: <A href="../test/regress/basic_tests.cpp">basic_tests.cpp</A> <A href="../test/regress/test_deprecated.cpp">
+            test_deprecated.cpp</A> <A href="../test/regress/main.cpp">main.cpp</A>.</P>
+      <H4>bad_expression_test:</H4>
+      <P>Verifies that "bad" regular expressions don't cause the matcher to go into 
+         infinite loops, but to throw an exception instead.</P>
+      <P>Directory: <A href="../test/pathology">libs/regex/test/pathology</A>.</P>
+      <P>Files: <A href="../test/pathology/bad_expression_test.cpp">bad_expression_test.cpp</A>.</P>
+      <H4>recursion_test:</H4>
+      <P>Verifies that the matcher can't overrun the stack (no matter what the 
+         expression).</P>
+      <P>Directory: <A href="../test/pathology">libs/regex/test/pathology</A>.</P>
+      <P>Files: <A href="../test/pathology/recursion_test.cpp">recursion_test.cpp</A>.</P>
+      <H4>concepts:</H4>
+      <P>Verifies that the library meets all documented concepts (a compile only test).</P>
+      <P>Directory: <A href="../test/concepts">libs/regex/test/concepts</A>.</P>
+      <P>Files: <A href="../test/concepts/concept_check.cpp">concept_check.cpp</A>.</P>
+      <H4>captures_test:</H4>
+      <P>Test code for captures.</P>
+      <P>Directory: <A href="../test/captures">libs/test/captures</A>.</P>
+      <P>Files: <A href="../test/captures/captures_test.cpp">captures_test.cpp</A>.</P>
+      <H3>Example programs</H3>
+      <H4>jgrep.exe</H4>
       <P>A simple grep implementation, run with no command line options to find out its 
          usage. Look at <A href="../src/fileiter.cpp">fileiter.cpp</A>/fileiter.hpp and 
          the mapfile class to see an example of a "smart" bidirectional iterator that 
          can be used with boost.regex or any other STL algorithm.</P>
       <P>Files: <A href="../example/jgrep/jgrep.cpp">jgrep.cpp</A>, <A href="../example/jgrep/main.cpp">
             main.cpp</A>.</P>
-      <H5>timer.exe</H5>
+      <H4>timer.exe</H4>
       <P>A simple interactive expression matching application, the results of all 
          matches are timed, allowing the programmer to optimize their regular 
          expressions where performance is critical.</P>
       <P>Files: <A href="../example/timer/regex_timer.cpp">regex_timer.cpp</A>.</P>
-      <H5>Code snippets</H5>
+      <H4>Code snippets</H4>
       <P>The snippets examples contain the code examples used in the documentation:</P>
+      <P><A href="../example/snippets/captures_example.cpp">captures_example.cpp</A>: 
+         Demonstrates the use of captures.</P>
       <P><A href="../example/snippets/credit_card_example.cpp">credit_card_example.cpp</A>: 
          Credit card number formatting code.</P>
       <P><A href="../example/snippets/partial_regex_grep.cpp">partial_regex_grep.cpp</A>: 
          Search example using partial matches.</P>
       <P><A href="../example/snippets/partial_regex_match.cpp">partial_regex_match.cpp</A>: 
          regex_match example using partial matches.</P>
+      <P><A href="../example/snippets/regex_iterator_example.cpp">regex_iterator_example.cpp</A>: 
+         Iterating through a series of matches.</P>
+      <P><A href="../example/snippets/regex_match_example.cpp">regex_match_example.cpp</A>: 
+         ftp based regex_match example.</P>
+      <P><A href="../example/snippets/regex_merge_example.cpp">regex_merge_example.cpp</A>: 
+         regex_merge example: converts a C++ file to syntax highlighted HTML.</P>
+      <P><A href="../example/snippets/regex_replace_example.cpp">regex_replace_example.cpp</A>: 
+         regex_replace example: converts a C++ file to syntax highlighted HTML</P>
+      <P><A href="../example/snippets/regex_search_example.cpp">regex_search_example.cpp</A>: 
+         regex_search example: searches a cpp file for class definitions.</P>
+      <P><A href="../example/snippets/regex_token_iterator_eg_1.cpp">regex_token_iterator_eg_1.cpp</A>: 
+         split a string into a series of tokens.</P>
+      <P><A href="../example/snippets/regex_token_iterator_eg_2.cpp">regex_token_iterator_eg_2.cpp</A>: 
+         enumerate the linked URL's in a HTML file.</P>
+      <P>The following are deprecated:</P>
       <P><A href="../example/snippets/regex_grep_example_1.cpp">regex_grep_example_1.cpp</A>: 
          regex_grep example 1: searches a cpp file for class definitions.</P>
       <P><A href="../example/snippets/regex_grep_example_2.cpp">regex_grep_example_2.cpp</A>: 
@@ -66,30 +101,20 @@
       <P><A href="../example/snippets/regex_grep_example_4.cpp">regex_grep_example_4.cpp</A>: 
          regex_grep example 2: searches a cpp file for class definitions, using a C++ 
          Builder closure as a callback.</P>
-      <P><A href="../example/snippets/regex_match_example.cpp">regex_match_example.cpp</A>: 
-         ftp based regex_match example.</P>
-      <P><A href="../example/snippets/regex_merge_example.cpp">regex_merge_example.cpp</A>: 
-         regex_merge example: converts a C++ file to syntax highlighted HTML.</P>
-      <P><A href="../example/snippets/regex_replace_example.cpp">regex_replace_example.cpp</A>: 
-         regex_replace example: converts a C++ file to syntax highlighted HTML</P>
-      <P><A href="../example/snippets/regex_search_example.cpp">regex_search_example.cpp</A>: 
-         regex_search example: searches a cpp file for class definitions.</P>
       <P><A href="../example/snippets/regex_split_example_1.cpp">regex_split_example_1.cpp</A>: 
          regex_split example: split a string into tokens.</P>
       <P><A href="../example/snippets/regex_split_example_2.cpp">regex_split_example_2.cpp</A>
          : regex_split example: spit out linked URL's.</P>
       <P></P>
       <HR>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         28 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
-
diff --git a/doc/headers.html b/doc/headers.html
index 46a4e34d..e72da0c4 100644
--- a/doc/headers.html
+++ b/doc/headers.html
@@ -25,9 +25,9 @@
       <HR>
       <p></p>
       <P>There are two main headers used by this library: &lt;boost/regex.hpp&gt; 
-         provides full access to the entire library, while &lt;boost/cregex.hpp&gt; 
-         provides access to just the high level class RegEx, and the POSIX API 
-         functions.
+         provides full access to the main template library, while 
+         &lt;boost/cregex.hpp&gt; provides access to the (deprecated) high level class 
+         RegEx, and the POSIX API functions.
       </P>
       <P>There is also a header containing only forward declarations 
          &lt;boost/regex_fwd.hpp&gt; for use when an interface is dependent upon 
@@ -35,16 +35,14 @@
       <P>
          <HR>
       <P></P>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         28 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
-
diff --git a/doc/history.html b/doc/history.html
index 67f54508..f94c67bb 100644
--- a/doc/history.html
+++ b/doc/history.html
@@ -24,6 +24,19 @@
       </P>
       <HR>
       <p></p>
+      <P>Boost 1.33.0.</P>
+      <UL>
+         <LI>
+            Completely rewritten expression parsing code, and traits class support; now 
+            conforms to the standardization proposal.</LI>
+         <LI>
+            Added support for (?imsx-imsx) constructs.</LI>
+         <LI>
+            Added support for lookbehind expressions (?&lt;=positive-lookbehind) and 
+            (?&lt;!negative-lookbehind).</LI>
+         <LI>
+            Added support for conditional expressions 
+            (?(assertion)true-expresion|false-expression).</LI></UL>
       <P>Boost 1.31.0.</P>
       <UL>
          <LI>
@@ -55,12 +68,12 @@
       <P>
          <HR>
       <P></P>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         22 Dec 2003 
+         28 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/index.html b/doc/index.html
index 89e15ac0..74c79f53 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
    <head>
-      <meta name="generator" content="HTML Tidy, see www.w3.org">
       <title>Boost.Regex: Index</title>
+      <meta name="generator" content="HTML Tidy, see www.w3.org">
       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
       <link rel="stylesheet" type="text/css" href="../../../boost.css">
    </head>
@@ -13,7 +13,7 @@
             <td valign="top" width="300">
                <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
             </td>
-            <td style="WIDTH: 353px">
+            <td width="353">
                <h1 align="center">Boost.Regex</h1>
                <h2 align="center">Index</h2>
             </td>
@@ -27,117 +27,104 @@
       <hr>
       <h2>Contents</h2>
       <dl class="index">
-         <dt><a href="introduction.html">Overview</a></dt>
-         <dt><a href="configuration.html">Configuration and setup</a></dt> 
-         <dt><a href="install.html">Installation</a></dt>
-         <dd>
-            <dl class="index">
-               <dt><a href="install.html#bcb">Borland C++ Builder</a></dt> <dt><a href="install.html#vc">
-                     Microsoft Visual C++</a></dt> <dt><a href="install.html#gcc">GNU G++</a></dt>
-               <dt><a href="install.html#sun">Sun Forte Compiler</a></dt> <dt><a href="install.html#other">
-                     Other compilers (building with bjam)</a></dt>
-            </dl>
-         </dd>
-         <dt>Reference</dt>
-         <dd>
-            <dl class="index">
-               <dt>Types</dt>
-               <dd>
-                  <dl class="index">
-                     <dt><a href="syntax_option_type.html">syntax_option_type</a></dt> <dt><a href="match_flag_type.html">
-                           match_flag_type</a></dt> <dt><a href="bad_expression.html">class bad_expression</a></dt>
-                     <dt><a href="regex_traits.html">class regex_traits</a></dt> 
-                     <dt><a href="basic_regex.html">class template basic_regex</a></dt> 
-                     <dt><a href="sub_match.html">class template sub_match</a></dt> 
-                     <dt><a href="match_results.html">class template match_results</a></dt>
-                  </dl>
-               </dd>
-               <dt>Algorithms</dt>
-               <dd>
-                  <dl class="index">
-                     <dt><a href="regex_match.html">regex_match</a></dt> <dt><a href="regex_search.html">regex_search</a></dt>
-                     <dt><a href="regex_replace.html">regex_replace</a></dt>
-                  </dl>
-               </dd>
-               <dt>Iterators</dt>
-               <dd>
-                  <dl class="index">
-                     <dt><a href="regex_iterator.html">regex_iterator</a></dt>
-                     <dt><a href="regex_token_iterator.html">regex_token_iterator</a></dt>
-                  </dl>
-               </dd>
-               <dt>Typedefs</dt>
-               <dd>
-                  <dl class="index">
-                     <dt><a href="basic_regex.html">regex</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = basic_regex&lt;char&gt; ]</dt> 
-                     <dt><a href="basic_regex.html">wregex</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = basic_regex&lt;wchar_t&gt; ]</dt> 
-                     <dt><a href="match_results.html">cmatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = match_results&lt;const char*&gt; ]</dt>
-                     <dt><a href="match_results.html">wcmatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = match_results&lt;const wchar_t*&gt; ]</dt>
-                     <dt><a href="match_results.html">smatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = match_results&lt;std::string::const_iterator&gt; ]</dt>
-                     <dt><a href="match_results.html">wsmatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = match_results&lt;std::wstring::const_iterator&gt; ]</dt>
-                     <dt><a href="regex_iterator.html">cregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_iterator&lt;const char*&gt;]</dt>
-                     <dt><a href="regex_iterator.html">wcregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_iterator&lt;const wchar_t*&gt;]</dt>
-                     <dt><a href="regex_iterator.html">sregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_iterator&lt;std::string::const_iterator&gt;]</dt>
-                     <dt><a href="regex_iterator.html">wsregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_iterator&lt;std::wstring::const_iterator&gt;]</dt>
-                     <dt><a href="regex_token_iterator.html">cregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_token_iterator&lt;const char*&gt;]</dt>
-                     <dt><a href="regex_token_iterator.html">wcregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_token_iterator&lt;const wchar_t*&gt;]</dt>
-                     <dt><a href="regex_token_iterator.html">sregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_token_iterator&lt;std::string::const_iterator&gt;]</dt>
-                     <dt><a href="regex_token_iterator.html">wsregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_token_iterator&lt;std::wstring::const_iterator&gt;]</dt>
-                  </dl>
-               </dd>
-               <dt>Misc.</dt>
-               <dd>
-                  <dl class="index">
-                     <dt><a href="posix_api.html">POSIX API Compatibility Functions</a></dt>
-                     <dt><a href="partial_matches.html">Partial matches</a></dt>
-                     <dt><a href="syntax.html">Regular Expression Syntax</a></dt>
-                     <dt><a href="format_syntax.html">Format String Syntax</a></dt>
-                     <dt><a href="captures.html">Understanding Captures</a></dt>
-                  </dl>
-               </dd>
-               <dt>Deprecated interfaces</dt>
-               <dd>
-                  <dl class="index">
-                     <dt><a href="regbase.html">class regbase</a></dt> <dt><a href="reg_expression.html">class 
-                           template reg_expression</a></dt> <dt><a href="regex_grep.html">Algorithm 
-                           regex_grep</a></dt> <dt><a href="regex_format.html">Algorithm regex_format</a></dt>
-                     <dt><a href="regex_merge.html">Algorithm regex_merge</a></dt> <dt><a href="regex_split.html">
-                           Algorithm regex_split</a></dt>
-                      <dt><a href="regex.html">class RegEx</a></dt>
-                 </dl>
-               </dd>
-            </dl>
-         </dd>
-         <dt><a href="faq.html">FAQ</a></dt>
-         <dt>Appendix</dt>
-         <dd>
-            <dl class="index">
-               <dt><a href="implementation.html">Implementation</a></dt>
-               <dt><a href="thread_safety.html">Thread Safety</a></dt>
-               <dt><a href="localisation.html">Localisation</a></dt>
-               <dt><a href="examples.html">Examples</a></dt>
-               <dt><a href="headers.html">Headers</a></dt>
-               <dt><a href="redistributables.html">Redistributables and Library Names</a></dt>
-               <dt><a href="standards.html">Standards Conformance</a></dt>
-               <dt><a href="history.html">History</a></dt>
-               <dt><a href="performance.html">Performance</a></dt>
-               <dt><a href="contacts.html">Contacts and Acknowledgements</a></dt>
-           </dl>
-         </dd>
+         <dt><a href="introduction.html">Overview</a> <dt><a href="configuration.html">Configuration 
+                  and setup</a> <dt><a href="install.html">Installation</a>
+                  <dd>
+                     <dl class="index">
+                        <dt><a href="install.html#bcb">Borland C++ Builder</a> <dt><a href="install.html#vc">Microsoft 
+                                 Visual C++</a> <dt><a href="install.html#gcc">GNU G++</a> <dt><a href="install.html#sun">
+                                       Sun Forte Compiler</a> <dt><a href="install.html#other">Other compilers (building 
+                                          with bjam)</a></dt>
+                     </dl>
+                     <dt>Reference
+                        <dd>
+                           <dl class="index">
+                              <dt>Types
+                                 <dd>
+                                    <dl class="index">
+                                       <dt><a href="syntax_option_type.html">syntax_option_type</a> <dt><a href="error_type.html">
+                                                error_type</a> <dt><a href="match_flag_type.html">match_flag_type</a> <dt><a href="bad_expression.html">
+                                                      class&nbsp;regex_error</a> <dt><a href="regex_traits.html">class regex_traits</a>
+                                                      <dt><a href="basic_regex.html">class template basic_regex</a> <dt><a href="sub_match.html">
+                                                               class template sub_match</a> <dt><a href="match_results.html">class template 
+                                                                  match_results</a></dt>
+                                    </dl>
+                                    <dt>Algorithms
+                                       <dd>
+                                          <dl class="index">
+                                             <dt><a href="regex_match.html">regex_match</a> <dt><a href="regex_search.html">regex_search</a>
+                                                   <dt><a href="regex_replace.html">regex_replace</a></dt>
+                                          </dl>
+                                          <dt>Iterators
+                                             <dd>
+                                                <dl class="index">
+                                                   <dt><a href="regex_iterator.html">regex_iterator</a> <dt><a href="regex_token_iterator.html">
+                                                            regex_token_iterator</a></dt>
+                                                </dl>
+                                                <dt>Typedefs
+                                                   <dd>
+                                                      <dl class="index">
+                                                         <dt><a href="basic_regex.html">regex</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = 
+                                                            basic_regex&lt;char&gt; ] <dt><a href="basic_regex.html">wregex</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ 
+                                                               = basic_regex&lt;wchar_t&gt; ] <dt><a href="match_results.html">cmatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ 
+                                                                  = match_results&lt;const char*&gt; ] <dt><a href="match_results.html">wcmatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ 
+                                                                     = match_results&lt;const wchar_t*&gt; ] <dt><a href="match_results.html">smatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ 
+                                                                        = match_results&lt;std::string::const_iterator&gt; ] <dt><a href="match_results.html">
+                                                                              wsmatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = 
+                                                                           match_results&lt;std::wstring::const_iterator&gt; ] <dt><a href="regex_iterator.html">
+                                                                                 cregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_iterator&lt;const 
+                                                                              char*&gt;] <dt><a href="regex_iterator.html">wcregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ 
+                                                                                 = regex_iterator&lt;const wchar_t*&gt;] <dt><a href="regex_iterator.html">sregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ 
+                                                                                    = regex_iterator&lt;std::string::const_iterator&gt;] <dt><a href="regex_iterator.html">
+                                                                                          wsregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = 
+                                                                                       regex_iterator&lt;std::wstring::const_iterator&gt;] <dt><a href="regex_token_iterator.html">
+                                                                                             cregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = 
+                                                                                          regex_token_iterator&lt;const char*&gt;] <dt><a href="regex_token_iterator.html">wcregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ 
+                                                                                             = regex_token_iterator&lt;const wchar_t*&gt;] <dt><a href="regex_token_iterator.html">
+                                                                                                   sregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = 
+                                                                                                regex_token_iterator&lt;std::string::const_iterator&gt;] <dt><a href="regex_token_iterator.html">
+                                                                                                      wsregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = 
+                                                                                                   regex_token_iterator&lt;std::wstring::const_iterator&gt;]</dt>
+                                                      </dl>
+                                                      <dt>Misc.
+                                                         <dd>
+                                                            <dl class="index">
+                                                               <dt><a href="posix_api.html">POSIX API Compatibility Functions</a> <dt><a href="partial_matches.html">
+                                                                        Partial matches</a> <dt><a href="syntax.html">Regular Expression Syntax</a> <dt><a href="format_syntax.html">
+                                                                              Format String Syntax</a> <dt><a href="captures.html">Understanding Captures</a></dt>
+                                                            </dl>
+                                                            <dt>Deprecated interfaces
+                                                               <dd>
+                                                                  <dl class="index">
+                                                                     <dt><a href="regbase.html">class regbase</a> <dt><a href="reg_expression.html">class 
+                                                                              template reg_expression</a> <dt><a href="regex_grep.html">Algorithm regex_grep</a>
+                                                                              <dt><a href="regex_format.html">Algorithm regex_format</a> <dt><a href="regex_merge.html">
+                                                                                       Algorithm regex_merge</a> <dt><a href="regex_split.html">Algorithm regex_split</a>
+                                                                                       <dt><a href="regex.html">class RegEx</a></dt>
+                                                                  </dl>
+                                                               </dd>
+                           </dl>
+                           <dt><a href="faq.html">FAQ</a> <dt>Appendix
+                                 <dd>
+                                    <dl class="index">
+                                       <dt><a href="implementation.html">Implementation</a> <dt><a href="thread_safety.html">Thread 
+                                                Safety</a> <dt><a href="localisation.html">Localisation</a> <dt><a href="examples.html">
+                                                      Examples</a> <dt><a href="headers.html">Headers</a> <dt><a href="redistributables.html">
+                                                            Redistributables and Library Names</a> <dt><a href="standards.html">Standards 
+                                                               Conformance</a> <dt><a href="history.html">History</a> <dt><a href="performance.html">
+                                                                     Performance</a> <dt><a href="contacts.html">Contacts and Acknowledgements</a></dt>
+                                    </dl>
+                                 </dd>
       </dl>
       <hr>
       <p>Revised 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         24&nbsp;June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
-
-
-
diff --git a/doc/localisation.html b/doc/localisation.html
index 770a5485..5d4685c1 100644
--- a/doc/localisation.html
+++ b/doc/localisation.html
@@ -1,1023 +1,808 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
-<head>
-<meta name="generator" content="HTML Tidy, see www.w3.org">
-<title>Boost.Regex: Localisation</title>
-<meta http-equiv="Content-Type" content=
-"text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../../../boost.css">
-</head>
-<body>
-<p></p>
-
-<table id="Table1" cellspacing="1" cellpadding="1" width="100%"
-border="0">
-<tr>
-<td valign="top" width="300">
-<h3><a href="../../../index.htm"><img height="86" width="277" alt=
-"C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
-</td>
-<td width="353">
-<h1 align="center">Boost.Regex</h1>
-
-<h2 align="center">Localisation</h2>
-</td>
-<td width="50">
-<h3><a href="index.html"><img height="45" width="43" alt=
-"Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
-</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<hr>
-<p>Boost.regex&nbsp;provides extensive support for run-time
-localization, the localization model used can be split into two
-parts: front-end and back-end.</p>
-
-<p>Front-end localization deals with everything which the user sees
-- error messages, and the regular expression syntax itself. For
-example a French application could change [[:word:]] to [[:mot:]]
-and \w to \m. Modifying the front end locale requires active
-support from the developer, by providing the library with a message
-catalogue to load, containing the localized strings. Front-end
-locale is affected by the LC_MESSAGES category only.</p>
-
-<p>Back-end localization deals with everything that occurs after
-the expression has been parsed - in other words everything that the
-user does not see or interact with directly. It deals with case
-conversion, collation, and character class membership. The back-end
-locale does not require any intervention from the developer - the
-library will acquire all the information it requires for the
-current locale from the underlying operating system / run time
-library. This means that if the program user does not interact with
-regular expressions directly - for example if the expressions are
-embedded in your C++ code - then no explicit localization is
-required, as the library will take care of everything for you. For
-example embedding the expression [[:word:]]+ in your code will
-always match a whole word, if the program is run on a machine with,
-for example, a Greek locale, then it will still match a whole word,
-but in Greek characters rather than Latin ones. The back-end locale
-is affected by the LC_TYPE and LC_COLLATE categories.</p>
-
-<p>There are three separate localization mechanisms supported by
-boost.regex:</p>
-
-<h3>Win32 localization model.</h3>
-
-<p>This is the default model when the library is compiled under
-Win32, and is encapsulated by the traits class w32_regex_traits.
-When this model is in effect there is a single global locale as
-defined by the user's control panel settings, and returned by
-GetUserDefaultLCID. All the settings used by boost.regex are
-acquired directly from the operating system bypassing the C run
-time library. Front-end localization requires a resource dll,
-containing a string table with the user-defined strings. The traits
-class exports the function:</p>
-
-<p>static std::string set_message_catalogue(const std::string&amp;
-s);</p>
-
-<p>which needs to be called with a string identifying the name of
-the resource dll, <i>before</i> your code compiles any regular
-expressions (but not necessarily before you construct any <i>
-basic_regex</i> instances):</p>
-
-<p>
-boost::w32_regex_traits&lt;char&gt;::set_message_catalogue("mydll.dll");</p>
-
-<p>Note that this API sets the dll name for <i>both</i> the narrow
-and wide character specializations of w32_regex_traits.</p>
-
-<p>This model does not currently support thread specific locales
-(via SetThreadLocale under Windows NT), the library provides full
-Unicode support under NT, under Windows 9x the library degrades
-gracefully - characters 0 to 255 are supported, the remainder are
-treated as "unknown" graphic characters.</p>
-
-<h3>C localization model.</h3>
-
-<p>This is the default model when the library is compiled under an
-operating system other than Win32, and is encapsulated by the
-traits class <i>c_regex_traits</i>, Win32 users can force this
-model to take effect by defining the pre-processor symbol
-BOOST_REGEX_USE_C_LOCALE. When this model is in effect there is a
-single global locale, as set by <i>setlocale</i>. All settings are
-acquired from your run time library, consequently Unicode support
-is dependent upon your run time library implementation. Front end
-localization requires a POSIX message catalogue. The traits class
-exports the function:</p>
-
-<p>static std::string set_message_catalogue(const std::string&amp;
-s);</p>
-
-<p>which needs to be called with a string identifying the name of
-the message catalogue, <i>before</i> your code compiles any regular
-expressions (but not necessarily before you construct any <i>
-basic_regex</i> instances):</p>
-
-<p>
-boost::c_regex_traits&lt;char&gt;::set_message_catalogue("mycatalogue");</p>
-
-<p>Note that this API sets the dll name for <i>both</i> the narrow
-and wide character specializations of c_regex_traits. If your run
-time library does not support POSIX message catalogues, then you
-can either provide your own implementation of &lt;nl_types.h&gt; or
-define BOOST_RE_NO_CAT to disable front-end localization via
-message catalogues.</p>
-
-<p>Note that calling <i>setlocale</i> invalidates all compiled
-regular expressions, calling <tt>setlocale(LC_ALL, "C")</tt> will
-make this library behave equivalent to most traditional regular
-expression libraries including version 1 of this library.</p>
-
-<h3>C++ localization model.</h3>
-
-<p>This model is only in effect if the library is built with the
-pre-processor symbol BOOST_REGEX_USE_CPP_LOCALE defined. When this
-model is in effect each instance of basic_regex&lt;&gt; has its own
-instance of std::locale, class basic_regex&lt;&gt; also has a
-member function <i>imbue</i> which allows the locale for the
-expression to be set on a per-instance basis. Front end
-localization requires a POSIX message catalogue, which will be
-loaded via the std::messages facet of the expression's locale, the
-traits class exports the symbol:</p>
-
-<p>static std::string set_message_catalogue(const std::string&amp;
-s);</p>
-
-<p>which needs to be called with a string identifying the name of
-the message catalogue, <i>before</i> your code compiles any regular
-expressions (but not necessarily before you construct any <i>
-basic_regex</i> instances):</p>
-
-<p>
-boost::cpp_regex_traits&lt;char&gt;::set_message_catalogue("mycatalogue");</p>
-
-<p>Note that calling basic_regex&lt;&gt;::imbue will invalidate any
-expression currently compiled in that instance of
-basic_regex&lt;&gt;. This model is the one which closest fits the
-ethos of the C++ standard library, however it is the model which
-will produce the slowest code, and which is the least well
-supported by current standard library implementations, for example
-I have yet to find an implementation of std::locale which supports
-either message catalogues, or locales other than "C" or
-"POSIX".</p>
-
-<p>Finally note that if you build the library with a non-default
-localization model, then the appropriate pre-processor symbol
-(BOOST_REGEX_USE_C_LOCALE or BOOST_REGEX_USE_CPP_LOCALE) must be
-defined both when you build the support library, and when you
-include &lt;boost/regex.hpp&gt; or &lt;boost/cregex.hpp&gt; in your
-code. The best way to ensure this is to add the #define to
-&lt;boost/regex/user.hpp&gt;.</p>
-
-<h3>Providing a message catalogue:</h3>
-
-<p>In order to localize the front end of the library, you need to
-provide the library with the appropriate message strings contained
-either in a resource dll's string table (Win32 model), or a POSIX
-message catalogue (C or C++ models). In the latter case the
-messages must appear in message set zero of the catalogue. The
-messages and their id's are as follows:<br>
- &nbsp;</p>
-
-<p></p>
-
-<table id="Table2" cellspacing="0" cellpadding="6" width="624"
-border="0">
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">Message id</td>
-<td valign="top" width="32%">Meaning</td>
-<td valign="top" width="29%">Default value</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">101</td>
-<td valign="top" width="32%">The character used to start a
-sub-expression.</td>
-<td valign="top" width="29%">"("</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">102</td>
-<td valign="top" width="32%">The character used to end a
-sub-expression declaration.</td>
-<td valign="top" width="29%">")"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">103</td>
-<td valign="top" width="32%">The character used to denote an end of
-line assertion.</td>
-<td valign="top" width="29%">"$"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">104</td>
-<td valign="top" width="32%">The character used to denote the start
-of line assertion.</td>
-<td valign="top" width="29%">"^"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">105</td>
-<td valign="top" width="32%">The character used to denote the
-"match any character expression".</td>
-<td valign="top" width="29%">"."</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">106</td>
-<td valign="top" width="32%">The match zero or more times
-repetition operator.</td>
-<td valign="top" width="29%">"*"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">107</td>
-<td valign="top" width="32%">The match one or more repetition
-operator.</td>
-<td valign="top" width="29%">"+"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">108</td>
-<td valign="top" width="32%">The match zero or one repetition
-operator.</td>
-<td valign="top" width="29%">"?"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">109</td>
-<td valign="top" width="32%">The character set opening
-character.</td>
-<td valign="top" width="29%">"["</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">110</td>
-<td valign="top" width="32%">The character set closing
-character.</td>
-<td valign="top" width="29%">"]"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">111</td>
-<td valign="top" width="32%">The alternation operator.</td>
-<td valign="top" width="29%">"|"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">112</td>
-<td valign="top" width="32%">The escape character.</td>
-<td valign="top" width="29%">"\\"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">113</td>
-<td valign="top" width="32%">The hash character (not currently
-used).</td>
-<td valign="top" width="29%">"#"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">114</td>
-<td valign="top" width="32%">The range operator.</td>
-<td valign="top" width="29%">"-"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">115</td>
-<td valign="top" width="32%">The repetition operator opening
-character.</td>
-<td valign="top" width="29%">"{"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">116</td>
-<td valign="top" width="32%">The repetition operator closing
-character.</td>
-<td valign="top" width="29%">"}"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">117</td>
-<td valign="top" width="32%">The digit characters.</td>
-<td valign="top" width="29%">"0123456789"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">118</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the word boundary assertion.</td>
-<td valign="top" width="29%">"b"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">119</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the non-word boundary
-assertion.</td>
-<td valign="top" width="29%">"B"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">120</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the word-start boundary
-assertion.</td>
-<td valign="top" width="29%">"&lt;"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">121</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the word-end boundary
-assertion.</td>
-<td valign="top" width="29%">"&gt;"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">122</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any word character.</td>
-<td valign="top" width="29%">"w"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">123</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents a non-word character.</td>
-<td valign="top" width="29%">"W"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">124</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents a start of buffer assertion.</td>
-<td valign="top" width="29%">"`A"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">125</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents an end of buffer assertion.</td>
-<td valign="top" width="29%">"'z"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">126</td>
-<td valign="top" width="32%">The newline character.</td>
-<td valign="top" width="29%">"\n"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">127</td>
-<td valign="top" width="32%">The comma separator.</td>
-<td valign="top" width="29%">","</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">128</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the bell character.</td>
-<td valign="top" width="29%">"a"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">129</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the form feed character.</td>
-<td valign="top" width="29%">"f"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">130</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the newline character.</td>
-<td valign="top" width="29%">"n"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">131</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the carriage return character.</td>
-<td valign="top" width="29%">"r"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">132</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the tab character.</td>
-<td valign="top" width="29%">"t"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">133</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the vertical tab character.</td>
-<td valign="top" width="29%">"v"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">134</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the start of a hexadecimal character
-constant.</td>
-<td valign="top" width="29%">"x"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">135</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the start of an ASCII escape
-character.</td>
-<td valign="top" width="29%">"c"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">136</td>
-<td valign="top" width="32%">The colon character.</td>
-<td valign="top" width="29%">":"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">137</td>
-<td valign="top" width="32%">The equals character.</td>
-<td valign="top" width="29%">"="</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">138</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the ASCII escape character.</td>
-<td valign="top" width="29%">"e"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">139</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any lower case character.</td>
-<td valign="top" width="29%">"l"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">140</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any non-lower case character.</td>
-<td valign="top" width="29%">"L"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">141</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any upper case character.</td>
-<td valign="top" width="29%">"u"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">142</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any non-upper case character.</td>
-<td valign="top" width="29%">"U"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">143</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any space character.</td>
-<td valign="top" width="29%">"s"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">144</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any non-space character.</td>
-<td valign="top" width="29%">"S"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">145</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any digit character.</td>
-<td valign="top" width="29%">"d"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">146</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any non-digit character.</td>
-<td valign="top" width="29%">"D"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">147</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the end quote operator.</td>
-<td valign="top" width="29%">"E"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">148</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the start quote operator.</td>
-<td valign="top" width="29%">"Q"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">149</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents a Unicode combining character
-sequence.</td>
-<td valign="top" width="29%">"X"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">150</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents any single character.</td>
-<td valign="top" width="29%">"C"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">151</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents end of buffer operator.</td>
-<td valign="top" width="29%">"Z"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="21%">152</td>
-<td valign="top" width="32%">The character which when preceded by
-an escape character represents the continuation assertion.</td>
-<td valign="top" width="29%">"G"</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td>&nbsp;</td>
-<td>153</td>
-<td>The character which when preceeded by (? indicates a zero width
-negated forward lookahead assert.</td>
-<td>!</td>
-<td>&nbsp;</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<p>Custom error messages are loaded as follows:&nbsp;</p>
-
-<p></p>
-
-<table id="Table3" cellspacing="0" cellpadding="7" width="624"
-border="0">
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">Message ID</td>
-<td valign="top" width="32%">Error message ID</td>
-<td valign="top" width="31%">Default string</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">201</td>
-<td valign="top" width="32%">REG_NOMATCH</td>
-<td valign="top" width="31%">"No match"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">202</td>
-<td valign="top" width="32%">REG_BADPAT</td>
-<td valign="top" width="31%">"Invalid regular expression"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">203</td>
-<td valign="top" width="32%">REG_ECOLLATE</td>
-<td valign="top" width="31%">"Invalid collation character"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">204</td>
-<td valign="top" width="32%">REG_ECTYPE</td>
-<td valign="top" width="31%">"Invalid character class name"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">205</td>
-<td valign="top" width="32%">REG_EESCAPE</td>
-<td valign="top" width="31%">"Trailing backslash"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">206</td>
-<td valign="top" width="32%">REG_ESUBREG</td>
-<td valign="top" width="31%">"Invalid back reference"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">207</td>
-<td valign="top" width="32%">REG_EBRACK</td>
-<td valign="top" width="31%">"Unmatched [ or [^"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">208</td>
-<td valign="top" width="32%">REG_EPAREN</td>
-<td valign="top" width="31%">"Unmatched ( or \\("</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">209</td>
-<td valign="top" width="32%">REG_EBRACE</td>
-<td valign="top" width="31%">"Unmatched \\{"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">210</td>
-<td valign="top" width="32%">REG_BADBR</td>
-<td valign="top" width="31%">"Invalid content of \\{\\}"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">211</td>
-<td valign="top" width="32%">REG_ERANGE</td>
-<td valign="top" width="31%">"Invalid range end"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">212</td>
-<td valign="top" width="32%">REG_ESPACE</td>
-<td valign="top" width="31%">"Memory exhausted"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">213</td>
-<td valign="top" width="32%">REG_BADRPT</td>
-<td valign="top" width="31%">"Invalid preceding regular
-expression"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">214</td>
-<td valign="top" width="32%">REG_EEND</td>
-<td valign="top" width="31%">"Premature end of regular
-expression"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">215</td>
-<td valign="top" width="32%">REG_ESIZE</td>
-<td valign="top" width="31%">"Regular expression too big"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">216</td>
-<td valign="top" width="32%">REG_ERPAREN</td>
-<td valign="top" width="31%">"Unmatched ) or \\)"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">217</td>
-<td valign="top" width="32%">REG_EMPTY</td>
-<td valign="top" width="31%">"Empty expression"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">218</td>
-<td valign="top" width="32%">REG_E_UNKNOWN</td>
-<td valign="top" width="31%">"Unknown error"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<p>Custom character class names are loaded as followed:&nbsp;</p>
-
-<p></p>
-
-<table id="Table4" cellspacing="0" cellpadding="7" width="624"
-border="0">
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">Message ID</td>
-<td valign="top" width="32%">Description</td>
-<td valign="top" width="31%">Equivalent default class name</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">300</td>
-<td valign="top" width="32%">The character class name for
-alphanumeric characters.</td>
-<td valign="top" width="31%">"alnum"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">301</td>
-<td valign="top" width="32%">The character class name for
-alphabetic characters.</td>
-<td valign="top" width="31%">"alpha"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">302</td>
-<td valign="top" width="32%">The character class name for control
-characters.</td>
-<td valign="top" width="31%">"cntrl"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">303</td>
-<td valign="top" width="32%">The character class name for digit
-characters.</td>
-<td valign="top" width="31%">"digit"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">304</td>
-<td valign="top" width="32%">The character class name for graphics
-characters.</td>
-<td valign="top" width="31%">"graph"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">305</td>
-<td valign="top" width="32%">The character class name for lower
-case characters.</td>
-<td valign="top" width="31%">"lower"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">306</td>
-<td valign="top" width="32%">The character class name for printable
-characters.</td>
-<td valign="top" width="31%">"print"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">307</td>
-<td valign="top" width="32%">The character class name for
-punctuation characters.</td>
-<td valign="top" width="31%">"punct"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">308</td>
-<td valign="top" width="32%">The character class name for space
-characters.</td>
-<td valign="top" width="31%">"space"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">309</td>
-<td valign="top" width="32%">The character class name for upper
-case characters.</td>
-<td valign="top" width="31%">"upper"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">310</td>
-<td valign="top" width="32%">The character class name for
-hexadecimal characters.</td>
-<td valign="top" width="31%">"xdigit"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">311</td>
-<td valign="top" width="32%">The character class name for blank
-characters.</td>
-<td valign="top" width="31%">"blank"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">312</td>
-<td valign="top" width="32%">The character class name for word
-characters.</td>
-<td valign="top" width="31%">"word"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="22%">313</td>
-<td valign="top" width="32%">The character class name for Unicode
-characters.</td>
-<td valign="top" width="31%">"unicode"</td>
-<td valign="top" width="7%">&nbsp;</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<p>Finally, custom collating element names are loaded starting from
-message id 400, and terminating when the first load thereafter
-fails. Each message looks something like: "tagname string" where
-<i>tagname</i> is the name used inside [[.tagname.]] and <i>
-string</i> is the actual text of the collating element. Note that
-the value of collating element [[.zero.]] is used for the
-conversion of strings to numbers - if you replace this with another
-value then that will be used for string parsing - for example use
-the Unicode character 0x0660 for [[.zero.]] if you want to use
-Unicode Arabic-Indic digits in your regular expressions in place of
-Latin digits.</p>
-
-<p>Note that the POSIX defined names for character classes and
-collating elements are always available - even if custom names are
-defined, in contrast, custom error messages, and custom syntax
-messages replace the default ones.</p>
-
-<p></p>
-
-<hr>
-      <p>Revised 
+   <head>
+      <title>Boost.Regex: Localisation</title>
+      <meta name="generator" content="HTML Tidy, see www.w3.org">
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+      <link rel="stylesheet" type="text/css" href="../../../boost.css">
+   </head>
+   <body>
+      <p></p>
+      <table id="Table1" cellspacing="1" cellpadding="1" width="100%" border="0">
+         <tr>
+            <td valign="top" width="300">
+               <h3><a href="../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
+            </td>
+            <td width="353">
+               <h1 align="center">Boost.Regex</h1>
+               <h2 align="center">Localisation</h2>
+            </td>
+            <td width="50">
+               <h3><a href="index.html"><img height="45" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
+            </td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <hr>
+      <p>Boost.regex&nbsp;provides extensive support for run-time localization, the 
+         localization model used can be split into two parts: front-end and back-end.</p>
+      <p>Front-end localization deals with everything which the user sees - error 
+         messages, and the regular expression syntax itself. For example a French 
+         application could change [[:word:]] to [[:mot:]] and \w to \m. Modifying the 
+         front end locale requires active support from the developer, by providing the 
+         library with a message catalogue to load, containing the localized strings. 
+         Front-end locale is affected by the LC_MESSAGES category only.</p>
+      <p>Back-end localization deals with everything that occurs after the expression 
+         has been parsed - in other words everything that the user does not see or 
+         interact with directly. It deals with case conversion, collation, and character 
+         class membership. The back-end locale does not require any intervention from 
+         the developer - the library will acquire all the information it requires for 
+         the current locale from the underlying operating system / run time library. 
+         This means that if the program user does not interact with regular expressions 
+         directly - for example if the expressions are embedded in your C++ code - then 
+         no explicit localization is required, as the library will take care of 
+         everything for you. For example embedding the expression [[:word:]]+ in your 
+         code will always match a whole word, if the program is run on a machine with, 
+         for example, a Greek locale, then it will still match a whole word, but in 
+         Greek characters rather than Latin ones. The back-end locale is affected by the 
+         LC_TYPE and LC_COLLATE categories.</p>
+      <p>There are three separate localization mechanisms supported by boost.regex:</p>
+      <h3>Win32 localization model.</h3>
+      <p>This is the default model when the library is compiled under Win32, and is 
+         encapsulated by the traits class w32_regex_traits. When this model is in effect 
+         each basic_regex object gets it's own LCID, by default this is the users 
+         default setting as returned by GetUserDefaultLCID, but you can call <EM>imbue</EM>
+         on the basic_regex object to set it's locale to some other LCID if you wish. 
+         All the settings used by boost.regex are acquired directly from the operating 
+         system bypassing the C run time library. Front-end localization requires a 
+         resource dll, containing a string table with the user-defined strings. The 
+         traits class exports the function:</p>
+      <p>static std::string set_message_catalogue(const std::string&amp; s);</p>
+      <p>which needs to be called with a string identifying the name of the resource 
+         dll, <i>before</i> your code compiles any regular expressions (but not 
+         necessarily before you construct any <i>basic_regex</i> instances):</p>
+      <p>
+         boost::w32_regex_traits&lt;char&gt;::set_message_catalogue("mydll.dll");</p>
+      <p>
+         The library provides full Unicode support under NT, under Windows 9x the 
+         library degrades gracefully - characters 0 to 255 are supported, the remainder 
+         are treated as "unknown" graphic characters.</p>
+      <h3>C localization model.</h3>
+      <p>This model has been deprecated in favor of the C++ localoe for all non-Windows 
+         compilers that support&nbsp;it.&nbsp; This locale is encapsulated by the traits 
+         class <i>c_regex_traits</i>, Win32 users can force this model to take effect by 
+         defining the pre-processor symbol BOOST_REGEX_USE_C_LOCALE. When this model is 
+         in effect there is a single global locale, as set by <i>setlocale</i>. All 
+         settings are acquired from your run time library, consequently Unicode support 
+         is dependent upon your run time library implementation.</p>
+      <P>Front end localization is not supported.</P>
+      <P>Note that calling <i>setlocale</i> invalidates all compiled regular 
+         expressions, calling <tt>setlocale(LC_ALL, "C")</tt> will make this library 
+         behave equivalent to most traditional regular expression libraries including 
+         version 1 of this library.</P>
+      <h3>C++ localization model.</h3>
+      <p>This model is the default for non-Windows compilers.</p>
+      <P>
+         When this model is in effect each instance of basic_regex&lt;&gt; has its own 
+         instance of std::locale, class basic_regex&lt;&gt; also has a member function <i>imbue</i>
+         which allows the locale for the expression to be set on a per-instance basis. 
+         Front end localization requires a POSIX message catalogue, which will be loaded 
+         via the std::messages facet of the expression's locale, the traits class 
+         exports the symbol:</P>
+      <p>static std::string set_message_catalogue(const std::string&amp; s);</p>
+      <p>which needs to be called with a string identifying the name of the message 
+         catalogue, <i>before</i> your code compiles any regular expressions (but not 
+         necessarily before you construct any <i>basic_regex</i> instances):</p>
+      <p>
+         boost::cpp_regex_traits&lt;char&gt;::set_message_catalogue("mycatalogue");</p>
+      <p>Note that calling basic_regex&lt;&gt;::imbue will invalidate any expression 
+         currently compiled in that instance of basic_regex&lt;&gt;.</p>
+      <P>Finally note that if you build the library with a non-default localization 
+         model, then the appropriate pre-processor symbol (BOOST_REGEX_USE_C_LOCALE or 
+         BOOST_REGEX_USE_CPP_LOCALE) must be defined both when you build the support 
+         library, and when you include &lt;boost/regex.hpp&gt; or 
+         &lt;boost/cregex.hpp&gt; in your code. The best way to ensure this is to add 
+         the #define to &lt;boost/regex/user.hpp&gt;.</P>
+      <h3>Providing a message catalogue:</h3>
+      <p>
+         In order to localize the front end of the library, you need to provide the 
+         library with the appropriate message strings contained either in a resource 
+         dll's string table (Win32 model), or a POSIX message catalogue (C++ models). In 
+         the latter case the messages must appear in message set zero of the catalogue. 
+         The messages and their id's are as follows:<br>
+         &nbsp;</p>
+      <p></p>
+      <table id="Table2" cellspacing="0" cellpadding="6" width="624" border="0">
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">Message id</td>
+            <td valign="top" width="32%">Meaning</td>
+            <td valign="top" width="29%">Default value</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">101</td>
+            <td valign="top" width="32%">The character used to start a sub-expression.</td>
+            <td valign="top" width="29%">"("</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">102</td>
+            <td valign="top" width="32%">The character used to end a sub-expression 
+               declaration.</td>
+            <td valign="top" width="29%">")"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">103</td>
+            <td valign="top" width="32%">The character used to denote an end of line 
+               assertion.</td>
+            <td valign="top" width="29%">"$"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">104</td>
+            <td valign="top" width="32%">The character used to denote the start of line 
+               assertion.</td>
+            <td valign="top" width="29%">"^"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">105</td>
+            <td valign="top" width="32%">The character used to denote the "match any character 
+               expression".</td>
+            <td valign="top" width="29%">"."</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">106</td>
+            <td valign="top" width="32%">The match zero or more times repetition operator.</td>
+            <td valign="top" width="29%">"*"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">107</td>
+            <td valign="top" width="32%">The match one or more repetition operator.</td>
+            <td valign="top" width="29%">"+"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">108</td>
+            <td valign="top" width="32%">The match zero or one repetition operator.</td>
+            <td valign="top" width="29%">"?"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">109</td>
+            <td valign="top" width="32%">The character set opening character.</td>
+            <td valign="top" width="29%">"["</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">110</td>
+            <td valign="top" width="32%">The character set closing character.</td>
+            <td valign="top" width="29%">"]"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">111</td>
+            <td valign="top" width="32%">The alternation operator.</td>
+            <td valign="top" width="29%">"|"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">112</td>
+            <td valign="top" width="32%">The escape character.</td>
+            <td valign="top" width="29%">"\\"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">113</td>
+            <td valign="top" width="32%">The hash character (not currently used).</td>
+            <td valign="top" width="29%">"#"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">114</td>
+            <td valign="top" width="32%">The range operator.</td>
+            <td valign="top" width="29%">"-"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">115</td>
+            <td valign="top" width="32%">The repetition operator opening character.</td>
+            <td valign="top" width="29%">"{"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">116</td>
+            <td valign="top" width="32%">The repetition operator closing character.</td>
+            <td valign="top" width="29%">"}"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">117</td>
+            <td valign="top" width="32%">The digit characters.</td>
+            <td valign="top" width="29%">"0123456789"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">118</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the word boundary assertion.</td>
+            <td valign="top" width="29%">"b"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">119</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the non-word boundary assertion.</td>
+            <td valign="top" width="29%">"B"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">120</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the word-start boundary assertion.</td>
+            <td valign="top" width="29%">"&lt;"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">121</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the word-end boundary assertion.</td>
+            <td valign="top" width="29%">"&gt;"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">122</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any word character.</td>
+            <td valign="top" width="29%">"w"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">123</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents a non-word character.</td>
+            <td valign="top" width="29%">"W"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">124</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents a start of buffer assertion.</td>
+            <td valign="top" width="29%">"`A"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">125</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents an end of buffer assertion.</td>
+            <td valign="top" width="29%">"'z"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">126</td>
+            <td valign="top" width="32%">The newline character.</td>
+            <td valign="top" width="29%">"\n"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">127</td>
+            <td valign="top" width="32%">The comma separator.</td>
+            <td valign="top" width="29%">","</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">128</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the bell character.</td>
+            <td valign="top" width="29%">"a"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">129</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the form feed character.</td>
+            <td valign="top" width="29%">"f"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">130</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the newline character.</td>
+            <td valign="top" width="29%">"n"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">131</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the carriage return character.</td>
+            <td valign="top" width="29%">"r"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">132</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the tab character.</td>
+            <td valign="top" width="29%">"t"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">133</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the vertical tab character.</td>
+            <td valign="top" width="29%">"v"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">134</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the start of a hexadecimal character constant.</td>
+            <td valign="top" width="29%">"x"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">135</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the start of an ASCII escape character.</td>
+            <td valign="top" width="29%">"c"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">136</td>
+            <td valign="top" width="32%">The colon character.</td>
+            <td valign="top" width="29%">":"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">137</td>
+            <td valign="top" width="32%">The equals character.</td>
+            <td valign="top" width="29%">"="</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">138</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the ASCII escape character.</td>
+            <td valign="top" width="29%">"e"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">139</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any lower case character.</td>
+            <td valign="top" width="29%">"l"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">140</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any non-lower case character.</td>
+            <td valign="top" width="29%">"L"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">141</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any upper case character.</td>
+            <td valign="top" width="29%">"u"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">142</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any non-upper case character.</td>
+            <td valign="top" width="29%">"U"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">143</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any space character.</td>
+            <td valign="top" width="29%">"s"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">144</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any non-space character.</td>
+            <td valign="top" width="29%">"S"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">145</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any digit character.</td>
+            <td valign="top" width="29%">"d"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">146</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any non-digit character.</td>
+            <td valign="top" width="29%">"D"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">147</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the end quote operator.</td>
+            <td valign="top" width="29%">"E"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">148</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the start quote operator.</td>
+            <td valign="top" width="29%">"Q"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">149</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents a Unicode combining character sequence.</td>
+            <td valign="top" width="29%">"X"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">150</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents any single character.</td>
+            <td valign="top" width="29%">"C"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">151</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents end of buffer operator.</td>
+            <td valign="top" width="29%">"Z"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="21%">152</td>
+            <td valign="top" width="32%">The character which when preceded by an escape 
+               character represents the continuation assertion.</td>
+            <td valign="top" width="29%">"G"</td>
+            <td valign="top" width="9%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td>&nbsp;</td>
+            <td>153</td>
+            <td>The character which when preceeded by (? indicates a zero width negated 
+               forward lookahead assert.</td>
+            <td>!</td>
+            <td>&nbsp;</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <p>Custom error messages are loaded as follows:&nbsp;</p>
+      <p></p>
+      <table id="Table3" cellspacing="0" cellpadding="7" width="624" border="0">
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">Message ID</td>
+            <td valign="top" width="32%">Error message ID</td>
+            <td valign="top" width="31%">Default string</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">201</td>
+            <td valign="top" width="32%">REG_NOMATCH</td>
+            <td valign="top" width="31%">"No match"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">202</td>
+            <td valign="top" width="32%">REG_BADPAT</td>
+            <td valign="top" width="31%">"Invalid regular expression"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">203</td>
+            <td valign="top" width="32%">REG_ECOLLATE</td>
+            <td valign="top" width="31%">"Invalid collation character"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">204</td>
+            <td valign="top" width="32%">REG_ECTYPE</td>
+            <td valign="top" width="31%">"Invalid character class name"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">205</td>
+            <td valign="top" width="32%">REG_EESCAPE</td>
+            <td valign="top" width="31%">"Trailing backslash"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">206</td>
+            <td valign="top" width="32%">REG_ESUBREG</td>
+            <td valign="top" width="31%">"Invalid back reference"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">207</td>
+            <td valign="top" width="32%">REG_EBRACK</td>
+            <td valign="top" width="31%">"Unmatched [ or [^"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">208</td>
+            <td valign="top" width="32%">REG_EPAREN</td>
+            <td valign="top" width="31%">"Unmatched ( or \\("</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">209</td>
+            <td valign="top" width="32%">REG_EBRACE</td>
+            <td valign="top" width="31%">"Unmatched \\{"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">210</td>
+            <td valign="top" width="32%">REG_BADBR</td>
+            <td valign="top" width="31%">"Invalid content of \\{\\}"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">211</td>
+            <td valign="top" width="32%">REG_ERANGE</td>
+            <td valign="top" width="31%">"Invalid range end"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">212</td>
+            <td valign="top" width="32%">REG_ESPACE</td>
+            <td valign="top" width="31%">"Memory exhausted"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">213</td>
+            <td valign="top" width="32%">REG_BADRPT</td>
+            <td valign="top" width="31%">"Invalid preceding regular expression"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">214</td>
+            <td valign="top" width="32%">REG_EEND</td>
+            <td valign="top" width="31%">"Premature end of regular expression"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">215</td>
+            <td valign="top" width="32%">REG_ESIZE</td>
+            <td valign="top" width="31%">"Regular expression too big"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">216</td>
+            <td valign="top" width="32%">REG_ERPAREN</td>
+            <td valign="top" width="31%">"Unmatched ) or \\)"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">217</td>
+            <td valign="top" width="32%">REG_EMPTY</td>
+            <td valign="top" width="31%">"Empty expression"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">218</td>
+            <td valign="top" width="32%">REG_E_UNKNOWN</td>
+            <td valign="top" width="31%">"Unknown error"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <p>Custom character class names are loaded as followed:&nbsp;</p>
+      <p></p>
+      <table id="Table4" cellspacing="0" cellpadding="7" width="624" border="0">
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">Message ID</td>
+            <td valign="top" width="32%">Description</td>
+            <td valign="top" width="31%">Equivalent default class name</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">300</td>
+            <td valign="top" width="32%">The character class name for alphanumeric characters.</td>
+            <td valign="top" width="31%">"alnum"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">301</td>
+            <td valign="top" width="32%">The character class name for alphabetic characters.</td>
+            <td valign="top" width="31%">"alpha"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">302</td>
+            <td valign="top" width="32%">The character class name for control characters.</td>
+            <td valign="top" width="31%">"cntrl"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">303</td>
+            <td valign="top" width="32%">The character class name for digit characters.</td>
+            <td valign="top" width="31%">"digit"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">304</td>
+            <td valign="top" width="32%">The character class name for graphics characters.</td>
+            <td valign="top" width="31%">"graph"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">305</td>
+            <td valign="top" width="32%">The character class name for lower case characters.</td>
+            <td valign="top" width="31%">"lower"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">306</td>
+            <td valign="top" width="32%">The character class name for printable characters.</td>
+            <td valign="top" width="31%">"print"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">307</td>
+            <td valign="top" width="32%">The character class name for punctuation characters.</td>
+            <td valign="top" width="31%">"punct"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">308</td>
+            <td valign="top" width="32%">The character class name for space characters.</td>
+            <td valign="top" width="31%">"space"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">309</td>
+            <td valign="top" width="32%">The character class name for upper case characters.</td>
+            <td valign="top" width="31%">"upper"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">310</td>
+            <td valign="top" width="32%">The character class name for hexadecimal characters.</td>
+            <td valign="top" width="31%">"xdigit"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">311</td>
+            <td valign="top" width="32%">The character class name for blank characters.</td>
+            <td valign="top" width="31%">"blank"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">312</td>
+            <td valign="top" width="32%">The character class name for word characters.</td>
+            <td valign="top" width="31%">"word"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+         <tr>
+            <td valign="top" width="8%">&nbsp;</td>
+            <td valign="top" width="22%">313</td>
+            <td valign="top" width="32%">The character class name for Unicode characters.</td>
+            <td valign="top" width="31%">"unicode"</td>
+            <td valign="top" width="7%">&nbsp;</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <p>Finally, custom collating element names are loaded starting from message id 
+         400, and terminating when the first load thereafter fails. Each message looks 
+         something like: "tagname string" where <i>tagname</i> is the name used inside 
+         [[.tagname.]] and <i>string</i> is the actual text of the collating element. 
+         Note that the value of collating element [[.zero.]] is used for the conversion 
+         of strings to numbers - if you replace this with another value then that will 
+         be used for string parsing - for example use the Unicode character 0x0660 for 
+         [[.zero.]] if you want to use Unicode Arabic-Indic digits in your regular 
+         expressions in place of Latin digits.</p>
+      <p>Note that the POSIX defined names for character classes and collating elements 
+         are always available - even if custom names are defined, in contrast, custom 
+         error messages, and custom syntax messages replace the default ones.</p>
+      <p></p>
+      <hr>
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         26 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-</body>
+   </body>
 </html>
-
-
diff --git a/doc/match_results.html b/doc/match_results.html
index 3350ec1c..1382f026 100644
--- a/doc/match_results.html
+++ b/doc/match_results.html
@@ -51,7 +51,7 @@
       <p>Class template match_results is most commonly used as one of the typedefs 
          cmatch, wcmatch, smatch, or wsmatch:</p>
       <pre>template &lt;class BidirectionalIterator,
-          class Allocator = allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
+          class Allocator = std::allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
 class match_results;
 
 typedef match_results&lt;const char*&gt; cmatch;
@@ -60,7 +60,7 @@ typedef match_results&lt;string::const_iterator&gt; smatch;
 typedef match_results&lt;wstring::const_iterator&gt; wsmatch;
 
 template &lt;class BidirectionalIterator,
-          class Allocator = allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
+          class Allocator = std::allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
 class match_results
 { 
 public: 
@@ -455,4 +455,3 @@ void swap(match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m1,
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
-
diff --git a/doc/redistributables.html b/doc/redistributables.html
index d93bdf9e..65d43b64 100644
--- a/doc/redistributables.html
+++ b/doc/redistributables.html
@@ -32,51 +32,22 @@
          your application, and not in the PC's directory path. Note that if you link to 
          a static version of your run time library, then you will also link to a static 
          version of boost.regex and no dll's will need to be distributed. The possible 
-         boost.regex dll and library names are computed according to the following 
-         formula:<BR>
+         boost.regex dll and library names are computed according to the <A href="../../../more/getting_started.html#step5">
+            formula given in the getting started guide</A>.
+      </P>
+      <P>Note: you can disable automatic library selection by defining the symbol 
+         BOOST_REGEX_NO_LIB when compiling, this is useful if you want to build 
+         Boost.Regex yourself in your IDE, or if you need to debug boost.regex.
       </P>
-      <P></P>
-      <P>BOOST_LIB_PREFIX<BR>
-         + "boost_regex_"<BR>
-         + BOOST_LIB_TOOLSET<BR>
-         + "_"<BR>
-         + BOOST_LIB_THREAD_OPT<BR>
-         + BOOST_LIB_RT_OPT<BR>
-         + BOOST_LIB_DEBUG_OPT<BR>
-         <BR>
-         These are defined as:</P>
-      <P>BOOST_LIB_PREFIX: Either "lib" if this is a static link library, 
-         or&nbsp;nothing for dynamic / shared&nbsp;libraries.<BR>
-         <BR>
-         BOOST_LIB_TOOLSET: The compiler toolset name (vc6, vc7, bcb5 etc).<BR>
-         <BR>
-         BOOST_LIB_THREAD_OPT: "s" for single thread builds,<BR>
-         "m" for multithread builds.<BR>
-         <BR>
-         BOOST_LIB_RT_OPT: "s" for static runtime,<BR>
-         "d" for dynamic runtime.<BR>
-         <BR>
-         BOOST_LIB_LINK_OPT: "s" for static link,<BR>
-         "i" for dynamic link.<BR>
-         <BR>
-         BOOST_LIB_DEBUG_OPT: nothing for release builds,<BR>
-         "d" for debug builds,<BR>
-         "dd" for debug-diagnostic builds (_STLP_DEBUG).</P>
-      <P>
-      Note: you can disable automatic library selection by defining the symbol 
-      BOOST_REGEX_NO_LIB when compiling, this is useful if you want to statically 
-      link even though you're using the dll version of your run time library, or if 
-      you need to debug boost.regex.
       <P>
          <HR>
       <P></P>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         28 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/regex_grep.html b/doc/regex_grep.html
index e2e4c355..0996aeb9 100644
--- a/doc/regex_grep.html
+++ b/doc/regex_grep.html
@@ -37,11 +37,11 @@
          locate all the (non-overlapping) matches with a given regular expression. The 
          function is declared as:</p>
       <pre>
-<b>template</b> &lt;<b>class</b> Predicate, <b>class</b> iterator, <b>class</b> charT, <b>class</b> traits, <b>class</b> Allocator&gt;
+<b>template</b> &lt;<b>class</b> Predicate, <b>class</b> iterator, <b>class</b> charT, <b>class</b> traits&gt;
 <b>unsigned</b> <b>int</b> regex_grep(Predicate foo,
                          iterator first,
                          iterator last,
-                         <b>const</b> basic_regex&lt;charT, traits, Allocator&gt;&amp; e,
+                         <b>const</b> basic_regex&lt;charT, traits&gt;&amp; e,
                          boost::match_flag_type flags = match_default)
 </pre>
       <p>The library also defines the following convenience versions, which take either 
@@ -49,16 +49,16 @@
          iterators [note - these versions may not be available, or may be available in a 
          more limited form, depending upon your compilers capabilities]:</p>
       <pre>
-<b>template</b> &lt;<b>class</b> Predicate, <b>class</b> charT, <b>class</b> Allocator, <b>class</b> traits&gt;
+<b>template</b> &lt;<b>class</b> Predicate, <b>class</b> charT, <b>class</b> traits&gt;
 <b>unsigned</b> <b>int</b> regex_grep(Predicate foo, 
               <b>const</b> charT* str, 
-              <b>const</b> basic_regex&lt;charT, traits, Allocator&gt;&amp; e, 
+              <b>const</b> basic_regex&lt;charT, traits&gt;&amp; e, 
               boost::match_flag_type flags = match_default);
 
-<b>template</b> &lt;<b>class</b> Predicate, <b>class</b> ST, <b>class</b> SA, <b>class</b> Allocator, <b>class</b> charT, <b>class</b> traits&gt;
+<b>template</b> &lt;<b>class</b> Predicate, <b>class</b> ST, <b>class</b> SA, <b>class</b> charT, <b>class</b> traits&gt;
 <b>unsigned</b> <b>int</b> regex_grep(Predicate foo, 
               <b>const</b> std::basic_string&lt;charT, ST, SA&gt;&amp; s, 
-              <b>const</b> basic_regex&lt;charT, traits, Allocator&gt;&amp; e, 
+              <b>const</b> basic_regex&lt;charT, traits&gt;&amp; e, 
               boost::match_flag_type flags = match_default);
 </pre>
       <p>The parameters for the primary version of regex_grep have the following 
@@ -101,23 +101,19 @@
       <br>
       <br>
       <p>The algorithm finds all of the non-overlapping matches of the expression e, for 
-         each match it fills a <a href="#reg_match">match_results</a>&lt;iterator, 
-         Allocator&gt; structure, which contains information on what matched, and calls 
-         the predicate foo, passing the match_results&lt;iterator, Allocator&gt; as a 
-         single argument. If the predicate returns true, then the grep operation 
-         continues, otherwise it terminates without searching for further matches. The 
-         function returns the number of matches found.</p>
+         each match it fills a <a href="#reg_match">match_results</a>&lt;iterator&gt; 
+         structure, which contains information on what matched, and calls the predicate 
+         foo, passing the match_results&lt;iterator&gt; as a single argument. If the 
+         predicate returns true, then the grep operation continues, otherwise it 
+         terminates without searching for further matches. The function returns the 
+         number of matches found.</p>
       <p>The general form of the predicate is:</p>
       <pre>
 <b>struct</b> grep_predicate
 {
- <b>  bool</b> <b>operator</b>()(<b>const</b> match_results&lt;iterator_type, typename expression_type::alloc_type::template rebind&lt;sub_match&lt;BidirectionalIterator&gt; &gt;::other&gt;&amp; m);
+ <b>  bool</b> <b>operator</b>()(<b>const</b> match_results&lt;iterator_type&gt;&amp; m);
 };
 </pre>
-      <p>Note that in almost every case the allocator parameter can be omitted, when 
-         specifying the <a href="match_results.html">match_results</a> type, 
-         alternatively one of the typedefs cmatch, wcmatch, smatch or wsmatch can be 
-         used.</p>
       <p>For example the regular expression "a*b" would find one match in the string 
          "aaaaab" and two in the string "aaabb".</p>
       <p>Remember this algorithm can be used for a lot more than implementing a version 
@@ -370,7 +366,7 @@ index[std::string(what[5].first, what[5].second) + std::string(what[6].first, wh
       <hr>
       <p>Revised 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         04 Feb 2004 
+         26 June 2004 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
             <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
diff --git a/doc/regex_iterator.html b/doc/regex_iterator.html
index 7e77f6b7..f5b88ed1 100644
--- a/doc/regex_iterator.html
+++ b/doc/regex_iterator.html
@@ -37,12 +37,11 @@
       <pre>
 template &lt;class BidirectionalIterator, 
           class charT = iterator_traits&lt;BidirectionalIterator&gt;::value_type,
-          class traits = regex_traits&lt;charT&gt;,
-          class Allocator = allocator&lt;charT&gt; &gt;
+          class traits = regex_traits&lt;charT&gt; &gt;
 class regex_iterator 
 {
 public:
-   typedef          <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator&gt;                   regex_type;
+   typedef          <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;                              regex_type;
    typedef          <A href="match_results.html">match_results</A>&lt;BidirectionalIterator&gt;                    value_type;
    typedef typename iterator_traits&lt;BidirectionalIterator&gt;::difference_type difference_type;
    typedef          const value_type*                                       pointer;
@@ -419,9 +418,9 @@ color=
 }
 </pre>
       <hr>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         26 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
             <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
diff --git a/doc/regex_match.html b/doc/regex_match.html
index fd8e5bd7..3d65d8cc 100644
--- a/doc/regex_match.html
+++ b/doc/regex_match.html
@@ -42,46 +42,44 @@
          If you want to match a prefix of the character string then use <A href="regex_search.html">
             regex_search</A> with the flag <A href="match_flag_type.html">match_continuous</A>
          set.
-         <PRE>template &lt;class BidirectionalIterator, class Allocator, class charT,
-          class traits, class Allocator2&gt;
+         <PRE>
+template &lt;class BidirectionalIterator, class Allocator, class charT, class traits&gt;
 bool <A href="#f1">regex_match</A>(BidirectionalIterator first, BidirectionalIterator last,
                  <A href="match_results.html">match_results</A>&lt;BidirectionalIterator, Allocator&gt;&amp; m,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
-                 
-template &lt;class BidirectionalIterator, class charT, class traits, class Allocator2&gt;
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
+                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
+
+template &lt;class BidirectionalIterator, class charT, class traits&gt;
 bool <A href="#f2">regex_match</A>(BidirectionalIterator first, BidirectionalIterator last,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
-                 
-template &lt;class charT, class Allocator, class traits, class Allocator2&gt;
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
+                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
+
+template &lt;class charT, class Allocator, class traits&gt;
 bool <A href="#f3">regex_match</A>(const charT* str, <A href="match_results.html">match_results</A>&lt;const charT*, Allocator&gt;&amp; m,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
-                 
-template &lt;class ST, class SA, class Allocator, class charT,
-          class traits, class Allocator2&gt;
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
+                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
+
+template &lt;class ST, class SA, class Allocator, class charT, class traits&gt;
 bool <A href="#f4">regex_match</A>(const basic_string&lt;charT, ST, SA&gt;&amp; s,
                  <A href="match_results.html">match_results</A>&lt;typename basic_string&lt;charT, ST, SA&gt;::const_iterator, Allocator&gt;&amp; m, 
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e, 
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
-                 
-template &lt;class charT, class traits, class Allocator2&gt;
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e, 
+                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
+
+template &lt;class charT, class traits&gt;
 bool <A href="#f5">regex_match</A>(const charT* str,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
-                 
-template &lt;class ST, class SA, class charT, class traits, class Allocator2&gt;
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
+                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default); 
+
+template &lt;class ST, class SA, class charT, class traits&gt;
 bool <A href="#f6">regex_match</A>(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
                  <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
 </PRE>
          <H3><A name="description"></A>Description</H3>
-         <PRE><A name=f1></A>template &lt;class BidirectionalIterator, class Allocator, class charT,
-          class traits, class Allocator2&gt;
+         <PRE><A name=f1></A>template &lt;class BidirectionalIterator, class Allocator, class charT, class traits&gt;
 bool regex_match(BidirectionalIterator first, BidirectionalIterator last,
                  <A href="match_results.html">match_results</A>&lt;BidirectionalIterator, Allocator&gt;&amp; m,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
                  <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
       <P><B> Requires:</B> Type BidirectionalIterator meets the requirements of a 
          Bidirectional Iterator (24.1.4).</P>
@@ -237,36 +235,36 @@ bool regex_match(BidirectionalIterator first, BidirectionalIterator last,
       <P></P>
       <DIV></DIV>
       <PRE>&nbsp;</PRE>
-      <PRE><A name=f2></A>template &lt;class BidirectionalIterator, class charT, class traits, class Allocator2&gt;
+      <PRE><A name=f2></A>template &lt;class BidirectionalIterator, class charT, class traits&gt;
 bool regex_match(BidirectionalIterator first, BidirectionalIterator last,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
                  <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
       <P><B> Effects:</B> Behaves "as if" by constructing an instance of <CODE><A href="match_results.html">
                match_results</A>&lt;</CODE>BidirectionalIterator<CODE>&gt; what</CODE>, 
          and then returning the result of <CODE>regex_match(first, last, what, e, flags)</CODE>.</P>
-      <PRE><A name=f3></A>template &lt;class charT, class Allocator, class traits, class Allocator2&gt;
+      <PRE><A name=f3></A>template &lt;class charT, class Allocator, class traits&gt;
 bool regex_match(const charT* str, <A href="match_results.html">match_results</A>&lt;const charT*, Allocator&gt;&amp; m,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
                  <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
       <P><B> Effects:</B> Returns the result of <CODE>regex_match(str, str + 
             char_traits&lt;charT&gt;::length(str), m, e, flags)</CODE>.</P>
-      <PRE><A name=f4></A>template &lt;class ST, class SA, class Allocator, class charT,
-          class traits, class Allocator2&gt;
+      <PRE><A name=f4></A>template &lt;class ST, class SA, class Allocator,
+          class charT, class traits&gt;
 bool regex_match(const basic_string&lt;charT, ST, SA&gt;&amp; s,
                  <A href="match_results.html">match_results</A>&lt;typename basic_string&lt;charT, ST, SA&gt;::const_iterator, Allocator&gt;&amp; m, 
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e, 
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e, 
                  <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
       <P><B> Effects:</B> Returns the result of <CODE>regex_match(s.begin(), s.end(), m, e, 
             flags)</CODE>.</P>
-      <PRE><A name=f5></A>template &lt;class charT, class traits, class Allocator2&gt;
+      <PRE><A name=f5></A>template &lt;class charT, class traits&gt;
 bool regex_match(const charT* str,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
                  <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
       <P><B> Effects:</B> Returns the result of <CODE>regex_match(str, str + 
             char_traits&lt;charT&gt;::length(str), e, flags)</CODE>.</P>
-      <PRE><A name=f6></A>template &lt;class ST, class SA, class charT, class traits, class Allocator2&gt;
+      <PRE><A name=f6></A>template &lt;class ST, class SA, class charT, class traits&gt;
 bool regex_match(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                 const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator2&gt;&amp; e,
+                 const <A href="basic_regex.html">basic_regex</A> &lt;charT, traits&gt;&amp; e,
                  <A href="match_flag_type.html">match_flag_type</A> flags = match_default);</PRE>
       <P><B> Effects:</B> Returns the result of <CODE>regex_match(s.begin(), s.end(), e, 
             flags)</CODE>.
@@ -307,13 +305,12 @@ regex expression(<FONT color=#000080>"([0-9]+)(\\-| |$)(.*)"</FONT>);
       <P>
          <HR></PRE>
       <P></P>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         26 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/regex_replace.html b/doc/regex_replace.html
index 1f2fc6f6..1cdf1d9b 100644
--- a/doc/regex_replace.html
+++ b/doc/regex_replace.html
@@ -35,29 +35,27 @@
          unchanged only if the <EM>flags</EM> parameter does not have the flag <A href="match_flag_type.html">
             format_no_copy</A> set. If the flag <A href="match_flag_type.html">format_first_only</A>
          is set then only the first occurrence is replaced rather than all 
-         occurrences.&nbsp;<PRE>template &lt;class OutputIterator, class BidirectionalIterator, class traits,
-          class Allocator, class charT&gt;
+         occurrences.&nbsp;<PRE>template &lt;class OutputIterator, class BidirectionalIterator, class traits, class charT&gt;
 OutputIterator <A href="#f1">regex_replace</A>(OutputIterator out,
                            BidirectionalIterator first,
                            BidirectionalIterator last,
-                           const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator&gt;&amp; e,
+                           const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;&amp; e,
                            const basic_string&lt;charT&gt;&amp; fmt,
                            <A href="match_flag_type.html">match_flag_type flags = match_default</A>);
 
-template &lt;class traits, class Allocator, class charT&gt;
+template &lt;class traits, class charT&gt;
 basic_string&lt;charT&gt; <A href="#f2">regex_replace</A>(const basic_string&lt;charT&gt;&amp; s,
-                            const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator&gt;&amp; e,
+                            const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;&amp; e,
                             const basic_string&lt;charT&gt;&amp; fmt,
                             <A href="match_flag_type.html">match_flag_type flags = match_default</A>);
 
 </PRE>
          <H3><A name="description"></A>Description</H3>
-         <PRE><A name=f1></A>template &lt;class OutputIterator, class BidirectionalIterator, class traits,
-          class Allocator, class charT&gt;
+         <PRE><A name=f1></A>template &lt;class OutputIterator, class BidirectionalIterator, class traits, class charT&gt;
 OutputIterator regex_replace(OutputIterator out,
                            BidirectionalIterator first,
                            BidirectionalIterator last,
-                           const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator&gt;&amp; e,
+                           const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;&amp; e,
                            const basic_string&lt;charT&gt;&amp; fmt,
                            <A href="match_flag_type.html">match_flag_type flags = match_default</A>);</PRE>
       <P>Enumerates all the occurences of expression <EM>e</EM> in the sequence [first, 
@@ -126,9 +124,9 @@ OutputIterator regex_replace(OutputIterator out,
             configured</A> in non-recursive mode).</P>
       <P><B> Returns:</B> <CODE>out</CODE>.
       </P>
-      <PRE><A name=f2></A>template &lt;class traits, class Allocator, class charT&gt;
+      <PRE><A name=f2></A>template &lt;class traits, class charT&gt;
 basic_string&lt;charT&gt; regex_replace(const basic_string&lt;charT&gt;&amp; s,
-                            const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator&gt;&amp; e,
+                            const <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;&amp; e,
                             const basic_string&lt;charT&gt;&amp; fmt,
                             <A href="match_flag_type.html">match_flag_type flags = match_default</A>);</PRE>
       <P><B> Effects:</B> Constructs an object <CODE>basic_string&lt;charT&gt; result</CODE>, 
@@ -245,13 +243,12 @@ boost::regex e1, e2;
 <B>const</B> <B>char</B>* footer_text = <FONT color=#0000ff>"&lt;/PRE&gt;\n&lt;/BODY&gt;\n\n"</FONT>;
       </PRE>
       <HR>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         26 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/regex_search.html b/doc/regex_search.html
index f0e8f6a3..53a0f1bc 100644
--- a/doc/regex_search.html
+++ b/doc/regex_search.html
@@ -35,55 +35,47 @@
          match could conceivably start at that position. The algorithm is defined as 
          follows:
          <PRE>template &lt;class BidirectionalIterator, 
-          class Allocator, class charT,
-          class traits, class Allocator2&gt;
+          class Allocator, class charT, class traits&gt;
 bool <A href="#f1">regex_search</A>(BidirectionalIterator first, BidirectionalIterator last,
                   <a href="match_results.html">match_results</a>&lt;BidirectionalIterator, Allocator&gt;&amp; m,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator2&gt;&amp; e,
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default);
                   
 template &lt;class ST, class SA, 
-          class Allocator, class charT,
-          class traits, class Allocator2&gt; 
+          class Allocator, class charT, class traits&gt; 
 bool <A href="#f2">regex_search</A>(const basic_string&lt;charT, ST, SA&gt;&amp; s, 
                   <a href="match_results.html">match_results</a>&lt;
                       typename basic_string&lt;charT, ST,SA&gt;::const_iterator, 
                       Allocator&gt;&amp; m, 
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator2&gt;&amp; e, 
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e, 
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default); 
           
-template&lt;class charT, class Allocator, class traits, 
-         class Allocator2&gt; 
+template&lt;class charT, class Allocator, class traits&gt; 
 bool <A href="#f3">regex_search</A>(const charT* str, 
                   <a href="match_results.html">match_results</a>&lt;const charT*, Allocator&gt;&amp; m, 
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator2&gt;&amp; e,
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default);
                   
-template &lt;class BidirectionalIterator, class Allocator,
-          class charT, class traits&gt;                
+template &lt;class BidirectionalIterator, class charT, class traits&gt;                
 bool <A href="#f4">regex_search</A>(BidirectionalIterator first, BidirectionalIterator last, 
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator&gt;&amp; e, 
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e, 
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default); 
                   
-template &lt;class charT, class Allocator, 
-          class traits&gt; 
+template &lt;class charT, class traits&gt; 
 bool <A href="#f5">regex_search</A>(const charT* str, 
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator&gt;&amp; e, 
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e, 
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default); 
                   
-template&lt;class ST, class SA,
-         class Allocator, class charT, 
-         class traits&gt;
+template&lt;class ST, class SA, class charT, class traits&gt;
 bool <A href="#f6">regex_search</A>(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator&gt;&amp; e,
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default);
 </PRE>
          <H3><A name="description"></A>Description</H3>
-         <PRE><A name=f1></A>template &lt;class BidirectionalIterator, class Allocator, class charT,
-          class traits, class Allocator2&gt;
+         <PRE><A name=f1></A>template &lt;class BidirectionalIterator, class Allocator, class charT, class traits&gt;
 bool regex_search(BidirectionalIterator first, BidirectionalIterator last,
                   <a href="match_results.html">match_results</a>&lt;BidirectionalIterator, Allocator&gt;&amp; m,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator2&gt;&amp; e,
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
       <P><B> Requires:</B> Type BidirectionalIterator meets the requirements of a 
          Bidirectional Iterator (24.1.4).</P>
@@ -234,38 +226,36 @@ bool regex_search(BidirectionalIterator first, BidirectionalIterator last,
                </TD></TR></TABLE>
          </CENTER>
       </DIV>
-      <PRE><A name=f2></A>template &lt;class charT, class Allocator, class traits, class Allocator2&gt;
+      <PRE><A name=f2></A>template &lt;class charT, class Allocator, class traits&gt;
 bool regex_search(const charT* str, <a href="match_results.html">match_results</a>&lt;const charT*, Allocator&gt;&amp; m,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator2&gt;&amp; e,
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
       <P><B> Effects:</B> Returns the result of <CODE>regex_search(str, str + 
             char_traits&lt;charT&gt;::length(str), m, e, flags)</CODE>.</P>
       <PRE><A name=f3></A>template &lt;class ST, class SA, class Allocator, class charT,
-          class traits, class Allocator2&gt;
+          class traits&gt;
 bool regex_search(const basic_string&lt;charT, ST, SA&gt;&amp; s,
                   <a href="match_results.html">match_results</a>&lt;typename basic_string&lt;charT, ST, SA&gt;::const_iterator, Allocator&gt;&amp; m,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator2&gt;&amp; e,
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
       <P><B> Effects:</B> Returns the result of <CODE>regex_search(s.begin(), s.end(), m, 
             e, flags)</CODE>.</P>
-      <PRE><A name=f4></A>template &lt;class iterator, class Allocator, class charT,
-          class traits&gt;
+      <PRE><A name=f4></A>template &lt;class iterator, class charT, class traits&gt;
 bool regex_search(iterator first, iterator last,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator&gt;&amp; e,
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
       <P><B> Effects:</B> Behaves "as if" by constructing an instance of <CODE><a href="match_results.html">
                match_results</a>&lt;</CODE>BidirectionalIterator<CODE>&gt; what</CODE>, 
          and then returning the result of <CODE>regex_search(first, last, what, e, flags)</CODE>.</P>
-      <PRE><A name=f5></A>template &lt;class charT, class Allocator, class traits&gt;
+      <PRE><A name=f5></A>template &lt;class charT, class traits&gt;
 bool regex_search(const charT* str
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator&gt;&amp; e,
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
       <P><B> Effects:</B> Returns the result of <CODE>regex_search(str, str + 
             char_traits&lt;charT&gt;::length(str), e, flags)</CODE>.</P>
-      <PRE><A name=f6></A>template &lt;class ST, class SA, class Allocator, class charT,
-          class traits&gt;
+      <PRE><A name=f6></A>template &lt;class ST, class SA, class charT, class traits&gt;
 bool regex_search(const basic_string&lt;charT, ST, SA&gt;&amp; s,
-                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits, Allocator&gt;&amp; e,
+                  const <a href="basic_regex.html">basic_regex</a>&lt;charT, traits&gt;&amp; e,
                   <a href="match_flag_type.html">match_flag_type</a> flags = match_default);</PRE>
       <P><B> Effects:</B> Returns the result of <CODE>regex_search(s.begin(), s.end(), e, 
             flags)</CODE>.
@@ -314,7 +304,7 @@ void</B> IndexClasses(map_type&amp; m, <B>const</B> std::string&amp; file)
       <HR>
       <p>Revised 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         04 Feb 2004 
+         23 June 2004 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
             <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
diff --git a/doc/regex_split.html b/doc/regex_split.html
index 3b2ed99e..45be346e 100644
--- a/doc/regex_split.html
+++ b/doc/regex_split.html
@@ -35,17 +35,17 @@
       <P>Algorithm regex_split performs a similar operation to the perl split operation, 
          and comes in three overloaded forms:
       </P>
-      <PRE><B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1, <B>class</B> Traits2, <B>class</B> Alloc2&gt;
+      <PRE><B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1, <B>class</B> Traits2&gt;
 std::size_t regex_split(OutputIterator out,&nbsp;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; std::basic_string&lt;charT, Traits1, Alloc1&gt;&amp; s,&nbsp;
-&nbsp;<B> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2, Alloc2&gt;&amp; e,
+&nbsp;<B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2&gt;&amp; e,
 &nbsp;<STRONG>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</STRONG>boost::match_flag_type flags,
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; std::size_t max_split);
 
-<B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1, <B>class</B> Traits2, <B>class</B> Alloc2&gt;
+<B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1, <B>class</B> Traits2&gt;
 std::size_t regex_split(OutputIterator out,&nbsp;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; std::basic_string&lt;charT, Traits1, Alloc1&gt;&amp; s,&nbsp;
-&nbsp;<B> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2, Alloc2&gt;&amp; e,
+&nbsp;<B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2&gt;&amp; e,
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; boost::match_flag_type flags = match_default);
 
 <B>template</B> &lt;<B>class</B> OutputIterator, <B>class</B> charT, <B>class</B> Traits1, <B>class</B> Alloc1&gt;
@@ -132,9 +132,9 @@ boost::regex e(<FONT color=#000080>"&lt;\\s*A\\s+[^&gt;]*href\\s*=\\s*\"([^\"]*)
    <B>return</B> 0;
 }</PRE>
       <HR>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         04 Feb 2004 
+         26 June&nbsp;2004 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
             <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
diff --git a/doc/regex_token_iterator.html b/doc/regex_token_iterator.html
index ef06779c..2e504189 100644
--- a/doc/regex_token_iterator.html
+++ b/doc/regex_token_iterator.html
@@ -41,14 +41,12 @@
       <PRE>
 template &lt;class BidirectionalIterator, 
           class charT = iterator_traits&lt;BidirectionalIterator&gt;::value_type,
-          class traits = regex_traits&lt;charT&gt;,
-          class Allocator = allocator&lt;charT&gt; &gt;
+          class traits = regex_traits&lt;charT&gt; &gt;
 class regex_token_iterator 
 {
 public:
-   typedef          <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator&gt;                   regex_type;
-   typedef          <A href="sub_match.html">sub_match</A>                     
-             &lt;BidirectionalIterator&gt;                                     value_type;
+   typedef          <A href="basic_regex.html">basic_regex</A>&lt;charT, traits&gt;                              regex_type;
+   typedef          <A href="sub_match.html">sub_match</A>&lt;BidirectionalIterator&gt;                        value_type;
    typedef typename iterator_traits&lt;BidirectionalIterator&gt;::difference_type difference_type;
    typedef          const value_type*                                       pointer;
    typedef          const value_type&amp;                                       reference;
@@ -280,12 +278,12 @@ boost::regex e(<FONT color=#0000ff>"&lt;\\s*A\\s+[^&gt;]*href\\s*=\\s*\"([^\"]*)
 }
 </pre>
       <HR>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         26 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/regex_traits.html b/doc/regex_traits.html
index a95dc662..9b2a8c4d 100644
--- a/doc/regex_traits.html
+++ b/doc/regex_traits.html
@@ -23,22 +23,63 @@
          </TABLE>
       </P>
       <HR>
-      <p></p>
-      <P>
-         Under construction: the current design will be replaced by that specified in 
-         the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">regular 
-            expression standardization proposal</A>, the current (obsolete) design has 
-         it's <A href="http://cvs.sourceforge.net/viewcvs.py/*checkout*/boost/boost/libs/regex/Attic/traits_class_ref.htm?rev=1.11">
-            documentation archived online</A>.</P>
-      <P>
-         <HR>
+      <H3>Contents</H3>
+      <dl class="index">
+         <dt><A href="#synopsis">Synopsis</A> <dt><a href="#description">Description</a></dt>
+      </dl>
+      <H3><A name="synopsis"></A>Synopsis</H3>
+      <pre>
+namespace boost{
+
+template &lt;class charT, class implementationT = sensible_default_choice&gt;
+struct regex_traits : public implementationT
+{
+   regex_traits() : implementationT() {}
+};
+
+template &lt;class charT&gt;
+struct c_regex_traits;
+
+template &lt;class charT&gt;
+struct cpp_regex_traits;
+
+template &lt;class charT&gt;
+struct w32_regex_traits;
+
+} // namespace boost
+</pre>
+      <H3><A name="description"></A>Description</H3>
+      <P>The class regex_traits is just a thin wrapper around an actual implemention 
+         class, which may be one of:</P>
+      <UL>
+         <LI>
+            c_regex_traits: this class is deprecated, it wraps the C locale, and is used as 
+            the default implementation when the platform is not Win32, and the C++ locale 
+            is not available.</LI>
+         <LI>
+            cpp_regex_traits: the default traits class for non-Win32 platforms, allows the 
+            regex class to be imbued with a std::locale instance.</LI>
+         <LI>
+            w32_regex_traits: the default traits class implementation on Win32 platforms, 
+            allows the regex class to be imbued with an LCID.</LI></UL>
+      <P>The default behavior can be altered by defining one of the following 
+         configuration macros in <A href="../../../boost/regex/user.hpp">boost/regex/user.hpp</A>:</P>
+      <UL>
+         <LI>
+            BOOST_REGEX_USE_C_LOCALE: makes c_regex_traits the default.</LI>
+         <LI>
+            BOOST_REGEX_USE_CPP_LOCALE: makes cpp_regex_traits the default.</LI></UL>
+      <P>All these traits classes fulfil the <A href="concepts.html#traits">traits class 
+            requirements</A>.</P>
+      <HR>
       <P></P>
       <p>Revised 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         24&nbsp;June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->
+            2004</i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/standards.html b/doc/standards.html
index a3e1d9cb..eef33b26 100644
--- a/doc/standards.html
+++ b/doc/standards.html
@@ -27,8 +27,7 @@
       <P>Boost.regex is intended to conform to the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">
             regular expression standardization proposal</A>, which will appear in a 
          future C++ standard technical report (and hopefully in a future version of the 
-         standard).&nbsp; Currently there are some differences in how the regular 
-         expression traits classes are defined, these will be fixed in a future release.</P>
+         standard).&nbsp;</P>
       <H3>ECMAScript / JavaScript</H3>
       <P>All of the ECMAScript regular expression syntax features are supported, except 
          that:</P>
@@ -39,16 +38,26 @@
          Unicode escape sequences.</P>
       <H3>Perl</H3>
       <P>Almost all Perl features are supported, except for:</P>
-      <P>\N{name}&nbsp; Use [[:name:]] instead.</P>
-      <P>\pP and \PP</P>
-      <P>(?imsx-imsx)</P>
-      <P>(?&lt;=pattern)</P>
-      <P>(?&lt;!pattern)</P>
-      <P>(?{code})</P>
-      <P>(??{code})</P>
-      <P>(?(condition)yes-pattern) and (?(condition)yes-pattern|no-pattern)</P>
-      <P>These embarrassments / limitations will be removed in due course, mainly 
-         dependent upon user demand.</P>
+      <P>
+         <TABLE id="Table2" cellSpacing="1" cellPadding="1" width="100%" border="0">
+            <TR>
+               <TD>\N{name}</TD>
+               <TD>Use [[.name.]] instead.</TD>
+            </TR>
+            <TR>
+               <TD>\pP and \PP</TD>
+               <TD>Use [[:P:]] instead.</TD>
+            </TR>
+            <TR>
+               <TD>(?{code})</TD>
+               <TD>Not implementable in a compiled strongly typed language.</TD>
+            </TR>
+            <TR>
+               <TD>(??{code})</TD>
+               <TD>Not implementable in a compiled strongly typed language.</TD>
+            </TR>
+         </TABLE>
+      </P>
       <H3>POSIX</H3>
       <P>All the POSIX basic and extended regular expression features are supported, 
          except that:</P>
@@ -60,18 +69,15 @@
          string sort keys produced by the system; if you need this, and the default 
          implementation doesn't work on your platform, then you will need to supply a 
          custom traits class.</P>
-         <HR>
-      <p>Revised 
+      <HR>
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         28 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
-
-
diff --git a/doc/syntax_option_type.html b/doc/syntax_option_type.html
index 984105b1..6da58afc 100644
--- a/doc/syntax_option_type.html
+++ b/doc/syntax_option_type.html
@@ -23,40 +23,49 @@
          </TABLE>
       </P>
       <HR>
-      <H3>Synopsis</H3>
+      <H3>Contents</H3>
+      <dl class="index">
+         <dt><a href="#synopsis">Synopsis</a> <dt><a href="#description">Description</a>
+               <dd>
+                  <dl class="index">
+                     <dt><a href="#perl">Options for Perl Regular Expressions</a> <dt><a href="#extended">Options 
+                              for POSIX Extended Regular Expressions</a> <dt><a href="#basic">Options for POSIX 
+                                 Basic Regular Expressions</a> <dt><a href="#literals">Options for String Literals</a></dt>
+                  </dl>
+               </dd>
+      </dl>
+      <H3><A name="synopsis"></A>Synopsis</H3>
       <P>Type syntax_option type is an implementation specific bitmask type that 
          controls how a regular expression string is to be interpreted.&nbsp; For 
          convenience note that all the constants listed here, are also duplicated within 
          the scope of class template <A href="basic_regex.html">basic_regex</A>.</P>
       <PRE>namespace std{ namespace regex_constants{
 
-typedef <EM>implementation-specific-bitmask-type</EM>   
-
-  syntax_option_type;
+typedef <EM>implementation-specific-bitmask-type</EM> syntax_option_type;<BR>
 // these flags are standardized:
 static const syntax_option_type normal;
-static const syntax_option_type icase;
-static const syntax_option_type nosubs;
-static const syntax_option_type optimize;
-static const syntax_option_type collate;
 static const syntax_option_type ECMAScript = normal;
 static const syntax_option_type JavaScript = normal;
 static const syntax_option_type JScript = normal;
-static const syntax_option_type basic;
+static const syntax_option_type perl = normal;<BR>static const syntax_option_type basic;
+static const syntax_option_type sed = basic;
 static const syntax_option_type extended;
 static const syntax_option_type awk;
 static const syntax_option_type grep;
 static const syntax_option_type egrep;
-static const syntax_option_type sed = basic;
-static const syntax_option_type perl;<BR>// these are boost.regex specific:<BR>static const syntax_option_type escape_in_lists;<BR>static const syntax_option_type char_classes;<BR>static const syntax_option_type intervals;<BR>static const syntax_option_type limited_ops;<BR>static const syntax_option_type newline_alt;<BR>static const syntax_option_type bk_plus_qm;<BR>static const syntax_option_type bk_braces;<BR>static const syntax_option_type bk_parens;<BR>static const syntax_option_type bk_refs;<BR>static const syntax_option_type bk_vbar;<BR>static const syntax_option_type use_except;<BR>static const syntax_option_type failbit;<BR>static const syntax_option_type literal;<BR>static const syntax_option_type nocollate;<BR>static const syntax_option_type perlex;<BR>static const syntax_option_type emacs;<BR>
+static const syntax_option_type icase;
+static const syntax_option_type nosubs;
+static const syntax_option_type optimize;
+static const syntax_option_type collate;
+// other boost.regex specific options are listed below<BR>
 } // namespace regex_constants
 } // namespace std</PRE>
-      <H3>Description</H3>
+      <H3><A name="description"></A>Description</H3>
       <P>The type <CODE>syntax_option_type</CODE> is an implementation specific bitmask 
          type (17.3.2.1.2). Setting its elements has the effects listed in the table 
          below, a valid value of type <CODE>syntax_option_type</CODE> will always have 
-         exactly one of the elements <CODE>normal, basic, extended, awk, grep, egrep, sed 
-            or perl</CODE> set.</P>
+         exactly one of the elements <CODE>normal, basic, extended, awk, grep, egrep, sed, 
+            literal&nbsp;or perl</CODE> set.</P>
       <P>Note that for convenience all the constants listed here are duplicated within 
          the scope of class template basic_regex, so you can use any of:</P>
       <PRE>boost::regex_constants::constant_name</PRE>
@@ -65,52 +74,81 @@ static const syntax_option_type perl;<BR>// these are boost.regex specific:<BR>s
       <P>or</P>
       <PRE>boost::wregex::constant_name</PRE>
       <P>in an interchangeable manner.</P>
+      <H4><A name="perl"></A>Options for Perl Regular Expressions:</H4>
+      <P>One of the following must always be set for perl regular expressions:</P>
       <P>
-         <TABLE id="Table2" height="1274" cellSpacing="1" cellPadding="7" width="100%" border="0">
+         <TABLE id="Table4" cellSpacing="1" cellPadding="1" width="100%" border="1">
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>Element</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>Effect if set</P>
-               </TD>
+               <TD><STRONG>Element</STRONG></TD>
+               <TD><STRONG>Standardized</STRONG></TD>
+               <TD><STRONG>Effect when set</STRONG></TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>normal</P>
+               <TD>
+                  <P>ECMAScript</P>
                </TD>
-               <TD vAlign="top" width="50%">
+               <TD>Yes</TD>
+               <TD>
                   <P>Specifies that the grammar recognized by the regular expression engine uses its 
                      normal semantics: that is the same as that given in the ECMA-262, ECMAScript 
                      Language Specification, Chapter 15 part 10, RegExp (Regular Expression) Objects 
                      (FWD.1).</P>
-                  <P>boost.regex also recognizes most perl-compatible extensions in this mode.</P>
+                  <P>boost.regex also recognizes all of the perl-compatible (?...) extensions in 
+                     this mode.</P>
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>icase</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <TD>perl</TD>
+               <TD>No</TD>
+               <TD>As above.</TD>
+            </TR>
+            <TR>
+               <TD>normal</TD>
+               <TD>No</TD>
+               <TD>As above.</TD>
+            </TR>
+            <TR>
+               <TD>JavaScript</TD>
+               <TD>No</TD>
+               <TD>As above.</TD>
+            </TR>
+            <TR>
+               <TD>JScript</TD>
+               <TD>No</TD>
+               <TD>As above.</TD>
+            </TR>
+         </TABLE>
+      </P>
+      <P>The following options may also be set when using perl-style regular 
+         expressions:</P>
+      <P>
+         <TABLE id="Table5" cellSpacing="1" cellPadding="1" width="100%" border="1">
+            <TR>
+               <TD><STRONG>Element</STRONG></TD>
+               <TD><STRONG>Standardized</STRONG></TD>
+               <TD><STRONG>Effect when set</STRONG></TD>
+            </TR>
+            <TR>
+               <TD>icase</TD>
+               <TD>Yes</TD>
+               <TD>
                   <P>Specifies that matching of regular expressions against a character container 
                      sequence shall be performed without regard to case.</P>
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>nosubs</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <TD>nosubs</TD>
+               <TD>Yes</TD>
+               <TD>
                   <P>Specifies that when a regular expression is matched against a character 
                      container sequence, then no sub-expression matches are to be stored in the 
                      supplied match_results structure.</P>
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>optimize</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <TD>optimize</TD>
+               <TD>Yes</TD>
+               <TD>
                   <P>Specifies that the regular expression engine should pay more attention to the 
                      speed with which regular expressions are matched, and less to the speed with 
                      which regular expression objects are constructed. Otherwise it has no 
@@ -119,91 +157,80 @@ static const syntax_option_type perl;<BR>// these are boost.regex specific:<BR>s
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>collate</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <TD>collate</TD>
+               <TD>Yes</TD>
+               <TD>
                   <P>Specifies that character ranges of the form "[a-b]" should be locale sensitive.</P>
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>ECMAScript</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as normal.</P>
-               </TD>
+               <TD>newline_alt</TD>
+               <TD>No</TD>
+               <TD>Specifies that the \n character has the same effect as the alternation 
+                  operator |.&nbsp; Allows newline separated lists to be used as a list of 
+                  alternatives.</TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>JavaScript</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as normal.</P>
-               </TD>
+               <TD>no_mod_m</TD>
+               <TD>No</TD>
+               <TD>Normally Boost.Regex behaves as if the Perl m-modifier is on: so the 
+                  assertions ^ and $ match after and before embedded newlines respectively, 
+                  setting this flags is eqivalent to prefixing the expression with (?-m).</TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>JScript</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as normal.</P>
-               </TD>
+               <TD>no_mod_s</TD>
+               <TD>No</TD>
+               <TD>Normally whether Boost.Regex will match "." against a newline character is 
+                  determined by the <A href="match_flag_type.html">match flag</A> match_dot_not_newline.&nbsp; 
+                  Specifying this flag is equivalent to prefixing the expression with (?-s) and 
+                  therefore causes "." not to match a newline character regardless of whether 
+                  match_not_dot_newline is set in the match flags.</TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>basic</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>Specifies that the grammar recognized by the regular expression engine is the 
-                     same as that used by POSIX basic regular expressions in IEEE Std 1003.1-2001, 
-                     Portable Operating System Interface (POSIX ), Base Definitions and Headers, 
-                     Section 9, Regular Expressions (FWD.1).
-                  </P>
-               </TD>
+               <TD>mod_s</TD>
+               <TD>No</TD>
+               <TD>Normally whether Boost.Regex will match "." against a newline character is 
+                  determined by the <A href="match_flag_type.html">match flag</A> match_dot_not_newline.&nbsp; 
+                  Specifying this flag is equivalent to prefixing the expression with (?s) and 
+                  therefore causes "." to match a newline character regardless of whether 
+                  match_not_dot_newline is set in the match flags.</TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>extended</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <TD>mod_x</TD>
+               <TD>No</TD>
+               <TD>Turns on the perl x-modifier: causes unescaped whitespace in the expression to 
+                  be ignored.</TD>
+            </TR>
+         </TABLE>
+      </P>
+      <H4><A name="extended"></A>Options for POSIX Extended Regular Expressions:</H4>
+      <P>Exactly one of the following must always be set for POSIX extended regular 
+         expressions:</P>
+      <P>
+         <TABLE id="Table6" cellSpacing="1" cellPadding="1" width="100%" border="1">
+            <TR>
+               <TD>Element</TD>
+               <TD>Standardized</TD>
+               <TD>Effect when set</TD>
+            </TR>
+            <TR>
+               <TD>extended</TD>
+               <TD>Yes</TD>
+               <TD>
                   <P>Specifies that the grammar recognized by the regular expression engine is the 
                      same as that used by POSIX extended regular expressions in IEEE Std 
                      1003.1-2001, Portable Operating System Interface (POSIX ), Base Definitions and 
-                     Headers, Section 9, Regular Expressions (FWD.1).</P>
+                     Headers, Section 9, Regular Expressions (FWD.1).&nbsp;
+                  </P>
+                  <P>In addition some perl-style escape sequences are supported (The POSIX standard 
+                     specifies that only "special" characters may be escaped, all other escape 
+                     sequences result in undefined behavior).</P>
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>awk</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>Specifies that the grammar recognized by the regular expression engine is the 
-                     same as that used by POSIX utility awk in IEEE Std 1003.1-2001, Portable 
-                     Operating System Interface (POSIX ), Shells and Utilities, Section 4, awk 
-                     (FWD.1).</P>
-                  <P>That is to say: the same as POSIX extended syntax, but with escape sequences in 
-                     character classes permitted.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="316">
-                  <P>grep</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>Specifies that the grammar recognized by the regular expression engine is the 
-                     same as that used by POSIX utility grep in IEEE Std 1003.1-2001, Portable 
-                     Operating System Interface (POSIX ), Shells and Utilities, Section 4, 
-                     Utilities, grep (FWD.1).</P>
-                  <P>That is to say, the same as POSIX basic syntax, but with the newline character 
-                     acting as an alternation character in addition to "|".</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="316">
-                  <P>egrep</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <TD>egrep</TD>
+               <TD>Yes</TD>
+               <TD>
                   <P>Specifies that the grammar recognized by the regular expression engine is the 
                      same as that used by POSIX utility grep when given the -E option in IEEE Std 
                      1003.1-2001, Portable Operating System Interface (POSIX ), Shells and 
@@ -213,116 +240,243 @@ static const syntax_option_type perl;<BR>// these are boost.regex specific:<BR>s
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>sed</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as basic.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="316">
-                  <P>perl</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as normal.</P>
+               <TD>awk</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that the grammar recognized by the regular expression engine is the 
+                     same as that used by POSIX utility awk in IEEE Std 1003.1-2001, Portable 
+                     Operating System Interface (POSIX ), Shells and Utilities, Section 4, awk 
+                     (FWD.1).</P>
+                  <P>That is to say: the same as POSIX extended syntax, but with escape sequences in 
+                     character classes permitted.</P>
+                  <P>In addition some perl-style escape sequences are supported (actually the awk 
+                     syntax requires \a \b \t \v \f \n and \r to be recognised,&nbsp;but other 
+                     escape sequences invoke undefined behaviour according to the POSIX standard).</P>
                </TD>
             </TR>
          </TABLE>
       </P>
-      <P>The following constants are specific to this particular regular expression 
-         implementation and do not appear in the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">
-            regular expression standardization proposal</A>:</P>
+      <P>The following options may also be set when using POSIX extended regular 
+         expressions:</P>
       <P>
-         <TABLE id="Table3" cellSpacing="0" cellPadding="7" width="100%" border="0">
+         <TABLE id="Table7" cellSpacing="1" cellPadding="1" width="100%" border="1">
             <TR>
-               <TD vAlign="top" width="45%">regbase::escape_in_lists</TD>
-               <TD vAlign="top" width="45%">Allows the use of the escape "\" character in sets of 
-                  characters, for example [\]] represents the set of characters containing only 
-                  "]". If this flag is not set then "\" is an ordinary character inside sets.</TD>
+               <TD><STRONG>Element</STRONG></TD>
+               <TD><STRONG>Standardized</STRONG></TD>
+               <TD><STRONG>Effect when set</STRONG></TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="45%">regbase::char_classes</TD>
-               <TD vAlign="top" width="45%">When this bit is set, character classes [:classname:] 
-                  are allowed inside character set declarations, for example "[[:word:]]" 
-                  represents the set of all characters that belong to the character class "word".</TD>
+               <TD>icase</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that matching of regular expressions against a character container 
+                     sequence shall be performed without regard to case.</P>
+               </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="45%">regbase:: intervals</TD>
-               <TD vAlign="top" width="45%">When this bit is set, repetition intervals are 
-                  allowed, for example "a{2,4}" represents a repeat of between 2 and 4 letter 
-                  a's.</TD>
+               <TD>nosubs</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that when a regular expression is matched against a character 
+                     container sequence, then no sub-expression matches are to be stored in the 
+                     supplied match_results structure.</P>
+               </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="45%">regbase:: limited_ops</TD>
-               <TD vAlign="top" width="45%">When this bit is set all of "+", "?" and "|" are 
-                  ordinary characters in all situations.</TD>
+               <TD>optimize</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that the regular expression engine should pay more attention to the 
+                     speed with which regular expressions are matched, and less to the speed with 
+                     which regular expression objects are constructed. Otherwise it has no 
+                     detectable effect on the program output.&nbsp; This currently has no effect for 
+                     boost.regex.</P>
+               </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="45%">regbase:: newline_alt</TD>
-               <TD vAlign="top" width="45%">When this bit is set, then the newline character "\n" 
-                  has the same effect as the alternation operator "|".</TD>
+               <TD>collate</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that character ranges of the form "[a-b]" should be locale sensitive.</P>
+               </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="45%">regbase:: bk_plus_qm</TD>
-               <TD vAlign="top" width="45%">When this bit is set then "\+" represents the one or 
-                  more repetition operator and "\?" represents the zero or one repetition 
-                  operator. When this bit is not set then "+" and "?" are used instead.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: bk_braces</TD>
-               <TD vAlign="top" width="45%">When this bit is set then "\{" and "\}" are used for 
-                  bounded repetitions and "{" and "}" are normal characters. This is the opposite 
-                  of default behavior.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: bk_parens</TD>
-               <TD vAlign="top" width="45%">When this bit is set then "\(" and "\)" are used to 
-                  group sub-expressions and "(" and ")" are ordinary characters, this is the 
-                  opposite of default behavior.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: bk_refs</TD>
-               <TD vAlign="top" width="45%">When this bit is set then back references are 
-                  allowed.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: bk_vbar</TD>
-               <TD vAlign="top" width="45%">When this bit is set then "\|" represents the 
-                  alternation operator and "|" is an ordinary character. This is the opposite of 
-                  default behavior.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: use_except</TD>
-               <TD vAlign="top" width="45%">When this bit is set then a <A href="#bad_expression">bad_expression</A>
-                  exception will be thrown on error.&nbsp; Use of this flag is deprecated - 
-                  basic_regex will always throw on error.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: failbit</TD>
-               <TD vAlign="top" width="45%">This bit is set on error, if regbase::use_except is 
-                  not set, then this bit should be checked to see if a regular expression is 
-                  valid before usage.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase::literal</TD>
-               <TD vAlign="top" width="45%">All characters in the string are treated as literals, 
-                  there are no special characters or escape sequences.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%" height="24">regbase::emacs</TD>
-               <TD vAlign="top" width="45%" height="24">Provides compatability with the emacs 
-                  editor, eqivalent to: bk_braces | bk_parens | bk_refs | bk_vbar.</TD>
+               <TD>newline_alt</TD>
+               <TD>No</TD>
+               <TD>Specifies that the \n character has the same effect as the alternation 
+                  operator |.&nbsp; Allows newline separated lists to be used as a list of 
+                  alternatives.</TD>
             </TR>
          </TABLE>
       </P>
+      <H4><A name="basic"></A>Options for POSIX Basic Regular Expressions:</H4>
+      <P>Exactly one of the following must always be set for POSIX basic regular 
+         expressions:</P>
+      <P>
+         <TABLE id="Table8" cellSpacing="1" cellPadding="1" width="100%" border="1">
+            <TR>
+               <TD>Element</TD>
+               <TD>Standardized</TD>
+               <TD>Effect When Set</TD>
+            </TR>
+            <TR>
+               <TD>basic</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that the grammar recognized by the regular expression engine is the 
+                     same as that used by POSIX basic regular expressions in IEEE Std 1003.1-2001, 
+                     Portable Operating System Interface (POSIX ), Base Definitions and Headers, 
+                     Section 9, Regular Expressions (FWD.1).
+                  </P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>sed</TD>
+               <TD>No</TD>
+               <TD>As Above.</TD>
+            </TR>
+            <TR>
+               <TD>grep</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that the grammar recognized by the regular expression engine is the 
+                     same as that used by POSIX utility grep in IEEE Std 1003.1-2001, Portable 
+                     Operating System Interface (POSIX ), Shells and Utilities, Section 4, 
+                     Utilities, grep (FWD.1).</P>
+                  <P>That is to say, the same as POSIX basic syntax, but with the newline character 
+                     acting as an alternation character in addition to "|".</P>
+               </TD>
+            </TR>
+         </TABLE>
+      </P>
+      <P>The following options may also be set when using POSIX basic regular 
+         expressions:</P>
+      <P>
+         <TABLE id="Table9" cellSpacing="1" cellPadding="1" width="100%" border="1">
+            <TR>
+               <TD><STRONG>Element</STRONG></TD>
+               <TD><STRONG>Standardized</STRONG></TD>
+               <TD><STRONG>Effect when set</STRONG></TD>
+            </TR>
+            <TR>
+               <TD>icase</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that matching of regular expressions against a character container 
+                     sequence shall be performed without regard to case.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>nosubs</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that when a regular expression is matched against a character 
+                     container sequence, then no sub-expression matches are to be stored in the 
+                     supplied match_results structure.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>optimize</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that the regular expression engine should pay more attention to the 
+                     speed with which regular expressions are matched, and less to the speed with 
+                     which regular expression objects are constructed. Otherwise it has no 
+                     detectable effect on the program output.&nbsp; This currently has no effect for 
+                     boost.regex.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>collate</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that character ranges of the form "[a-b]" should be locale sensitive.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>newline_alt</TD>
+               <TD>No</TD>
+               <TD>Specifies that the \n character has the same effect as the alternation 
+                  operator |.&nbsp; Allows newline separated lists to be used as a list of 
+                  alternatives.</TD>
+            </TR>
+            <TR>
+               <TD>no_char_classes</TD>
+               <TD>No</TD>
+               <TD>When set then character classes such as [[:alnum:]] are not allowed.</TD>
+            </TR>
+            <TR>
+               <TD>no_intervals</TD>
+               <TD>No</TD>
+               <TD>When set then bounded repeats such as a{2,3} are not permitted.</TD>
+            </TR>
+            <TR>
+               <TD>bk_plus_qm</TD>
+               <TD>No</TD>
+               <TD>When set then \? acts as a zero-or-one repeat operator, and \+ acts as a 
+                  one-or-more repeat operator.</TD>
+            </TR>
+            <TR>
+               <TD>bk_vbar</TD>
+               <TD>No</TD>
+               <TD>When set then \| acts as the alternation operator.</TD>
+            </TR>
+         </TABLE>
+      </P>
+      <H4><A name="literals"></A>Options for Literal Strings:</H4>
+      <P>The following must always be set to interpret the expression as a string 
+         literal:</P>
+      <P>
+         <TABLE id="Table10" cellSpacing="1" cellPadding="1" width="100%" border="1">
+            <TR>
+               <TD>Element</TD>
+               <TD>Standardized</TD>
+               <TD>Effect when set</TD>
+            </TR>
+            <TR>
+               <TD>literal</TD>
+               <TD>Yes</TD>
+               <TD>Treat the string as a literal (no special characters).</TD>
+            </TR>
+         </TABLE>
+      </P>
+      <P>The following options may also be combined with the <EM>literal</EM> flag:</P>
+      <P>
+         <TABLE id="Table11" cellSpacing="1" cellPadding="1" width="100%" border="1">
+            <TR>
+               <TD>Element</TD>
+               <TD>Standardized</TD>
+               <TD>Effect when set</TD>
+            </TR>
+            <TR>
+               <TD>icase</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that matching of regular expressions against a character container 
+                     sequence shall be performed without regard to case.</P>
+               </TD>
+            </TR>
+            <TR>
+               <TD>optimize</TD>
+               <TD>Yes</TD>
+               <TD>
+                  <P>Specifies that the regular expression engine should pay more attention to the 
+                     speed with which regular expressions are matched, and less to the speed with 
+                     which regular expression objects are constructed. Otherwise it has no 
+                     detectable effect on the program output.&nbsp; This currently has no effect for 
+                     boost.regex.</P>
+               </TD>
+            </TR>
+         </TABLE>
+      </P>
+      <P>&nbsp;</P>
       <HR>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         23 June 2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
-            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/example/jgrep/main.cpp b/example/jgrep/main.cpp
index 32ea68b2..d3e6cb6a 100644
--- a/example/jgrep/main.cpp
+++ b/example/jgrep/main.cpp
@@ -15,25 +15,27 @@
   */
 
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <boost/regex.hpp>
+#include <cstdio>
+#include <cstdlib>
 #include <iostream>
-using namespace std;
-#ifdef __BORLANDC__
-#  pragma hrdstop
-#endif
-
-#ifdef BOOST_REGEX_V3
-#include <boost/regex/v3/fileiter.hpp>
-#else
-#include <boost/regex/v4/fileiter.hpp>
-#endif
-#include "jgrep.h"
-#ifndef BOOST_REGEX_NO_FILEITER
 #include <algorithm>
 
+#include <boost/regex.hpp>
+#include <boost/regex/v4/fileiter.hpp>
+#include "jgrep.h"
+#ifndef BOOST_REGEX_NO_FILEITER
+
+#ifdef BOOST_NO_STDC_NAMESPACE
+namespace std{
+   using ::strcpy;
+   using ::strcat;
+   using ::sprintf;
+}
+#endif
+
+
 re_type e;
+//rei_type ei(a);
 
 // flags for output:
 
@@ -49,7 +51,7 @@ bool verbose = false;
 
 void usage()
 {
-   cout <<
+   std::cout <<
 "jgrep version 0.95\n"
 "usage: jgrep [-options] expression file [files...]\n"
 "\n"
@@ -68,7 +70,7 @@ void usage()
 "expression: a regular expression, or a literal string if -r- is specified\n"
 "\n"
 "files:  one or more files to search, the names can contain the wildcard\n"
-"        characters ? and *\n" << endl;
+"        characters ? and *\n" << std::endl;
 
 }
 
@@ -107,9 +109,9 @@ void parse_switch(const char* flag)
                   verbose = false;
                   break;
                default:
-                  cout << "Undefined option -";
-                  cout.put(*flag);
-                  cout << endl;
+                  std::cout << "Undefined option -";
+                  std::cout.put(*flag);
+                  std::cout << std::endl;
             }
             // turn off prev character:
             break;
@@ -143,9 +145,9 @@ void parse_switch(const char* flag)
          case '+':
             break;
          default:
-            cout << "Undefined option -";
-            cout.put(*flag);
-            cout << endl;
+            std::cout << "Undefined option -";
+            std::cout.put(*flag);
+            std::cout << std::endl;
       }
       ++flag;
    }
@@ -163,18 +165,18 @@ void HandleFile(const char* wild)
    {
       // go through sub directories:
       char buf[MAX_PATH];
-      strcpy(buf, start.root());
+      std::strcpy(buf, start.root());
       int rootlen = strlen(buf);
       if(*buf == 0)
       {
-         strcpy(buf, ".");
-         strcat(buf, directory_iterator::separator());
-         strcat(buf, "*");
+         std::strcpy(buf, ".");
+         std::strcat(buf, directory_iterator::separator());
+         std::strcat(buf, "*");
       }
       else
       {
-         strcat(buf, directory_iterator::separator());
-         strcat(buf, "*");
+         std::strcat(buf, directory_iterator::separator());
+         std::strcat(buf, "*");
       }
       directory_iterator dstart(buf);
       directory_iterator dend;
@@ -185,12 +187,12 @@ void HandleFile(const char* wild)
 
       while(dstart != dend)
       {
-         sprintf(buf, "%s%s%s", dstart.path(), directory_iterator::separator(), ptr);
+         std::sprintf(buf, "%s%s%s", dstart.path(), directory_iterator::separator(), ptr);
          HandleFile(buf);
          ++dstart;
       }
    }
-   for_each(start, end, process_grep);
+   std::for_each(start, end, process_grep);
 }
 
 int done = 0;
@@ -215,8 +217,8 @@ void HandleArg(const char* arg)
          }
          else
          {
-            char* buf = new char[strlen(arg) + 8];
-            sprintf(buf, "\\<%s\\>", arg);
+            char* buf = new char[std::strlen(arg) + 8];
+            std::sprintf(buf, "\\<%s\\>", arg);
             e.set_expression(buf, use_case ? regex::normal : regbase::normal | regbase::icase);
             //ei.set_expression(buf);
             delete[] buf;
@@ -225,20 +227,20 @@ void HandleArg(const char* arg)
       else
       {
          // we need to convert text to literal:
-         int len2 = strlen(arg);
+         int len2 = std::strlen(arg);
          int len = len2 * 5 + 6;
          char buf[8];
          char* buf2 = new char[len];
          *buf2 = 0;
          if(words_only)
-            strcpy(buf2, "\\<");
+            std::strcpy(buf2, "\\<");
          for(int j = 0; j < len2; ++j)
          {
-            sprintf(buf, "\\0%o", int(arg[j]));
-            strcat(buf2, buf);
+            std::sprintf(buf, "\\0%o", int(arg[j]));
+            std::strcat(buf2, buf);
          }
          if(words_only)
-            strcat(buf2, "\\>");
+            std::strcat(buf2, "\\>");
          e.set_expression(buf2, use_case ? regex::normal : regbase::normal | regbase::icase);
          //ei.set_expression(buf2);
          delete[] buf2;
@@ -266,7 +268,7 @@ int main(int argc, char * argv[])
 
 int main(int argc, char * argv[])
 {
-   cout <<
+   std::std::cout <<
    "\n<note>\n"
    "This functionality is not available on with this compiler on this platform.\n"
    "</note>\n";
diff --git a/example/snippets/captures_example.cpp b/example/snippets/captures_example.cpp
index 5ebe1583..eafced6b 100644
--- a/example/snippets/captures_example.cpp
+++ b/example/snippets/captures_example.cpp
@@ -1,3 +1,20 @@
+/*
+ *
+ * Copyright (c) 2003-2004
+ * Dr John Maddock
+ *
+ * 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)
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         captures_example.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Demonstrate the behaviour of captures.
+  */
 
 #include <boost/regex.hpp>
 #include <iostream>
diff --git a/include/boost/regex/config.hpp b/include/boost/regex/config.hpp
index 3a8a75eb..0f91e971 100644
--- a/include/boost/regex/config.hpp
+++ b/include/boost/regex/config.hpp
@@ -238,6 +238,10 @@ namespace boost{ typedef wchar_t regex_wchar_type; }
 // If there are no exceptions then we must report critical-errors
 // the only way we know how; by terminating.
 //
+#include <stdexcept>
+#include <string>
+#include <boost/throw_exception.hpp>
+
 #  define BOOST_REGEX_NOEH_ASSERT(x)\
 if(0 == (x))\
 {\
diff --git a/include/boost/regex/v4/basic_regex.hpp b/include/boost/regex/v4/basic_regex.hpp
index 40b72775..013efb59 100644
--- a/include/boost/regex/v4/basic_regex.hpp
+++ b/include/boost/regex/v4/basic_regex.hpp
@@ -545,6 +545,70 @@ std::ostream& operator << (std::ostream& os, const basic_regex<char, traits>& e)
 }
 #endif
 
+//
+// class reg_expression:
+// this is provided for backwards compatibility only,
+// it is deprecated, no not use!
+//
+#ifdef BOOST_REGEX_NO_FWD
+template <class charT, class traits = regex_traits<charT> >
+#else
+template <class charT, class traits >
+#endif
+class reg_expression : public basic_regex<charT, traits>
+{
+public:
+   typedef typename basic_regex<charT, traits>::flag_type flag_type;
+   typedef typename basic_regex<charT, traits>::size_type size_type;
+   explicit reg_expression(){}
+   explicit reg_expression(const charT* p, flag_type f = regex_constants::normal)
+      : basic_regex<charT, traits>(p, f){}
+   reg_expression(const charT* p1, const charT* p2, flag_type f = regex_constants::normal)
+      : basic_regex<charT, traits>(p1, p2, f){}
+   reg_expression(const charT* p, size_type len, flag_type f)
+      : basic_regex<charT, traits>(p, len, f){}
+   reg_expression(const reg_expression& that)
+      : basic_regex<charT, traits>(that) {}
+   ~reg_expression(){}
+   reg_expression& BOOST_REGEX_CALL operator=(const reg_expression& that)
+   {
+      return this->assign(that);
+   }
+
+#if !defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(__IBMCPP__)
+   template <class ST, class SA>
+   explicit reg_expression(const std::basic_string<charT, ST, SA>& p, flag_type f = regex_constants::normal)
+   : basic_regex<charT, traits>(p, f)
+   { 
+   }
+
+   template <class InputIterator>
+   reg_expression(InputIterator arg_first, InputIterator arg_last, flag_type f = regex_constants::normal)
+   : basic_regex<charT, traits>(arg_first, arg_last, f)
+   {
+   }
+
+   template <class ST, class SA>
+   reg_expression& BOOST_REGEX_CALL operator=(const std::basic_string<charT, ST, SA>& p)
+   {
+      this->assign(p);
+      return *this;
+   }
+#else
+   explicit reg_expression(const std::basic_string<charT>& p, flag_type f = regex_constants::normal)
+   : basic_regex<charT, traits>(p, f)
+   { 
+   }
+
+   reg_expression& BOOST_REGEX_CALL operator=(const std::basic_string<charT>& p)
+   {
+      this->assign(p);
+      return *this;
+   }
+#endif
+
+};
+
 #ifdef BOOST_MSVC
 #pragma warning (pop)
 #endif
diff --git a/include/boost/regex/v4/basic_regex_creator.hpp b/include/boost/regex/v4/basic_regex_creator.hpp
index d6563c59..d57f47e8 100644
--- a/include/boost/regex/v4/basic_regex_creator.hpp
+++ b/include/boost/regex/v4/basic_regex_creator.hpp
@@ -66,15 +66,15 @@ public:
 
    void add_single(const digraph_type& s)
    {
-      m_singles.push_back(s);
+      m_singles.insert(m_singles.end(), s);
       if(s.second)
          m_has_digraphs = true;
       m_empty = false;
    }
    void add_range(const digraph_type& first, const digraph_type& end)
    {
-      m_ranges.push_back(first);
-      m_ranges.push_back(end);
+      m_ranges.insert(m_ranges.end(), first);
+      m_ranges.insert(m_ranges.end(), end);
       if(first.second)
       {
          m_has_digraphs = true;
@@ -94,7 +94,7 @@ public:
    }
    void add_equivalent(const digraph_type& s)
    {
-      m_equivalents.push_back(s);
+      m_equivalents.insert(m_equivalents.end(), s);
       if(s.second)
       {
          m_has_digraphs = true;
@@ -243,6 +243,7 @@ basic_regex_creator<charT, traits>::basic_regex_creator(regex_data<charT, traits
    : m_pdata(data), m_traits(*(data->m_ptraits)), m_last_state(0), m_repeater_id(0), m_has_backrefs(false), m_backrefs(0)
 {
    m_pdata->m_data.clear();
+   m_pdata->m_status = ::boost::regex_constants::error_ok;
    static const charT w = 'w';
    static const charT s = 's';
    static const charT l[] = { 'l', 'o', 'w', 'e', 'r', };
@@ -409,14 +410,18 @@ re_syntax_base* basic_regex_creator<charT, traits>::append_set(
       {
          if(c1.second)
          {
-            s1.append(1, c1.first).append(1, c1.second);
+            s1.insert(s1.end(), c1.first);
+            s1.insert(s1.end(), c1.second);
          }
          else
             s1 = string_type(1, c1.first);
          if(c2.second)
-            s2.append(1, c2.first).append(1, c2.second);
+         {
+            s2.insert(s2.end(), c2.first);
+            s2.insert(s2.end(), c2.second);
+         }
          else
-            s2 = string_type(1, c2.first);
+            s2.insert(s2.end(), c2.first);
       }
       if(s1 > s2)
       {
@@ -684,6 +689,8 @@ void basic_regex_creator<charT, traits>::create_startmaps(re_syntax_base* state)
          if(static_cast<re_brace*>(state)->index < 0)
          {
             // Oops error:
+            if(0 == this->m_pdata->m_status) // update the error code if not already set
+               this->m_pdata->m_status = boost::regex_constants::error_brack;
             std::string message = this->m_pdata->m_ptraits->error_string(boost::regex_constants::error_brack);
             boost::regex_error e(message, boost::regex_constants::error_brack, 0);
             e.raise();
@@ -998,6 +1005,7 @@ unsigned basic_regex_creator<charT, traits>::get_restart_type(re_syntax_base* st
       case syntax_element_word_start:
          return regbase::restart_word;
       case syntax_element_buffer_start:
+         return regbase::restart_buf;
       case syntax_element_restart_continue:
          return regbase::restart_continue;
       default:
diff --git a/include/boost/regex/v4/basic_regex_parser.hpp b/include/boost/regex/v4/basic_regex_parser.hpp
index f2b26752..38f9210d 100644
--- a/include/boost/regex/v4/basic_regex_parser.hpp
+++ b/include/boost/regex/v4/basic_regex_parser.hpp
@@ -83,7 +83,10 @@ void basic_regex_parser<charT, traits>::parse(const charT* p1, const charT* p2,
 {
    // empty strings are errors:
    if(p1 == p2)
+   {
       fail(regex_constants::error_empty, 0);
+      return;
+   }
    // pass flags on to base class:
    this->init(flags);
    // set up pointers:
@@ -110,7 +113,13 @@ void basic_regex_parser<charT, traits>::parse(const charT* p1, const charT* p2,
    // if we haven't gobbled up all the characters then we must
    // have had an unexpected ')' :
    if(!result)
+   {
       fail(regex_constants::error_paren, ::boost::re_detail::distance(m_base, m_position));
+      return;
+   }
+   // if an error has been set then give up now:
+   if(this->m_pdata->m_status)
+      return;
    // fill in our sub-expression count:
    this->m_pdata->m_mark_count = 1 + m_mark_count;
    this->finalize(p1, p2);
@@ -119,7 +128,12 @@ void basic_regex_parser<charT, traits>::parse(const charT* p1, const charT* p2,
 template <class charT, class traits>
 void basic_regex_parser<charT, traits>::fail(regex_constants::error_type error_code, std::ptrdiff_t position)
 {
+   if(0 == this->m_pdata->m_status) // update the error code if not already set
+      this->m_pdata->m_status = error_code;
+   m_position = m_end; // don't bother parsing anything else
+   // get the error message:
    std::string message = this->m_pdata->m_ptraits->error_string(error_code);
+   // and raise the exception, this will do nothing if exceptions are disabled:
    boost::regex_error e(message, error_code, position);
    e.raise();
 }
@@ -198,17 +212,26 @@ bool basic_regex_parser<charT, traits>::parse_extended()
       break;
    case regex_constants::syntax_star:
       if(m_position == this->m_base)
+      {
          fail(regex_constants::error_badrepeat, 0);
+         return false;
+      }
       ++m_position;
       return parse_repeat();
    case regex_constants::syntax_question:
       if(m_position == this->m_base)
+      {
          fail(regex_constants::error_badrepeat, 0);
+         return false;
+      }
       ++m_position;
       return parse_repeat(0,1);
    case regex_constants::syntax_plus:
       if(m_position == this->m_base)
+      {
          fail(regex_constants::error_badrepeat, 0);
+         return false;
+      }
       ++m_position;
       return parse_repeat(1);
    case regex_constants::syntax_open_brace:
@@ -216,10 +239,7 @@ bool basic_regex_parser<charT, traits>::parse_extended()
       return parse_repeat_range(false);
    case regex_constants::syntax_close_brace:
       fail(regex_constants::error_brace, this->m_position - this->m_end);
-      // we don't ever get here, because we will have thrown:
-      BOOST_ASSERT(0);
-      result = false;
-      break;
+      return false;
    case regex_constants::syntax_or:
       return parse_alt();
    case regex_constants::syntax_open_set:
@@ -269,7 +289,10 @@ bool basic_regex_parser<charT, traits>::parse_open_paren()
    // skip the '(' and error check:
    //
    if(++m_position == m_end)
+   {
       fail(regex_constants::error_paren, m_position - m_base);
+      return false;
+   }
    //
    // begin by checking for a perl-style (?...) extension:
    //
@@ -320,7 +343,10 @@ bool basic_regex_parser<charT, traits>::parse_open_paren()
    // we either have a ')' or we have run out of characters prematurely:
    //
    if(m_position == m_end)
+   {
       this->fail(regex_constants::error_paren, ::boost::re_detail::distance(m_base, m_end));
+      return false;
+   }
    BOOST_ASSERT(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_close_mark);
    ++m_position;
    //
@@ -378,8 +404,7 @@ bool basic_regex_parser<charT, traits>::parse_basic_escape()
       if(this->flags() & regbase::no_intervals)
          return parse_literal();
       fail(regex_constants::error_brace, this->m_position - this->m_base);
-      result = false;
-      break;
+      return false;
    case regex_constants::syntax_or:
       if(this->flags() & regbase::bk_vbar)
          return parse_alt();
@@ -416,7 +441,10 @@ bool basic_regex_parser<charT, traits>::parse_extended_escape()
                char_set.negate();
             char_set.add_class(m);
             if(0 == this->append_set(char_set))
+            {
                fail(regex_constants::error_range, m_position - m_base);
+               return false;
+            }
             ++m_position;
             return true;
          }
@@ -512,6 +540,7 @@ bool basic_regex_parser<charT, traits>::parse_repeat(std::size_t low, std::size_
    if(0 == this->m_last_state)
    {
       fail(regex_constants::error_badrepeat, ::boost::re_detail::distance(m_base, m_position));
+      return false;
    }
    if(this->m_last_state->type == syntax_element_endmark)
    {
@@ -549,6 +578,7 @@ bool basic_regex_parser<charT, traits>::parse_repeat(std::size_t low, std::size_
       case syntax_element_jump:
          // can't legally repeat any of the above:
          fail(regex_constants::error_badrepeat, m_position - m_base);
+         return false;
       default:
          // do nothing...
          break;
@@ -588,16 +618,25 @@ bool basic_regex_parser<charT, traits>::parse_repeat_range(bool isbasic)
       ++m_position;
    // fail if at end:
    if(this->m_position == this->m_end)
+   {
       fail(regex_constants::error_brace, this->m_position - this->m_base);
+      return false;
+   }
    // get min:
    v = this->m_traits.toi(m_position, m_end, 10);
    // skip whitespace:
    while((m_position != m_end) && this->m_traits.isctype(*m_position, this->m_mask_space))
       ++m_position;
    if(v < 0)
+   {
       fail(regex_constants::error_badbrace, this->m_position - this->m_base);
+      return false;
+   }
    else if(this->m_position == this->m_end)
+   {
       fail(regex_constants::error_brace, this->m_position - this->m_base);
+      return false;
+   }
    min = v;
    // see if we have a comma:
    if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_comma)
@@ -608,7 +647,10 @@ bool basic_regex_parser<charT, traits>::parse_repeat_range(bool isbasic)
       while((m_position != m_end) && this->m_traits.isctype(*m_position, this->m_mask_space))
          ++m_position;
       if(this->m_position == this->m_end)
+      {
          fail(regex_constants::error_brace, this->m_position - this->m_base);
+         return false;
+      }
       // get the value if any:
       v = this->m_traits.toi(m_position, m_end, 10);
       max = (v >= 0) ? v : (std::numeric_limits<std::size_t>::max)();
@@ -623,29 +665,42 @@ bool basic_regex_parser<charT, traits>::parse_repeat_range(bool isbasic)
       ++m_position;
    // OK now check trailing }:
    if(this->m_position == this->m_end)
+   {
       fail(regex_constants::error_brace, this->m_position - this->m_base);
+      return false;
+   }
    if(isbasic)
    {
       if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_escape)
       {
          ++m_position;
          if(this->m_position == this->m_end)
+         {
             fail(regex_constants::error_brace, this->m_position - this->m_base);
+            return false;
+         }
       }
       else
       {
          fail(regex_constants::error_badbrace, this->m_position - this->m_base);
+         return false;
       }
    }
    if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_close_brace)
       ++m_position;
    else
+   {
       fail(regex_constants::error_badbrace, this->m_position - this->m_base);
+      return false;
+   }
    //
    // finally go and add the repeat, unless error:
    //
    if(min > max)
+   {
       fail(regex_constants::error_range, this->m_position - this->m_base);
+      return false;
+   }
    return parse_repeat(min, max);
 }
 
@@ -657,7 +712,10 @@ bool basic_regex_parser<charT, traits>::parse_alt()
    // or if the last state was a '(' then error:
    //
    if((this->m_last_state == 0) || (this->m_last_state->type == syntax_element_startmark))
+   {
       fail(regex_constants::error_empty, this->m_position - this->m_base);
+      return false;
+   }
    ++m_position;
    //
    // we need to append a trailing jump: 
@@ -694,7 +752,10 @@ bool basic_regex_parser<charT, traits>::parse_alt()
    // if we didn't actually add any trailing states then that's an error:
    //
    if(this->m_alt_insert_point == static_cast<std::ptrdiff_t>(this->m_pdata->m_data.size()))
+   {
       fail(regex_constants::error_empty, this->m_position - this->m_base);
+      return false;
+   }
    //
    // fix up the jump we added to point to the end of the states
    // that we've just added:
@@ -711,7 +772,10 @@ bool basic_regex_parser<charT, traits>::parse_set()
 {
    ++m_position;
    if(m_position == m_end)
+   {
       fail(regex_constants::error_brack, m_position - m_base);
+      return false;
+   }
    basic_char_set<charT, traits> char_set;
 
    const charT* base = m_position;  // where the '[' was
@@ -741,7 +805,10 @@ bool basic_regex_parser<charT, traits>::parse_set()
          {
             ++m_position;
             if(0 == this->append_set(char_set))
+            {
                fail(regex_constants::error_range, m_position - m_base);
+               return false;
+            }
          }
          return true;
       case regex_constants::syntax_open_set:
@@ -773,6 +840,7 @@ bool basic_regex_parser<charT, traits>::parse_set()
                if(m != 0)
                {
                   fail(regex_constants::error_escape, m_position - m_base);
+                  return false;
                }
             }
             // not a character class, just a regular escape:
@@ -797,7 +865,10 @@ bool basic_regex_parser<charT, traits>::parse_inner_set(basic_char_set<charT, tr
    // or an equivalence class [=name=]
    //
    if(m_end == ++m_position)
+   {
       fail(regex_constants::error_brack, m_position - m_base);
+      return false;
+   }
    switch(this->m_traits.syntax_type(*m_position))
    {
    case regex_constants::syntax_dot:
@@ -819,20 +890,32 @@ bool basic_regex_parser<charT, traits>::parse_inner_set(basic_char_set<charT, tr
       }
       // skip the ':'
       if(m_end == ++m_position)
+      {
          fail(regex_constants::error_brack, m_position - m_base);
+         return false;
+      }
       const charT* name_first = m_position;
       // skip at least one character, then find the matching ':]'
       if(m_end == ++m_position)
+      {
          fail(regex_constants::error_brack, m_position - m_base);
+         return false;
+      }
       while((m_position != m_end) 
          && (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_colon)) 
          ++m_position;
       const charT* name_last = m_position;
       if(m_end == m_position)
+      {
          fail(regex_constants::error_brack, m_position - m_base);
+         return false;
+      }
       if((m_end == ++m_position) 
          || (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_set))
+      {
          fail(regex_constants::error_brack, m_position - m_base);
+         return false;
+      }
       typedef typename traits::char_class_type mask_type;
       mask_type m = this->m_traits.lookup_classname(name_first, name_last);
       if(m == 0)
@@ -862,6 +945,7 @@ bool basic_regex_parser<charT, traits>::parse_inner_set(basic_char_set<charT, tr
             }
          }
          fail(regex_constants::error_ctype, name_first - m_base);
+         return false;
       }
       char_set.add_class(m);
       ++m_position;
@@ -871,23 +955,38 @@ bool basic_regex_parser<charT, traits>::parse_inner_set(basic_char_set<charT, tr
       {
       // skip the '='
       if(m_end == ++m_position)
+      {
          fail(regex_constants::error_brack, m_position - m_base);
+         return false;
+      }
       const charT* name_first = m_position;
       // skip at least one character, then find the matching '=]'
       if(m_end == ++m_position)
+      {
          fail(regex_constants::error_brack, m_position - m_base);
+         return false;
+      }
       while((m_position != m_end) 
          && (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_equal)) 
          ++m_position;
       const charT* name_last = m_position;
       if(m_end == m_position)
+      {
          fail(regex_constants::error_brack, m_position - m_base);
+         return false;
+      }
       if((m_end == ++m_position) 
          || (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_set))
+      {
          fail(regex_constants::error_brack, m_position - m_base);
+         return false;
+      }
       string_type m = this->m_traits.lookup_collatename(name_first, name_last);
       if((0 == m.size()) || (m.size() > 2))
+      {
          fail(regex_constants::error_collate, name_first - m_base);
+         return false;
+      }
       digraph<charT> d;
       d.first = m[0];
       if(m.size() > 1)
@@ -911,18 +1010,27 @@ void basic_regex_parser<charT, traits>::parse_set_literal(basic_char_set<charT,
 {
    digraph<charT> start_range(get_next_set_literal(char_set));
    if(m_end == m_position)
+   {
       fail(regex_constants::error_brack, m_position - m_base);
+      return;
+   }
    if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_dash)
    {
       // we have a range:
       if(m_end == ++m_position)
+      {
          fail(regex_constants::error_brack, m_position - m_base);
+         return;
+      }
       if(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_set)
       {
          digraph<charT> end_range = get_next_set_literal(char_set);
          char_set.add_range(start_range, end_range);
          if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_dash)
+         {
             fail(regex_constants::error_range, m_position - m_base);
+            return;
+         }
          return;
       }
       --m_position;
@@ -942,7 +1050,10 @@ digraph<charT> basic_regex_parser<charT, traits>::get_next_set_literal(basic_cha
       {
          // see if we are at the end of the set:
          if((++m_position == m_end) || (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_set))
+         {
             fail(regex_constants::error_range, m_position - m_base);
+            return result;
+         }
          --m_position;
       }
       result.first = *m_position++;
@@ -960,7 +1071,10 @@ digraph<charT> basic_regex_parser<charT, traits>::get_next_set_literal(basic_cha
    case regex_constants::syntax_open_set:
    {
       if(m_end == ++m_position)
+      {
          fail(regex_constants::error_collate, m_position - m_base);
+         return result;
+      }
       if(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_dot)
       {
          --m_position;
@@ -969,24 +1083,39 @@ digraph<charT> basic_regex_parser<charT, traits>::get_next_set_literal(basic_cha
          return result;
       }
       if(m_end == ++m_position)
+      {
          fail(regex_constants::error_collate, m_position - m_base);
+         return result;
+      }
       const charT* name_first = m_position;
       // skip at least one character, then find the matching ':]'
       if(m_end == ++m_position)
+      {
          fail(regex_constants::error_collate, name_first - m_base);
+         return result;
+      }
       while((m_position != m_end) 
          && (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_dot)) 
          ++m_position;
       const charT* name_last = m_position;
       if(m_end == m_position)
+      {
          fail(regex_constants::error_collate, name_first - m_base);
+         return result;
+      }
       if((m_end == ++m_position) 
          || (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_set))
+      {
          fail(regex_constants::error_collate, name_first - m_base);
+         return result;
+      }
       ++m_position;
       string_type s = this->m_traits.lookup_collatename(name_first, name_last);
       if(s.empty() || (s.size() > 2))
+      {
          fail(regex_constants::error_collate, name_first - m_base);
+         return result;
+      }
       result.first = s[0];
       if(s.size() > 1)
          result.second = s[1];
@@ -1005,7 +1134,10 @@ charT basic_regex_parser<charT, traits>::unescape_character()
 {
    charT result(0);
    if(m_position == m_end)
+   {
       fail(regex_constants::error_escape, m_position - m_base);
+      return false;
+   }
    switch(this->m_traits.escape_syntax_type(*m_position))
    {
    case regex_constants::escape_type_control_a:
@@ -1054,7 +1186,7 @@ charT basic_regex_parser<charT, traits>::unescape_character()
       if(m_position == m_end)
       {
          fail(regex_constants::error_escape, m_position - m_base);
-         break;
+         return result;
       }
       // maybe have \x{ddd}
       if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_open_brace)
@@ -1063,7 +1195,7 @@ charT basic_regex_parser<charT, traits>::unescape_character()
          if(m_position == m_end)
          {
             fail(regex_constants::error_escape, m_position - m_base);
-            break;
+            return result;
          }
          int i = this->m_traits.toi(m_position, m_end, 16);
          if((m_position == m_end)
@@ -1072,6 +1204,7 @@ charT basic_regex_parser<charT, traits>::unescape_character()
             || (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_brace))
          {
             fail(regex_constants::error_badbrace, m_position - m_base);
+            return result;
          }
          ++m_position;
          result = charT(i);
@@ -1084,6 +1217,7 @@ charT basic_regex_parser<charT, traits>::unescape_character()
             || (i >> (sizeof(charT) * CHAR_BIT)))
          {
             fail(regex_constants::error_escape, m_position - m_base);
+            return result;
          }
          result = charT(i);
       }
@@ -1095,7 +1229,10 @@ charT basic_regex_parser<charT, traits>::unescape_character()
       std::ptrdiff_t len = (std::min)(::boost::re_detail::distance(m_position, m_end), static_cast<std::ptrdiff_t>(4));
       int val = this->m_traits.toi(m_position, m_position + len, 8);
       if(val < 0) 
+      {
          fail(regex_constants::error_escape, m_position - m_base);
+         return result;
+      }
       return static_cast<charT>(val);
       }
    default:
@@ -1124,7 +1261,10 @@ bool basic_regex_parser<charT, traits>::parse_backref()
       this->append_literal(c);
    }
    else
+   {
       fail(regex_constants::error_backref, m_position - m_end);
+      return false;
+   }
    return true;
 }
 
@@ -1184,7 +1324,10 @@ template <class charT, class traits>
 bool basic_regex_parser<charT, traits>::parse_perl_extension()
 {
    if(++m_position == m_end)
+   {
       fail(regex_constants::error_badrepeat, m_position - m_base);
+      return false;
+   }
    //
    // treat comments as a special case, as these
    // are the only ones that don't start with a leading
@@ -1243,14 +1386,20 @@ bool basic_regex_parser<charT, traits>::parse_perl_extension()
       {
          // a lookbehind assertion:
          if(++m_position == m_end)
+         {
             fail(regex_constants::error_badrepeat, m_position - m_base);
+            return false;
+         }
          regex_constants::syntax_type t = this->m_traits.syntax_type(*m_position);
          if(t == regex_constants::syntax_not)
             pb->index = markid = -2;
          else if(t == regex_constants::syntax_equal)
             pb->index = markid = -1;
          else
+         {
             fail(regex_constants::error_badrepeat, m_position - m_base);
+            return false;
+         }
          ++m_position;
          jump_offset = this->getoffset(this->append_state(syntax_element_jump, sizeof(re_jump)));
          this->append_state(syntax_element_backstep, sizeof(re_brace));
@@ -1273,38 +1422,62 @@ bool basic_regex_parser<charT, traits>::parse_perl_extension()
       // a conditional expression:
       pb->index = markid = -4;
       if(++m_position == m_end)
+      {
          fail(regex_constants::error_badrepeat, m_position - m_base);
+         return false;
+      }
       int v = this->m_traits.toi(m_position, m_end, 10);
       if(v > 0)
       {
          re_brace* br = static_cast<re_brace*>(this->append_state(syntax_element_assert_backref, sizeof(re_brace)));
          br->index = v;
          if(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_mark)
+         {
             fail(regex_constants::error_badrepeat, m_position - m_base);
+            return false;
+         }
          if(++m_position == m_end)
+         {
             fail(regex_constants::error_badrepeat, m_position - m_base);
+            return false;
+         }
       }
       else
       {
          // verify that we have a lookahead or lookbehind assert:
          if(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_question)
+         {
             fail(regex_constants::error_badrepeat, m_position - m_base);
+            return false;
+         }
          if(++m_position == m_end)
+         {
             fail(regex_constants::error_badrepeat, m_position - m_base);
+            return false;
+         }
          if(this->m_traits.syntax_type(*m_position) == regex_constants::escape_type_left_word)
          {
             if(++m_position == m_end)
+            {
                fail(regex_constants::error_badrepeat, m_position - m_base);
+               return false;
+            }
             if((this->m_traits.syntax_type(*m_position) != regex_constants::syntax_equal)
                && (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_not))
+            {
                fail(regex_constants::error_badrepeat, m_position - m_base);
+               return false;
+            }
             m_position -= 3;
          }
          else
          {
             if((this->m_traits.syntax_type(*m_position) != regex_constants::syntax_equal)
                && (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_not))
+            {
                fail(regex_constants::error_badrepeat, m_position - m_base);
+               return false;
+            }
             m_position -= 2;
          }
       }
@@ -1332,7 +1505,10 @@ bool basic_regex_parser<charT, traits>::parse_perl_extension()
          ++m_position;
       }
       else
+      {
          fail(regex_constants::error_badrepeat, m_position - m_base);
+         return false;
+      }
 
       // finally append a case change state if we need it:
       if(m_has_case_change)
@@ -1352,7 +1528,10 @@ bool basic_regex_parser<charT, traits>::parse_perl_extension()
    // we either have a ')' or we have run out of characters prematurely:
    //
    if(m_position == m_end)
+   {
       this->fail(regex_constants::error_paren, ::boost::re_detail::distance(m_base, m_end));
+      return false;
+   }
    BOOST_ASSERT(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_close_mark);
    ++m_position;
    //
@@ -1381,6 +1560,7 @@ bool basic_regex_parser<charT, traits>::parse_perl_extension()
       {
          // Oops... we didn't have anything inside the assertion:
          fail(regex_constants::error_empty, m_position - m_base);
+         return false;
       }
    }
    //
@@ -1396,7 +1576,10 @@ bool basic_regex_parser<charT, traits>::parse_perl_extension()
          alt->alt.i = this->m_pdata->m_data.size() - this->getoffset(alt);
       }
       else if(this->getaddress(static_cast<re_alt*>(b)->alt.i, b)->type == syntax_element_alt)
+      {
          fail(regex_constants::error_bad_pattern, m_position - m_base);
+         return false;
+      }
    }
    //
    // append closing parenthesis state:
@@ -1443,14 +1626,20 @@ regex_constants::syntax_option_type basic_regex_parser<charT, traits>::parse_opt
          continue;
       }
       if(++m_position == m_end)
+      {
          fail(regex_constants::error_paren, m_position - m_base);
+         return false;
+      }
    }
    while(!breakout);
 
    if(*m_position == static_cast<charT>('-'))
    {
       if(++m_position == m_end)
+      {
          fail(regex_constants::error_paren, m_position - m_base);
+         return false;
+      }
       do
       {
          switch(*m_position)
@@ -1473,7 +1662,10 @@ regex_constants::syntax_option_type basic_regex_parser<charT, traits>::parse_opt
             continue;
          }
          if(++m_position == m_end)
+         {
             fail(regex_constants::error_paren, m_position - m_base);
+            return false;
+         }
       }
       while(!breakout);
    }
diff --git a/include/boost/regex/v4/cpp_regex_traits.hpp b/include/boost/regex/v4/cpp_regex_traits.hpp
index 1bc2d8ee..c8b1a975 100644
--- a/include/boost/regex/v4/cpp_regex_traits.hpp
+++ b/include/boost/regex/v4/cpp_regex_traits.hpp
@@ -472,7 +472,9 @@ typename cpp_regex_traits_implementation<charT>::string_type
       if(pos != m_custom_collate_names.end())
          return pos->second;
    }
-#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
+               && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)\
+               && !BOOST_WORKAROUND(__BORLANDC__, <= 0x0551)
    std::string name(p1, p2);
 #else
    std::string name;
@@ -481,7 +483,9 @@ typename cpp_regex_traits_implementation<charT>::string_type
 	   name.append(1, char(*p0++));
 #endif
    name = lookup_default_collate_name(name);
-#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
+               && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)\
+               && !BOOST_WORKAROUND(__BORLANDC__, <= 0x0551)
    if(name.size())
       return string_type(name.begin(), name.end());
 #else
@@ -759,7 +763,7 @@ private:
 template <class charT>
 int cpp_regex_traits<charT>::toi(const charT*& first, const charT* last, int radix)const
 {
-   m_pimpl->m_sbuf.pubsetbuf(const_cast<charT*>(first), static_cast<std::streamsize>(last-first));
+   m_pimpl->m_sbuf.pubsetbuf(const_cast<charT*>(static_cast<const charT*>(first)), static_cast<std::streamsize>(last-first));
    m_pimpl->m_is.clear();
    if(std::abs(radix) == 16) m_pimpl->m_is >> std::hex;
    else if(std::abs(radix) == 8) m_pimpl->m_is >> std::oct;
diff --git a/include/boost/regex/v4/cregex.hpp b/include/boost/regex/v4/cregex.hpp
index 6f420bcc..0697d5df 100644
--- a/include/boost/regex/v4/cregex.hpp
+++ b/include/boost/regex/v4/cregex.hpp
@@ -272,7 +272,7 @@ public:
    std::string What(int i = 0)const;
    std::string operator[](int i)const { return What(i); }
 
-   static const unsigned int npos;
+   static const std::size_t npos;
 
    friend struct re_detail::pred1;
    friend struct re_detail::pred2;
diff --git a/include/boost/regex/v4/perl_matcher_recursive.hpp b/include/boost/regex/v4/perl_matcher_recursive.hpp
index 84a79189..df42c686 100644
--- a/include/boost/regex/v4/perl_matcher_recursive.hpp
+++ b/include/boost/regex/v4/perl_matcher_recursive.hpp
@@ -454,7 +454,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_fast()
          ++position;
          ++count;
       }
-      if((rep->leading) && (count == UINT_MAX))
+      if((rep->leading) && (rep->max == UINT_MAX))
          restart = position;
       pstate = rep->alt.p;
       save_pos = position;
diff --git a/include/boost/regex/v4/regex_format.hpp b/include/boost/regex/v4/regex_format.hpp
index cccc5029..372338e4 100644
--- a/include/boost/regex/v4/regex_format.hpp
+++ b/include/boost/regex/v4/regex_format.hpp
@@ -145,6 +145,8 @@ void basic_regex_formatter<OutputIterator, Results, traits>::format_all()
          {
             ++m_position;
             format_until_scope_end();
+            if(m_position == m_end)
+               return;
             BOOST_ASSERT(*m_position == static_cast<char_type>(')'));
             ++m_position;  // skip the closing ')'
             break;
@@ -335,6 +337,26 @@ void basic_regex_formatter<OutputIterator, Results, traits>::format_escape()
       put(static_cast<char_type>(27));
       ++m_position;
       break;
+   case 'l':
+      ++m_position;
+      m_state = output_next_lower;
+      break;
+   case 'L':
+      ++m_position;
+      m_state = output_lower;
+      break;
+   case 'u':
+      ++m_position;
+      m_state = output_next_upper;
+      break;
+   case 'U':
+      ++m_position;
+      m_state = output_upper;
+      break;
+   case 'E':
+      ++m_position;
+      m_state = output_copy;
+      break;
    default:
       // see if we have a \n sed style backreference:
       int v = m_traits.toi(m_position, m_position+1, 10);
diff --git a/include/boost/regex/v4/sub_match.hpp b/include/boost/regex/v4/sub_match.hpp
index e42633b0..1c0d7fe7 100644
--- a/include/boost/regex/v4/sub_match.hpp
+++ b/include/boost/regex/v4/sub_match.hpp
@@ -42,7 +42,9 @@ struct sub_match : public std::pair<BidiIterator, BidiIterator>
 
    sub_match() : std::pair<BidiIterator, BidiIterator>(), matched(false) {}
    sub_match(BidiIterator i) : std::pair<BidiIterator, BidiIterator>(i, i), matched(false) {}
-#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) && !BOOST_WORKAROUND(BOOST_MSVC, < 1310) 
+#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
+               && !BOOST_WORKAROUND(BOOST_MSVC, < 1310)\
+               && !BOOST_WORKAROUND(__BORLANDC__, <= 0x0551)
    template <class T, class A>
    operator std::basic_string<value_type, T, A> ()const
    {
diff --git a/include/boost/regex/v4/w32_regex_traits.hpp b/include/boost/regex/v4/w32_regex_traits.hpp
index 38221713..39a2d3b7 100644
--- a/include/boost/regex/v4/w32_regex_traits.hpp
+++ b/include/boost/regex/v4/w32_regex_traits.hpp
@@ -362,7 +362,9 @@ typename w32_regex_traits_implementation<charT>::string_type
       if(pos != m_custom_collate_names.end())
          return pos->second;
    }
-#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
+               && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)\
+               && !BOOST_WORKAROUND(__BORLANDC__, <= 0x0551)
    std::string name(p1, p2);
 #else
    std::string name;
@@ -371,7 +373,9 @@ typename w32_regex_traits_implementation<charT>::string_type
 	   name.append(1, char(*p0++));
 #endif
    name = lookup_default_collate_name(name);
-#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
+               && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)\
+               && !BOOST_WORKAROUND(__BORLANDC__, <= 0x0551)
    if(name.size())
       return string_type(name.begin(), name.end());
 #else
diff --git a/src/c_regex_traits.cpp b/src/c_regex_traits.cpp
index b6caef94..4ccb985f 100644
--- a/src/c_regex_traits.cpp
+++ b/src/c_regex_traits.cpp
@@ -177,7 +177,10 @@ bool BOOST_REGEX_CALL c_regex_traits<char>::isctype(char c, char_class_type mask
 c_regex_traits<char>::string_type BOOST_REGEX_CALL c_regex_traits<char>::lookup_collatename(const char* p1, const char* p2)
 {
    std::string s(p1, p2);
-   return ::boost::re_detail::lookup_default_collate_name(s);
+   s = ::boost::re_detail::lookup_default_collate_name(s);
+   if(s.empty() && (p2-p1 == 1))
+      s.append(1, *p1);
+   return s;
 }
 
 int BOOST_REGEX_CALL c_regex_traits<char>::value(char c, int radix)
diff --git a/src/cregex.cpp b/src/cregex.cpp
index 693906eb..7de3b9a3 100644
--- a/src/cregex.cpp
+++ b/src/cregex.cpp
@@ -566,8 +566,11 @@ std::string RegEx::What(int i)const
    return result;
 }
 
-const unsigned int RegEx::npos = ~0u;
-
+#ifdef BOOST_HAS_LONG_LONG
+const std::size_t RegEx::npos = ~0ULL;
+#else
+const std::size_t RegEx::npos = ~0UL;
+#endif
 
 } // namespace boost
 
diff --git a/src/regex.cpp b/src/regex.cpp
index dc7a221d..9a40322c 100644
--- a/src/regex.cpp
+++ b/src/regex.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 1998-2002
+ * Copyright (c) 1998-2004
  * Dr John Maddock
  *
  * Use, modification and distribution are subject to the 
@@ -70,7 +70,9 @@ regex_error::~regex_error() throw()
 
 void regex_error::raise()const
 {
+#ifndef BOOST_NO_EXCEPTIONS
    ::boost::throw_exception(*this);
+#endif
 }
 
 
diff --git a/src/regex_raw_buffer.cpp b/src/regex_raw_buffer.cpp
index 3d38a591..d2d8642b 100644
--- a/src/regex_raw_buffer.cpp
+++ b/src/regex_raw_buffer.cpp
@@ -1,3 +1,20 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr John Maddock
+ *
+ * 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)
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         regex_raw_buffer.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Member functions for class raw_storage.
+  */
 
 
 #define BOOST_REGEX_SOURCE
diff --git a/src/wc_regex_traits.cpp b/src/wc_regex_traits.cpp
index c38bbd1a..49bc0520 100644
--- a/src/wc_regex_traits.cpp
+++ b/src/wc_regex_traits.cpp
@@ -169,7 +169,9 @@ bool BOOST_REGEX_CALL c_regex_traits<wchar_t>::isctype(wchar_t c, char_class_typ
 
 c_regex_traits<wchar_t>::string_type BOOST_REGEX_CALL c_regex_traits<wchar_t>::lookup_collatename(const wchar_t* p1, const wchar_t* p2) const
 {
-#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
+               && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)\
+               && !BOOST_WORKAROUND(__BORLANDC__, <= 0x0551)
    std::string name(p1, p2);
 #else
    std::string name;
@@ -178,7 +180,9 @@ c_regex_traits<wchar_t>::string_type BOOST_REGEX_CALL c_regex_traits<wchar_t>::l
 	   name.append(1, char(*p0++));
 #endif
    name = ::boost::re_detail::lookup_default_collate_name(name);
-#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
+               && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)\
+               && !BOOST_WORKAROUND(__BORLANDC__, <= 0x0551)
    if(name.size())
       return string_type(name.begin(), name.end());
 #else
diff --git a/test/profile/Makefile b/test/profile/Makefile
new file mode 100644
index 00000000..4c52a8e1
--- /dev/null
+++ b/test/profile/Makefile
@@ -0,0 +1,11 @@
+
+
+regress :
+	g++ -fprofile-arcs -ftest-coverage -DBOOST_REGEX_RECURSIVE -DBOOST_REGEX_BLOCKSIZE=512 -DBOOST_REGEX_MAX_CACHE_BLOCKS=0 -DBOOST_REGEX_MATCH_EXTRA -g -I../../../../ -o regress ../regress/*.cpp ../../src/*.cpp ../../../test/src/ex*.cpp ../../../test/src/cpp_main.cpp
+	./regress
+	gcov basic_tests.cpp
+
+
+
+
+
diff --git a/test/regress/basic_tests.cpp b/test/regress/basic_tests.cpp
index ec84858c..f4208e82 100644
--- a/test/regress/basic_tests.cpp
+++ b/test/regress/basic_tests.cpp
@@ -1,3 +1,20 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr John Maddock
+ *
+ * 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)
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         basic_tests.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: main regex test declarations.
+  */
 
 #include <boost/detail/workaround.hpp>
 
@@ -354,8 +371,12 @@ void test_sets2()
    TEST_REGEX_SEARCH("[[.two.]]", perl, "2", match_default, make_array(0, 1, -2, -2));
    TEST_REGEX_SEARCH("[[.three.]]", perl, "3", match_default, make_array(0, 1, -2, -2));
    TEST_REGEX_SEARCH("[[.a.]]", perl, "bac", match_default, make_array(1, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.\xf0.]]", perl, "b\xf0x", match_default, make_array(1, 2, -2, -2));
    TEST_REGEX_SEARCH("[[.right-curly-bracket.]]", perl, "}", match_default, make_array(0, 1, -2, -2));
    TEST_REGEX_SEARCH("[[.NUL.]]", perl, "\0", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[.NUL.][.ae.]]", perl, "\0", match_default, make_array(0, 1, -2, -2));
+   TEST_INVALID_REGEX("[[..]]", perl);
+   TEST_INVALID_REGEX("[[.not-a-collating-element.]]", perl);
    TEST_INVALID_REGEX("[[.", perl);
    TEST_INVALID_REGEX("[[.N", perl);
    TEST_INVALID_REGEX("[[.NUL", perl);
@@ -414,7 +435,7 @@ void test_sets2()
    TEST_REGEX_SEARCH("[[.ae.]-b]", perl|icase, "AE", match_default, make_array(0, 2, -2, -2));
    TEST_REGEX_SEARCH("[[.ae.][:lower:]]", perl|icase, "AE", match_default, make_array(0, 2, -2, -2));
    TEST_REGEX_SEARCH("[[.ae.][:lower:]]", perl|icase, "A", match_default, make_array(0, 1, -2, -2));
-   TEST_REGEX_SEARCH("[[.ae.][=a=]]", perl, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[.ae.][=a=]]+", perl, "zzaA", match_default, make_array(2, 4, -2, -2));
    TEST_INVALID_REGEX("[d-[.ae.]]", perl);
    //
    // try some equivalence classes:
@@ -460,6 +481,7 @@ void test_anchors()
    TEST_REGEX_SEARCH("ab$", extended, "ab", match_default, make_array(0, 2, -2, -2));
    TEST_REGEX_SEARCH("ab$", extended, "abxx", match_default, make_array(-2, -2));
    TEST_REGEX_SEARCH("ab$", extended, "ab\nzz", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("^ab", extended, "\n\n  a", match_default, make_array(-2, -2));
 
    TEST_REGEX_SEARCH("^ab", basic, "ab", match_default, make_array(0, 2, -2, -2));
    TEST_REGEX_SEARCH("^ab", basic, "xxabxx", match_default, make_array(-2, -2));
@@ -589,12 +611,20 @@ void test_assertion_escapes()
    TEST_REGEX_SEARCH("\\<ab", perl, "cab", match_default, make_array(-2, -2));
    TEST_REGEX_SEARCH("\\<ab", perl, "\nab", match_default, make_array(1, 3, -2, -2));
    TEST_REGEX_SEARCH("\\<tag", perl, "::tag", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\<abcd", perl, "abcd", match_default|match_not_bow, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\<abcd", perl, "  abcd", match_default|match_not_bow, make_array(2, 6, -2, -2));
+   TEST_REGEX_SEARCH("\\<", perl, "ab ", match_default|match_not_bow, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".\\<.", perl, "ab", match_default|match_not_bow, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".\\<.", perl, " b", match_default|match_not_bow, make_array(0, 2, -2, -2));
    // word end:
    TEST_REGEX_SEARCH("abc\\>", perl, "abc", match_default, make_array(0, 3, -2, -2));
    TEST_REGEX_SEARCH("abc\\>", perl, "abcd", match_default, make_array(-2, -2));
    TEST_REGEX_SEARCH("abc\\>", perl, "abc\n", match_default, make_array(0, 3, -2, -2));
    TEST_REGEX_SEARCH("abc\\>", perl, "abc::", match_default, make_array(0,3, -2, -2));
    TEST_REGEX_SEARCH("abc(?:\\>..|$)", perl, "abc::", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\>", perl, "  ", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".\\>.", perl, "  ", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("abc\\>", perl, "abc", match_default|match_not_eow, make_array(-2, -2));
    // word boundary:
    TEST_REGEX_SEARCH("\\babcd", perl, "  abcd", match_default, make_array(2, 6, -2, -2));
    TEST_REGEX_SEARCH("\\bab", perl, "cab", match_default, make_array(-2, -2));
@@ -604,6 +634,7 @@ void test_assertion_escapes()
    TEST_REGEX_SEARCH("abc\\b", perl, "abcd", match_default, make_array(-2, -2));
    TEST_REGEX_SEARCH("abc\\b", perl, "abc\n", match_default, make_array(0, 3, -2, -2));
    TEST_REGEX_SEARCH("abc\\b", perl, "abc::", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\babcd", perl, "abcd", match_default|match_not_bow, make_array(-2, -2));
    // within word:
    TEST_REGEX_SEARCH("\\B", perl, "ab", match_default, make_array(1, 1, -2, -2));
    TEST_REGEX_SEARCH("a\\Bb", perl, "ab", match_default, make_array(0, 2, -2, -2));
@@ -635,6 +666,7 @@ void test_assertion_escapes()
    TEST_REGEX_SEARCH("abc\\z", perl, "abc", match_default, make_array(0, 3, -2, -2));
    TEST_REGEX_SEARCH("abc\\z", perl, "abcd", match_default, make_array(-2, -2));
    TEST_REGEX_SEARCH("abc\\Z", perl, "abc\n\n", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc\\Z", perl, "abc\n\n", match_default|match_not_eob, make_array(-2, -2));
    TEST_REGEX_SEARCH("abc\\Z", perl, "abc", match_default, make_array(0, 3, -2, -2));
    TEST_REGEX_SEARCH("\\Gabc", perl, "abc", match_default, make_array(0, 3, -2, -2));
    TEST_REGEX_SEARCH("\\Gabc", perl, "dabcd", match_default, make_array(-2, -2));
@@ -737,6 +769,7 @@ void test_tricky_cases()
    TEST_REGEX_SEARCH("a(b+|((c)*))+d", extended, "abcd", match_default, make_array(0, 4, 2, 3, 2, 3, 2, 3, -2, -2));
    // literals:
    TEST_REGEX_SEARCH("\\**?/{}", literal, "\\**?/{}", match_default, make_array(0, 7, -2, -2));
+   TEST_REGEX_SEARCH("\\**?/{}", literal, "\\**?/{", match_default, make_array(-2, -2));
    // try to match C++ syntax elements:
    // line comment:
    TEST_REGEX_SEARCH("//[^\\n]*", perl, "++i //here is a line comment\n", match_default, make_array(4, 28, -2, -2));
@@ -971,6 +1004,7 @@ void test_replace()
    TEST_REGEX_REPLACE("(a+)b+", perl, "...aaabbb,,,", match_default|format_no_copy, "$1", "aaa");
    TEST_REGEX_REPLACE("[[:digit:]]*", perl, "123ab", match_default|format_no_copy, "<$0>", "<123><><><>");
    TEST_REGEX_REPLACE("[[:digit:]]*", perl, "123ab1", match_default|format_no_copy, "<$0>", "<123><><><1><>");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "$`$", "...$");
    // and now escapes:
    TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "$x", "$x");
    TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\a", "\a");
@@ -978,11 +1012,24 @@ void test_replace()
    TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\n", "\n");
    TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\r", "\r");
    TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\t", "\t");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\v", "\v");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\", "\\");
    TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\x21", "!");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\xz", "xz");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\x", "x");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\x{z}", "x{z}");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\x{12b", "x{12b");
    TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\x{21}", "!");
    TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\c@", "\0");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\c", "c");
    TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\e", "\x1B");
    TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\0101", "A");
+   TEST_REGEX_REPLACE("(a+)", perl, "...aaa,,,", match_default|format_no_copy, "\\u$1", "Aaa");
+   TEST_REGEX_REPLACE("(a+)", perl, "...aaa,,,", match_default|format_no_copy, "\\U$1", "AAA");
+   TEST_REGEX_REPLACE("(a+)", perl, "...aaa,,,", match_default|format_no_copy, "\\U$1\\E$1", "AAAaaa");
+   TEST_REGEX_REPLACE("(A+)", perl, "...AAA,,,", match_default|format_no_copy, "\\l$1", "aAA");
+   TEST_REGEX_REPLACE("(A+)", perl, "...AAA,,,", match_default|format_no_copy, "\\L$1", "aaa");
+   TEST_REGEX_REPLACE("(A+)", perl, "...AAA,,,", match_default|format_no_copy, "\\L$1\\E$1", "aaaAAA");
    // sed format sequences:
    TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_sed|format_no_copy, "\\0", "aabb");
    TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_sed|format_no_copy, "\\1", "aa");
@@ -998,6 +1045,7 @@ void test_replace()
    TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_perl|format_no_copy, "$1", "aa");
    TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_perl|format_no_copy, "$2", "bb");
    TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_perl|format_no_copy, "$&", "aabb");
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_perl|format_no_copy, "$$", "$");
    TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_perl|format_no_copy, "&", "&");
    TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_perl|format_no_copy, "\\0", "\0");
    TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_perl|format_no_copy, "()?:", "()?:");
@@ -1020,6 +1068,14 @@ void test_replace()
    TEST_REGEX_REPLACE("(a+)|(b+)", perl, "...aaabb,,,ab*abbb?", match_default|format_all, "?1:B", "...B,,,B*B?");
    TEST_REGEX_REPLACE("(a+)|(b+)", perl, "...aaabb,,,ab*abbb?", match_default|format_all, "(?1A:(?2B))", "...AB,,,AB*AB?");
    TEST_REGEX_REPLACE("X", literal, "XX", match_default, "Y", "YY");
+   TEST_REGEX_REPLACE("(a+)|(b+)", perl, "...aaabb,,,ab*abbb?", match_default|format_all, "(?", "...??,,,??*???");
+   TEST_REGEX_REPLACE("(a+)|(b+)", perl, "...aaabb,,,ab*abbb?", match_default|format_all, "(?a", "...?a?a,,,?a?a*?a?a?");
+   TEST_REGEX_REPLACE("(a+)|(b+)", perl, "...aaabb,,,ab*abbb?", match_default|format_all, "(?1A:(?2B))abc", "...AabcBabc,,,AabcBabc*AabcBabc?");
+   TEST_REGEX_REPLACE("a+(b+)", perl, "...aaabb,,,", match_default|format_all|format_no_copy, "(?2abc:def)", "def");
+   TEST_REGEX_REPLACE("a+(b+)", perl, "...aaabb,,,", match_default|format_all|format_no_copy, "(?1abc:def)", "abc");
+   TEST_REGEX_REPLACE("a+(b+)", perl, "...aaabb,,,", match_default|format_perl|format_no_copy, "(?1abc:def)", "(?1abc:def)");
+   TEST_REGEX_REPLACE("a+(b+)", perl, "...", match_default|format_perl, "(?1abc:def)", "...");
+   TEST_REGEX_REPLACE("a+(b+)", perl, "...", match_default|format_perl|format_no_copy, "(?1abc:def)", "");
 }
 
 void test_non_greedy_repeats()
@@ -1141,6 +1197,9 @@ void test_fast_repeats()
    TEST_REGEX_SEARCH("ab.*xy", perl, "ab_xy", match_default, make_array(0, 5, -2, -2));
    TEST_REGEX_SEARCH("ab.*", perl, "ab", match_default, make_array(0, 2, -2, -2));
    TEST_REGEX_SEARCH("ab.*", perl, "ab__", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH(".*xy", perl, "abc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".*?xy", perl, "abc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a+?xy", perl, "abc", match_default, make_array(-2, -2));
 
    TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab__xy_", match_default, make_array(0, 6, -2, -2));
    TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab____xy_", match_default, make_array(0, 8, -2, -2));
@@ -1176,6 +1235,10 @@ void test_fast_repeats()
    TEST_REGEX_SEARCH("ab.*xy", perl, "ab_xy", match_not_dot_newline|match_not_dot_null, make_array(0, 5, -2, -2));
    TEST_REGEX_SEARCH("ab.*", perl, "ab", match_not_dot_newline|match_not_dot_null, make_array(0, 2, -2, -2));
    TEST_REGEX_SEARCH("ab.*", perl, "ab__", match_not_dot_newline|match_not_dot_null, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH(".*xy", perl, "abc", match_not_dot_newline|match_not_dot_null, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".*?xy", perl, "abc", match_not_dot_newline|match_not_dot_null, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".*xy", perl, "ab\nbc", match_not_dot_newline|match_not_dot_null, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".*?xy", perl, "ax\nbc", match_not_dot_newline|match_not_dot_null, make_array(-2, -2));
 
    TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab__xy_", match_not_dot_newline|match_not_dot_null, make_array(0, 6, -2, -2));
    TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab____xy_", match_not_dot_newline|match_not_dot_null, make_array(0, 8, -2, -2));
@@ -1211,6 +1274,7 @@ void test_fast_repeats()
    TEST_REGEX_SEARCH("ab_*xy", perl, "ab_xy", match_default, make_array(0, 5, -2, -2));
    TEST_REGEX_SEARCH("ab_*", perl, "ab", match_default, make_array(0, 2, -2, -2));
    TEST_REGEX_SEARCH("ab_*", perl, "ab__", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab_*?z", perl, "ab__", match_default, make_array(-2, -2));
 
    TEST_REGEX_SEARCH("ab_{2,5}xy", perl, "ab__xy_", match_default, make_array(0, 6, -2, -2));
    TEST_REGEX_SEARCH("ab_{2,5}xy", perl, "ab____xy_", match_default, make_array(0, 8, -2, -2));
@@ -1239,7 +1303,11 @@ void test_fast_repeats()
    TEST_REGEX_SEARCH("ab_{2,5}?xy", perl, "ab______xy", match_default, make_array(-2, -2));
    TEST_REGEX_SEARCH("ab_{2,5}xy", perl, "ab_xy", match_default, make_array(-2, -2));
    TEST_REGEX_SEARCH("(5*?).somesite", perl, "//555.somesite", match_default, make_array(2, 14, 2, 5, -2, -2));
+}
 
+void test_fast_repeats2()
+{
+   using namespace boost::regex_constants;
    // and again for sets:
    TEST_REGEX_SEARCH("ab[_,;]*xy", perl, "abxy_", match_default, make_array(0, 4, -2, -2));
    TEST_REGEX_SEARCH("ab[_,;]*xy", perl, "ab_xy_", match_default, make_array(0, 5, -2, -2));
@@ -1247,6 +1315,10 @@ void test_fast_repeats()
    TEST_REGEX_SEARCH("ab[_,;]*xy", perl, "ab_xy", match_default, make_array(0, 5, -2, -2));
    TEST_REGEX_SEARCH("ab[_,;]*", perl, "ab", match_default, make_array(0, 2, -2, -2));
    TEST_REGEX_SEARCH("ab[_,;]*", perl, "ab__", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]*?xy", perl, "ab__z", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]*?z", perl, "ab__", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]*?.z", perl, "ab__,;,__z", match_default, make_array(0, 10, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]*?.z", perl, "ab__,;,__y", match_default, make_array(-2, -2));
 
    TEST_REGEX_SEARCH("ab[_,;]{2,5}xy", perl, "ab__xy_", match_default, make_array(0, 6, -2, -2));
    TEST_REGEX_SEARCH("ab[_,;]{2,5}xy", perl, "ab____xy_", match_default, make_array(0, 8, -2, -2));
diff --git a/test/regress/bc55.mak b/test/regress/bc55.mak
index 14cb0210..7729f8a5 100644
--- a/test/regress/bc55.mak
+++ b/test/regress/bc55.mak
@@ -11,7 +11,7 @@ BCROOT=$(MAKEDIR)\..
 #
 # sources to compile for each test:
 #
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 BCC32   = $(BCROOT)\bin\Bcc32.exe 
 TLINK32 = $(BCROOT)\bin\ILink32.exe
@@ -141,3 +141,4 @@ r6lm.exe : $(SOURCES)
 
 
 
+
diff --git a/test/regress/bcb4.mak b/test/regress/bcb4.mak
index 7fd6f842..19179d37 100644
--- a/test/regress/bcb4.mak
+++ b/test/regress/bcb4.mak
@@ -14,7 +14,7 @@ TLINK32 = $(BCROOT)\bin\ILink32.exe
 #
 # sources to compile for each test:
 #
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 IDE_LinkFLAGS32 =  -L$(BCROOT)\LIB
 LINKOPTS= -ap -Tpe -x
@@ -191,3 +191,4 @@ r6lv.exe : $(SOURCES)
 
 
 
+
diff --git a/test/regress/bcb5.mak b/test/regress/bcb5.mak
index e539c839..7ed4bd71 100644
--- a/test/regress/bcb5.mak
+++ b/test/regress/bcb5.mak
@@ -11,7 +11,7 @@ BCROOT=$(MAKEDIR)\..
 #
 # sources to compile for each test:
 #
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 BCC32   = $(BCROOT)\bin\Bcc32.exe 
 TLINK32 = $(BCROOT)\bin\ILink32.exe
@@ -193,3 +193,4 @@ r6lv.exe : $(SOURCES)
 
 
 
+
diff --git a/test/regress/bcb6.mak b/test/regress/bcb6.mak
index ea132fef..c466728b 100644
--- a/test/regress/bcb6.mak
+++ b/test/regress/bcb6.mak
@@ -11,7 +11,7 @@ BCROOT=$(MAKEDIR)\..
 #
 # sources to compile for each test:
 #
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 BCC32   = $(BCROOT)\bin\Bcc32.exe 
 TLINK32 = $(BCROOT)\bin\ILink32.exe
@@ -203,5 +203,6 @@ r6lv.exe : $(SOURCES)
 
 
 
+
 
 
diff --git a/test/regress/gcc.mak b/test/regress/gcc.mak
index 8d909c3d..9309ff0d 100644
--- a/test/regress/gcc.mak
+++ b/test/regress/gcc.mak
@@ -7,16 +7,18 @@ CXX= g++ $(INCLUDES) -L../../../../stage/lib -I../../../../ -I./ $(CXXFLAGS) -L.
 #
 # sources to compile for each test:
 #
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 total : gcc_regress
 	export LD_LIBRARY_PATH="../../build/gcc:$LD_LIBRARY_PATH" && ./gcc_regress tests.txt
 
 gcc_regress : $(SOURCES)
-	$(CXX) -O2 -o gcc_regress $(SOURCES) -lboost_regex $(LIBS)
+	$(CXX) -O2 -o gcc_regress $(SOURCES) ../../build/gcc/libboost_regex-gcc*.a $(LIBS)
 
 debug : $(SOURCES)
-	$(CXX) -g -o gcc_regress $(SOURCES) -lboost_regex_debug $(LIBS)
+	$(CXX) -g -o gcc_regress $(SOURCES) ../../build/gcc/libboost_regex-gcc-d*.a $(LIBS)
+
+
 
 
 
diff --git a/test/regress/info.hpp b/test/regress/info.hpp
index 23189574..5e396f47 100644
--- a/test/regress/info.hpp
+++ b/test/regress/info.hpp
@@ -1,3 +1,20 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr John Maddock
+ *
+ * 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)
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         info.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Error handling for test cases.
+  */
 
 #ifndef BOOST_REGEX_REGRESS_INFO_HPP
 #define BOOST_REGEX_REGRESS_INFO_HPP
diff --git a/test/regress/main.cpp b/test/regress/main.cpp
index 5464e7ba..5630d723 100644
--- a/test/regress/main.cpp
+++ b/test/regress/main.cpp
@@ -1,3 +1,20 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr John Maddock
+ *
+ * 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)
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         main.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: entry point for test program.
+  */
 
 #include "test.hpp"
 #include <stdarg.h>
@@ -24,6 +41,7 @@ int cpp_main(int argc, char * argv[])
    test_partial_match();
    test_forward_lookahead_asserts();
    test_fast_repeats();
+   test_fast_repeats2();
    test_independent_subs();
    test_nosubs();
    test_conditionals();
@@ -66,3 +84,16 @@ const int* make_array(int first, ...)
    return data;
 }
 
+#ifdef BOOST_NO_EXCEPTIONS
+
+namespace boost{
+
+void throw_exception(std::exception const & e)
+{
+   std::abort();
+}
+
+}
+
+#endif
+
diff --git a/test/regress/sunpro.mak b/test/regress/sunpro.mak
index 7b9d39cf..9ac427e7 100644
--- a/test/regress/sunpro.mak
+++ b/test/regress/sunpro.mak
@@ -8,7 +8,7 @@ CXX= CC $(INCLUDES) -I../../../../ -I./ $(CXXFLAGS) -L../../../../stage/lib -L..
 #
 # sources to compile for each test:
 #
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 total : r rm r/regress rm/regress rs rms rs/regress rms/regress rw rmw rw/regress rmw/regress rsw rmsw rsw/regress rmsw/regress
 	echo testsing narrow character versions:
@@ -133,5 +133,6 @@ clean:
 
 
 
+
 
 
diff --git a/test/regress/test.hpp b/test/regress/test.hpp
index 5dd8eac5..99e181b3 100644
--- a/test/regress/test.hpp
+++ b/test/regress/test.hpp
@@ -154,6 +154,7 @@ void test_non_marking_paren();
 void test_partial_match();
 void test_forward_lookahead_asserts();
 void test_fast_repeats();
+void test_fast_repeats2();
 void test_tricky_cases2();
 void test_independent_subs();
 void test_nosubs();
diff --git a/test/regress/test1252.txt b/test/regress/test1252.txt
deleted file mode 100644
index 9a05478e..00000000
--- a/test/regress/test1252.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-;
-; This file tests code page 1252 - US / Western European code page.
-;
-; See tests.txt for a desciption of the scipt format.
-;
-
-- match_default extended REG_EXTENDED
-
-; start by testing character classes:
-[[:lower:]]+ Þßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ÷ 1 32
-[[:upper:]]+ ¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞß 1 31
-[[:punct:]]+ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À 0 31
-[[:print:]]+ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ 0 94
-[[:graph:]]+ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ 0 94
-[a-z]+ ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ 0 31
-[a-z]+ ¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞ 1 31
-[[:word:]]+ ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ 0 61
-;and equivalence classes:
-[[=a=]]+ aAàáâãäåÀÁÂÃÄÅ 0 14
-
-; and then test case mapping:
-- match_default extended REG_EXTENDED REG_ICASE
-;[A-Z]+ ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ 0 31
-;[a-z]+ ¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞ 1 31
-ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝ ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ 1 30
-
-
-
-
-
-
-
-
-
diff --git a/test/regress/test_deprecated.cpp b/test/regress/test_deprecated.cpp
index 520f5abc..9f1e6370 100644
--- a/test/regress/test_deprecated.cpp
+++ b/test/regress/test_deprecated.cpp
@@ -1,3 +1,20 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr John Maddock
+ *
+ * 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)
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         test_deprecated.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Tests for deprecated interfaces.
+  */
 
 #include "test.hpp"
 #include <boost/cregex.hpp>
@@ -106,6 +123,10 @@ void test_deprecated(const char&, const test_regex_search_tag&)
       return;
    try{
       boost::RegEx e(expression, test_info<char>::syntax_options() & boost::regex::icase);
+      if(e.error_code())
+      {
+         BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done, error code = " << e.error_code(), char);
+      }
       if(e.Search(search_text, test_info<char>::match_options()))
       {
          int i = 0;
@@ -241,6 +262,8 @@ void test_deprecated(const char&, const test_invalid_regex_tag&)
    bool have_catch = false;
    try{
       boost::RegEx e(expression, test_info<char>::syntax_options() & boost::regex::icase);
+      if(e.error_code())
+         have_catch = true;
    }
    catch(const boost::bad_expression&)
    {
diff --git a/test/regress/test_deprecated.hpp b/test/regress/test_deprecated.hpp
index 4e5cc7bc..cb4b8750 100644
--- a/test/regress/test_deprecated.hpp
+++ b/test/regress/test_deprecated.hpp
@@ -1,3 +1,20 @@
+/*
+ *
+ * Copyright (c) 1998-2004
+ * Dr John Maddock
+ *
+ * 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)
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         test_deprecated.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Forward declare deprecated test functions.
+  */
 
 #ifndef BOOST_REGEX_TEST_DEPRECATED
 #define BOOST_REGEX_TEST_DEPRECATED
diff --git a/test/regress/test_not_regex.hpp b/test/regress/test_not_regex.hpp
index eed03ac9..c07544bb 100644
--- a/test/regress/test_not_regex.hpp
+++ b/test/regress/test_not_regex.hpp
@@ -1,3 +1,20 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr John Maddock
+ *
+ * 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)
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         test_not_regex.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares tests for invalid regexes.
+  */
 
 
 #ifndef BOOST_REGEX_REGRESS_TEST_NOT_REGEX_HPP
@@ -16,6 +33,10 @@ void test(boost::basic_regex<charT, traits>& r, const test_invalid_regex_tag&)
    bool have_catch = false;
    try{
       r.assign(expression, syntax_options);
+#ifdef BOOST_NO_EXCEPTIONS
+      if(r.status())
+         have_catch = true;
+#endif
    }
    catch(const boost::bad_expression&)
    {
diff --git a/test/regress/test_regex_replace.hpp b/test/regress/test_regex_replace.hpp
index b1eefc2e..a6131ad2 100644
--- a/test/regress/test_regex_replace.hpp
+++ b/test/regress/test_regex_replace.hpp
@@ -1,3 +1,20 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr John Maddock
+ *
+ * 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)
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         test_regex_replace.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares tests for regex search and replace.
+  */
 
 #ifndef BOOST_REGEX_REGRESS_REGEX_REPLACE_HPP
 #define BOOST_REGEX_REGRESS_REGEX_REPLACE_HPP
@@ -29,6 +46,10 @@ void test(boost::basic_regex<charT, traits>& r, const test_regex_replace_tag&)
    boost::regex_constants::syntax_option_type syntax_options = test_info<charT>::syntax_options();
    try{
       r.assign(expression, syntax_options);
+      if(r.status())
+      {
+         BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done, error code = " << r.status(), charT);
+      }
       test_regex_replace(r);
    }
    catch(const boost::bad_expression& e)
diff --git a/test/regress/test_regex_search.hpp b/test/regress/test_regex_search.hpp
index f39f0ac8..16930693 100644
--- a/test/regress/test_regex_search.hpp
+++ b/test/regress/test_regex_search.hpp
@@ -1,3 +1,20 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr John Maddock
+ *
+ * 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)
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         test_regex_search.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares tests for regex search and iteration.
+  */
 
 #ifndef BOOST_REGEX_REGRESS_REGEX_SEARCH_HPP
 #define BOOST_REGEX_REGRESS_REGEX_SEARCH_HPP
@@ -92,10 +109,20 @@ void test_regex_iterator(boost::basic_regex<charT, traits>& r)
    boost::regex_constants::match_flag_type opts = test_info<charT>::match_options();
    const int* answer_table = test_info<charT>::answer_table();
    test_iterator start(search_text.begin(), search_text.end(), r, opts), end;
+   test_iterator copy(start);
    while(start != end)
    {
+      if(start != copy)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", charT);
+      }
+      if(!(start == copy))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", charT);
+      }
       test_result(*start, search_text.begin(), answer_table);
       ++start;
+      ++copy;
       // move on the answer table to next set of answers;
       while(*answer_table++ != -2){}
    }
@@ -185,6 +212,10 @@ void test(boost::basic_regex<charT, traits>& r, const test_regex_search_tag&)
    boost::regex_constants::syntax_option_type syntax_options = test_info<charT>::syntax_options();
    try{
       r.assign(expression, syntax_options);
+      if(r.status())
+      {
+         BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done, error code = " << r.status(), charT);
+      }
       test_simple_search(r);
       test_regex_iterator(r);
       test_regex_grep(r);
diff --git a/test/regress/tests.txt b/test/regress/tests.txt
deleted file mode 100644
index e3b6ee17..00000000
--- a/test/regress/tests.txt
+++ /dev/null
@@ -1,1251 +0,0 @@
-; 
-; 
-; this file contains a script of tests to run through regress.exe
-;
-; comments start with a semicolon and proceed to the end of the line
-;
-; changes to regular expression compile flags start with a "-" as the first
-; non-whitespace character and consist of a list of the printable names
-; of the flags, for example "match_default"
-;
-; Other lines contain a test to perform using the current flag status
-; the first token contains the expression to compile, the second the string
-; to match it against. If the second string is "!" then the expression should
-; not compile, that is the first string is an invalid regular expression.
-; This is then followed by a list of integers that specify what should match,
-; each pair represents the starting and ending positions of a subexpression
-; starting with the zeroth subexpression (the whole match).
-; A value of -1 indicates that the subexpression should not take part in the
-; match at all, if the first value is -1 then no part of the expression should
-; match the string.
-;
-
-- match_default normal REG_EXTENDED
-
-;
-; try some really simple literals:
-a a 0 1
-Z Z 0 1
-Z aaa -1 -1
-Z xxxxZZxxx 4 5
-
-; and some simple brackets:
-(a) zzzaazz 3 4 3 4
-() zzz 0 0 0 0
-() "" 0 0 0 0
-( !
-) !
-(aa !
-aa) !
-a b -1 -1
-\(\) () 0 2
-\(a\) (a) 0 3
-\() !
-(\) !
-p(a)rameter ABCparameterXYZ 3 12 4 5
-[pq](a)rameter ABCparameterXYZ 3 12 4 5
-
-; now try escaped brackets:
-- match_default bk_parens REG_BASIC
-\(a\) zzzaazz 3 4 3 4
-\(\) zzz 0 0 0 0
-\(\) "" 0 0 0 0
-\( !
-\) !
-\(aa !
-aa\) !
-() () 0 2
-(a) (a) 0 3
-(\) !
-\() !
-
-; now move on to "." wildcards
-- match_default normal REG_EXTENDED REG_STARTEND
-. a 0 1
-. \n 0 1
-. \r 0 1
-. \0 0 1
-- match_default normal match_not_dot_newline REG_EXTENDED REG_STARTEND REG_NEWLINE
-. a 0 1
-. \n -1 -1
-. \r -1 -1
-. \0 0 1
-- match_default normal match_not_dot_null match_not_dot_newline REG_EXTENDED REG_STARTEND REG_NEWLINE
-. \n -1 -1
-. \r -1 -1
-; this *WILL* produce an error from the POSIX API functions:
-- match_default normal match_not_dot_null match_not_dot_newline REG_EXTENDED REG_STARTEND REG_NEWLINE REG_NO_POSIX_TEST
-. \0 -1 -1
-
-
-;
-; now move on to the repetion ops,
-; starting with operator *
-- match_default normal REG_EXTENDED
-a* b 0 0
-ab* a 0 1
-ab* ab 0 2
-ab* sssabbbbbbsss 3 10
-ab*c* a 0 1
-ab*c* abbb 0 4
-ab*c* accc 0 4
-ab*c* abbcc 0 5
-*a !
-\<* !
-\>* !
-\n* \n\n 0 2
-\** ** 0 2
-\* * 0 1
-
-; now try operator +
-ab+ a -1 -1
-ab+ ab 0 2
-ab+ sssabbbbbbsss 3 10
-ab+c+ a -1 -1
-ab+c+ abbb -1 -1
-ab+c+ accc -1 -1
-ab+c+ abbcc 0 5
-+a !
-\<+ !
-\>+ !
-\n+ \n\n 0 2
-\+ + 0 1
-\+ ++ 0 1
-\++ ++ 0 2
-- match_default normal bk_plus_qm REG_EXTENDED REG_NO_POSIX_TEST
-+ + 0 1
-\+ !
-a\+ aa 0 2
-
-; now try operator ?
-- match_default normal REG_EXTENDED
-a? b 0 0
-ab? a 0 1
-ab? ab 0 2
-ab? sssabbbbbbsss 3 5
-ab?c? a 0 1
-ab?c? abbb 0 2
-ab?c? accc 0 2
-ab?c? abcc 0 3
-?a !
-\<? !
-\>? !
-\n? \n\n 0 1
-\? ? 0 1
-\? ?? 0 1
-\?? ?? 0 1
-- match_default normal bk_plus_qm REG_EXTENDED REG_NO_POSIX_TEST
-? ? 0 1
-\? !
-a\? aa 0 1
-a\? b 0 0
-
-- match_default normal limited_ops
-a? a? 0 2
-a+ a+ 0 2
-a\? a? 0 2
-a\+ a+ 0 2
-
-; now try operator {}
-- match_default normal REG_EXTENDED
-a{2} a -1 -1
-a{2} aa 0 2
-a{2} aaa 0 2
-a{2,} a -1 -1
-a{2,} aa 0 2
-a{2,} aaaaa 0 5
-a{2,4} a -1 -1
-a{2,4} aa 0 2
-a{2,4} aaa 0 3
-a{2,4} aaaa 0 4
-a{2,4} aaaaa 0 4
-; spaces are now allowed inside {}
-"a{ 2 , 4 }" aaaaa 0 4
-a{} !
-"a{ }" !
-a{2 !
-a} !
-\{\} {} 0 2
-
-- match_default normal bk_braces
-a\{2\} a -1 -1
-a\{2\} aa 0 2
-a\{2\} aaa 0 2
-a\{2,\} a -1 -1
-a\{2,\} aa 0 2
-a\{2,\} aaaaa 0 5
-a\{2,4\} a -1 -1
-a\{2,4\} aa 0 2
-a\{2,4\} aaa 0 3
-a\{2,4\} aaaa 0 4
-a\{2,4\} aaaaa 0 4
-"a\{ 2 , 4 \}" aaaaa 0 4
-{} {} 0 2
-
-; now test the alternation operator |
-- match_default normal REG_EXTENDED
-a|b a 0 1
-a|b b 0 1
-a(b|c) ab 0 2 1 2
-a(b|c) ac 0 2 1 2
-a(b|c) ad -1 -1 -1 -1
-|c !
-c| !
-(|) !
-(a|) !
-(|a) !
-a\| a| 0 2
-- match_default normal limited_ops
-a| a| 0 2
-a\| a| 0 2
-| | 0 1
-- match_default normal bk_vbar REG_NO_POSIX_TEST
-a| a| 0 2
-a\|b a 0 1
-a\|b b 0 1
-
-; now test the set operator []
-- match_default normal REG_EXTENDED
-; try some literals first
-[abc] a 0 1
-[abc] b 0 1
-[abc] c 0 1
-[abc] d -1 -1
-[^bcd] a 0 1
-[^bcd] b -1 -1
-[^bcd] d -1 -1
-[^bcd] e 0 1
-a[b]c abc 0 3
-a[ab]c abc 0 3
-a[^ab]c adc 0 3
-a[]b]c a]c 0 3
-a[[b]c a[c 0 3
-a[-b]c a-c 0 3
-a[^]b]c adc 0 3
-a[^-b]c adc 0 3
-a[b-]c a-c 0 3
-a[b !
-a[] !
-
-; then some ranges
-[b-e] a -1 -1
-[b-e] b 0 1
-[b-e] e 0 1
-[b-e] f -1 -1
-[^b-e] a 0 1
-[^b-e] b -1 -1
-[^b-e] e -1 -1
-[^b-e] f 0 1
-a[1-3]c a2c 0 3
-a[3-1]c !
-a[1-3-5]c !
-a[1- !
-
-; and some classes
-a[[:alpha:]]c abc 0 3
-a[[:unknown:]]c !
-a[[: !
-a[[:alpha !
-a[[:alpha:] !
-a[[:alpha,:] !
-a[[:]:]]b !
-a[[:-:]]b !
-a[[:alph:]] !
-a[[:alphabet:]] !
-[[:alnum:]]+ -%@a0X_- 3 6
-[[:alpha:]]+ -%@aX_0- 3 5
-[[:blank:]]+ "a  \tb" 1 4
-[[:cntrl:]]+ a\n\tb 1 3
-[[:digit:]]+ a019b 1 4
-[[:graph:]]+ " a%b " 1 4
-[[:lower:]]+ AabC 1 3
-; This test fails with STLPort, disable for now as this is a corner case anyway...
-;[[:print:]]+ "\na b\n" 1 4
-[[:punct:]]+ " %-&\t" 1 4
-[[:space:]]+ "a \n\t\rb" 1 5
-[[:upper:]]+ aBCd 1 3
-[[:xdigit:]]+ p0f3Cx 1 5
-
-; now test flag settings:
-- escape_in_lists REG_NO_POSIX_TEST
-[\n] \n 0 1
-- REG_NO_POSIX_TEST
-[\n] \n -1 -1
-[\n] \\ 0 1
-[[:class:] : 0 1
-[[:class:] [ 0 1
-[[:class:] c 0 1
-
-; line anchors
-- match_default normal REG_EXTENDED
-^ab ab 0 2
-^ab xxabxx -1 -1
-^ab xx\nabzz 3 5
-ab$ ab 0 2
-ab$ abxx -1 -1
-ab$ ab\nzz 0 2
-- match_default match_not_bol match_not_eol normal REG_EXTENDED REG_NOTBOL REG_NOTEOL
-^ab ab -1 -1
-^ab xxabxx -1 -1
-^ab xx\nabzz 3 5
-ab$ ab -1 -1
-ab$ abxx -1 -1
-ab$ ab\nzz 0 2
-
-; line anchors, single line mode
-- match_default normal match_single_line REG_NO_POSIX_TEST
-^ab ab 0 2
-^ab xxabxx -1 -1
-^ab xx\nabzz -1 -1
-ab$ ab 0 2
-ab$ abxx -1 -1
-ab$ ab\nzz -1 -1
-- match_default match_not_bol match_not_eol normal REG_NO_POSIX_TEST match_single_line
-^ab ab -1 -1
-^ab xxabxx -1 -1
-^ab xx\nabzz -1 -1
-ab$ ab -1 -1
-ab$ abxx -1 -1
-ab$ ab\nzz -1 -1
-
-; back references
-- match_default normal REG_PERL
-a(b)\2c	!
-a(b\1)c	!
-a(b*)c\1d abbcbbd 0 7 1 3
-a(b*)c\1d abbcbd -1 -1
-a(b*)c\1d abbcbbbd -1 -1
-^(.)\1 abc -1 -1
-a([bc])\1d abcdabbd	4 8 5 6
-; strictly speaking this is at best ambiguous, at worst wrong, this is what most
-; re implimentations will match though.
-a(([bc])\2)*d abbccd 0 6 3 5 3 4
-
-a(([bc])\2)*d abbcbd -1 -1
-a((b)*\2)*d abbbd 0 5 1 4 2 3
-; perl only:
-(ab*)[ab]*\1 ababaaa 0 4 0 2
-(a)\1bcd aabcd 0 5 0 1
-(a)\1bc*d aabcd 0 5 0 1
-(a)\1bc*d aabd 0 4 0 1
-(a)\1bc*d aabcccd 0 7 0 1
-(a)\1bc*[ce]d aabcccd 0 7 0 1
-^(a)\1b(c)*cd$ aabcccd 0 7 0 1 4 5
-
-; posix only: 
-- match_default extended REG_EXTENDED
-(ab*)[ab]*\1 ababaaa 0 7 0 1
-
-;
-; characters by code:
-- match_default normal REG_PERL REG_STARTEND
-\0101 A 0 1
-\00 \0 0 1
-\0 \0 0 1
-\0172 z 0 1
-
-;
-; word operators:
-\w a 0 1
-\w z 0 1
-\w A 0 1
-\w Z 0 1
-\w _ 0 1
-\w } -1 -1
-\w ` -1 -1
-\w [ -1 -1
-\w @ -1 -1
-; non-word:
-\W a -1 -1
-\W z -1 -1
-\W A -1 -1
-\W Z -1 -1
-\W _ -1 -1
-\W } 0 1
-\W ` 0 1
-\W [ 0 1
-\W @ 0 1
-; word start:
-\<abcd "  abcd" 2 6
-\<ab cab -1 -1
-\<ab "\nab" 1 3
-\<tag ::tag 2 5
-;word end:
-abc\> abc 0 3
-abc\> abcd -1 -1
-abc\> abc\n 0 3
-abc\> abc:: 0 3
-; word boundary:
-\babcd "  abcd" 2 6
-\bab cab -1 -1
-\bab "\nab" 1 3
-\btag ::tag 2 5
-abc\b abc 0 3
-abc\b abcd -1 -1
-abc\b abc\n 0 3
-abc\b abc:: 0 3
-; within word:
-\B ab 1 1
-a\Bb ab 0 2
-a\B ab 0 1
-a\B a -1 -1
-a\B "a " -1 -1
-
-;
-; buffer operators:
-\`abc abc 0 3
-\`abc \nabc -1 -1
-\`abc " abc" -1 -1
-abc\' abc 0 3
-abc\' abc\n -1 -1
-abc\' "abc " -1 -1
-
-;
-; extra escape sequences:
-\a \a 0 1
-\f \f 0 1
-\n \n 0 1
-\r \r 0 1
-\t \t 0 1
-\v \v 0 1
-
-
-;
-; now follows various complex expressions designed to try and bust the matcher:
-a(((b)))c abc 0 3 1 2 1 2 1 2
-a(b|(c))d abd 0 3 1 2 -1 -1
-a(b|(c))d acd 0 3 1 2 1 2
-a(b*|c)d abbd 0 4 1 3
-; just gotta have one DFA-buster, of course
-a[ab]{20} aaaaabaaaabaaaabaaaab 0 21
-; and an inline expansion in case somebody gets tricky
-a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab] aaaaabaaaabaaaabaaaab 0 21
-; and in case somebody just slips in an NFA...
-a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab](wee|week)(knights|night) aaaaabaaaabaaaabaaaabweeknights 0 31 21 24 24 31
-; one really big one
-1234567890123456789012345678901234567890123456789012345678901234567890 a1234567890123456789012345678901234567890123456789012345678901234567890b 1 71
-; fish for problems as brackets go past 8
-[ab][cd][ef][gh][ij][kl][mn] xacegikmoq 1 8
-[ab][cd][ef][gh][ij][kl][mn][op] xacegikmoq 1 9
-[ab][cd][ef][gh][ij][kl][mn][op][qr] xacegikmoqy 1 10
-[ab][cd][ef][gh][ij][kl][mn][op][q] xacegikmoqy 1 10
-; and as parenthesis go past 9:
-(a)(b)(c)(d)(e)(f)(g)(h) zabcdefghi 1 9 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9
-(a)(b)(c)(d)(e)(f)(g)(h)(i) zabcdefghij 1 10 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9 9 10
-(a)(b)(c)(d)(e)(f)(g)(h)(i)(j) zabcdefghijk 1 11 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9 9 10 10 11
-(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k) zabcdefghijkl 1 12 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9 9 10 10 11 11 12
-(a)d|(b)c abc 1 3 -1 -1 1 2
-"_+((www)|(ftp)|(mailto)):_*" "_wwwnocolon _mailto:" 12 20 13 19 -1 -1 -1 -1 13 19
-
-; subtleties of matching
-a(b)?c\1d acd 0 3 -1 -1
-a(b?c)+d accd 0 4 2 3
-(wee|week)(knights|night) weeknights 0 10 0 3 3 10
-.* abc 0 3
-a(b|(c))d abd 0 3 1 2 -1 -1
-a(b|(c))d acd 0 3 1 2 1 2
-a(b*|c|e)d abbd 0 4 1 3
-a(b*|c|e)d acd 0 3 1 2
-a(b*|c|e)d ad 0 2 1 1
-a(b?)c abc 0 3 1 2
-a(b?)c ac 0 2 1 1
-a(b+)c abc 0 3 1 2
-a(b+)c abbbc 0 5 1 4 
-a(b*)c ac 0 2 1 1 
-(a|ab)(bc([de]+)f|cde) abcdef 0 6 0 1 1 6 3 5
-a([bc]?)c abc 0 3 1 2
-a([bc]?)c ac 0 2 1 1 
-a([bc]+)c abc 0 3 1 2
-a([bc]+)c abcc 0 4 1 3
-a([bc]+)bc abcbc 0 5 1 3
-a(bb+|b)b abb 0 3 1 2
-a(bbb+|bb+|b)b abb 0 3 1 2
-a(bbb+|bb+|b)b abbb 0 4 1 3
-a(bbb+|bb+|b)bb abbb 0 4 1 2
-(.*).* abcdef 0 6 0 6
-(a*)* bc 0 0 0 0
-xyx*xz xyxxxxyxxxz 5 11
-
-; do we get the right subexpression when it is used more than once?
-a(b|c)*d ad 0 2 -1 -1
-a(b|c)*d abcd 0 4 2 3
-a(b|c)+d abd 0 3 1 2
-a(b|c)+d abcd 0 4 2 3
-a(b|c?)+d ad 0 2 1 1
-a(b|c){0,0}d ad 0 2 -1 -1
-a(b|c){0,1}d ad 0 2 -1 -1
-a(b|c){0,1}d abd 0 3 1 2
-a(b|c){0,2}d ad 0 2 -1 -1
-a(b|c){0,2}d abcd 0 4 2 3
-a(b|c){0,}d ad 0 2 -1 -1
-a(b|c){0,}d abcd 0 4 2 3
-a(b|c){1,1}d abd 0 3 1 2
-a(b|c){1,2}d abd 0 3 1 2
-a(b|c){1,2}d abcd 0 4 2 3
-a(b|c){1,}d abd 0 3 1 2
-a(b|c){1,}d abcd 0 4 2 3
-a(b|c){2,2}d acbd 0 4 2 3
-a(b|c){2,2}d abcd 0 4 2 3
-a(b|c){2,4}d abcd 0 4 2 3
-a(b|c){2,4}d abcbd 0 5 3 4
-a(b|c){2,4}d abcbcd 0 6 4 5
-a(b|c){2,}d abcd 0 4 2 3
-a(b|c){2,}d abcbd 0 5 3 4
-; perl only:
-a(b|c?)+d abcd 0 4 3 3
-a(b+|((c)*))+d abd 0 3 2 2 2 2 -1 -1
-a(b+|((c)*))+d abcd 0 4 3 3 3 3 2 3
-
-; posix only:
-- match_default extended REG_EXTENDED REG_STARTEND
-a(b|c?)+d abcd 0 4 2 3
-a(b|((c)*))+d abcd 0 4 2 3 2 3 2 3
-a(b+|((c)*))+d abd 0 3 1 2 -1 -1 -1 -1
-a(b+|((c)*))+d abcd 0 4 2 3 2 3 2 3
-
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_NOSPEC literal
-\**?/{} \\**?/{} 0 7
-
-- match_default normal REG_PERL
-; try to match C++ syntax elements:
-; line comment:
-//[^\n]* "++i //here is a line comment\n" 4 28
-; block comment:
-/\*([^*]|\*+[^*/])*\*+/ "/* here is a block comment */" 0 29 26 27
-/\*([^*]|\*+[^*/])*\*+/ "/**/" 0 4 -1 -1
-/\*([^*]|\*+[^*/])*\*+/ "/***/" 0 5 -1 -1
-/\*([^*]|\*+[^*/])*\*+/ "/****/" 0 6 -1 -1
-/\*([^*]|\*+[^*/])*\*+/ "/*****/" 0 7 -1 -1
-/\*([^*]|\*+[^*/])*\*+/ "/*****/*/" 0 7 -1 -1
-; preprossor directives:
-^[[:blank:]]*#([^\n]*\\[[:space:]]+)*[^\n]* "#define some_symbol" 0 19 -1 -1
-^[[:blank:]]*#([^\n]*\\[[:space:]]+)*[^\n]* "#define some_symbol(x) #x" 0 25 -1 -1
-; perl only:
-^[[:blank:]]*#([^\n]*\\[[:space:]]+)*[^\n]* "#define some_symbol(x) \\  \r\n  foo();\\\r\n   printf(#x);" 0 53 30 42
-; literals:
-((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)? 0xFF         						0 4		0 4		0 4 	-1 -1 	-1 -1 	-1 -1 	-1 -1
-((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)? 35 									0 2 	0 2		-1 -1 	0 2 	-1 -1 	-1 -1 	-1 -1
-((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)? 0xFFu 								0 5		0 4		0 4 	-1 -1 	-1 -1 	-1 -1 	-1 -1
-((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)? 0xFFL 								0 5		0 4		0 4 	-1 -1 	4 5 	-1 -1 	-1 -1
-((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)? 0xFFFFFFFFFFFFFFFFuint64 			0 24	0 18	0 18 	-1 -1 	19 24 	19 24 	22 24
-; strings:
-'([^\\']|\\.)*' '\\x3A' 0 6 4 5
-'([^\\']|\\.)*' '\\'' 0 4 1 3
-'([^\\']|\\.)*' '\\n' 0 4 1 3
-
-; posix only:
-- match_default extended escape_in_lists REG_EXTENDED REG_NO_POSIX_TEST ; we disable POSIX testing because it can't handle escapes in sets
-^[[:blank:]]*#([^\n]*\\[[:space:]]+)*[^\n]* "#define some_symbol(x) \\  \r\n  foo();\\\r\n   printf(#x);" 0 53 28 42
-
-
-; now try and test some unicode specific characters:
-- match_default normal REG_PERL REG_UNICODE_ONLY
-[[:unicode:]]+  a\0300\0400z 1 3
-[\x10-\xff] \39135\12409 -1 -1
-[\01-\05]{5} \36865\36865\36865\36865\36865 -1 -1
-
-; finally try some case insensitive matches:
-- match_default normal REG_EXTENDED REG_ICASE
-; upper and lower have no meaning here so they fail, however these
-; may compile with other libraries...
-;[[:lower:]] !
-;[[:upper:]] !
-0123456789@abcdefghijklmnopqrstuvwxyz\[\\\]\^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ\{\|\} 0123456789@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]\^_`abcdefghijklmnopqrstuvwxyz\{\|\} 0 72
-
-; known and suspected bugs:
-- match_default normal REG_EXTENDED
-\( ( 0 1
-\) ) 0 1
-\$ $ 0 1
-\^ ^ 0 1
-\. . 0 1
-\* * 0 1
-\+ + 0 1
-\? ? 0 1
-\[ [ 0 1
-\] ] 0 1
-\| | 0 1
-\\ \\ 0 1
-# # 0 1
-\# # 0 1
-a- a- 0 2
-\- - 0 1
-\{ { 0 1
-\} } 0 1
-0 0 0 1
-1 1 0 1
-9 9 0 1
-b b 0 1
-B B 0 1
-< < 0 1
-> > 0 1
-w w 0 1
-W W 0 1
-` ` 0 1
-' ' 0 1
-\n \n 0 1
-, , 0 1
-a a 0 1
-f f 0 1
-n n 0 1
-r r 0 1
-t t 0 1
-v v 0 1
-c c 0 1
-x x 0 1
-: : 0 1
-(\.[[:alnum:]]+){2} "w.a.b " 1 5 3 5
-
-- match_default normal REG_EXTENDED REG_ICASE
-a A 0 1
-A a 0 1
-[abc]+ abcABC 0 6
-[ABC]+ abcABC 0 6
-[a-z]+ abcABC 0 6
-[A-Z]+ abzANZ 0 6
-[a-Z]+ abzABZ 0 6
-[A-z]+ abzABZ 0 6
-[[:lower:]]+ abyzABYZ 0 8
-[[:upper:]]+ abzABZ 0 6
-[[:word:]]+ abcZZZ 0 6
-[[:alpha:]]+ abyzABYZ 0 8
-[[:alnum:]]+ 09abyzABYZ 0 10
-
-; updated tests for version 2:
-- match_default normal REG_EXTENDED
-\x41 A 0 1
-\xff \255 0 1
-\xFF \255 0 1
-- match_default normal REG_EXTENDED REG_NO_POSIX_TEST
-\c@ \0 0 1
-- match_default normal REG_EXTENDED
-\cA \1 0 1
-\cz \58 0 1
-\c= !
-\c? !
-=: =: 0 2
-
-; word start:
-[[:<:]]abcd "  abcd" 2 6
-[[:<:]]ab cab -1 -1
-[[:<:]]ab "\nab" 1 3
-[[:<:]]tag ::tag 2 5
-;word end:
-abc[[:>:]] abc 0 3
-abc[[:>:]] abcd -1 -1
-abc[[:>:]] abc\n 0 3
-abc[[:>:]] abc:: 0 3
-
-; collating elements and rewritten set code:
-- match_default normal REG_EXTENDED REG_STARTEND
-[[.zero.]] 0 0 1
-[[.one.]] 1 0 1
-[[.two.]] 2 0 1
-[[.three.]] 3 0 1
-[[.a.]] baa 1 2
-[[.right-curly-bracket.]] } 0 1
-[[.NUL.]] \0 0 1
-[[:<:]z] !
-[a[:>:]] !
-[[=a=]] a 0 1
-[[=right-curly-bracket=]] } 0 1
-- match_default normal REG_EXTENDED REG_STARTEND REG_ICASE
-[[.A.]] A 0 1
-[[.A.]] a 0 1
-[[.A.]-b]+ AaBb 0 4
-[A-[.b.]]+ AaBb 0 4
-[[.a.]-B]+ AaBb 0 4
-[a-[.B.]]+ AaBb 0 4
-- match_default normal REG_EXTENDED REG_NO_POSIX_TEST
-[\x61] a 0 1
-[\x61-c]+ abcd 0 3
-[a-\x63]+ abcd 0 3
-- match_default normal REG_EXTENDED REG_STARTEND
-[[.a.]-c]+ abcd 0 3
-[a-[.c.]]+ abcd 0 3
-[[:alpha:]-a] !
-[a-[:alpha:]] !
-
-; try mutli-character ligatures:
-[[.ae.]] ae 0 2
-[[.ae.]] aE -1 -1
-[[.AE.]] AE 0 2
-[[.Ae.]] Ae 0 2
-[[.ae.]-b] a -1 -1
-[[.ae.]-b] b 0 1
-[[.ae.]-b] ae 0 2
-[a-[.ae.]] a 0 1
-[a-[.ae.]] b -1 -1
-[a-[.ae.]] ae 0 2
-- match_default normal REG_EXTENDED REG_STARTEND REG_ICASE
-[[.ae.]] AE 0 2
-[[.ae.]] Ae 0 2
-[[.AE.]] Ae 0 2
-[[.Ae.]] aE 0 2
-[[.AE.]-B] a -1 -1
-[[.Ae.]-b] b 0 1
-[[.Ae.]-b] B 0 1
-[[.ae.]-b] AE 0 2
-
-- match_default normal REG_EXTENDED REG_STARTEND
-;extended perl style escape sequences:
-\e \27 0 1
-\x1b \27 0 1
-\x{1b} \27 0 1
-\x{} !
-\x{ !
-\x} !
-\x !
-\x{yy !
-\x{1b !
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_NO_POSIX_TEST
-\l+ ABabcAB 2 5
-[\l]+ ABabcAB 2 5
-[a-\l] !
-[\l-a] !
-[\L] !
-\L+ abABCab 2 5
-\u+ abABCab 2 5
-[\u]+ abABCab 2 5
-[\U] !
-\U+ ABabcAB 2 5
-\d+ ab012ab 2 5
-[\d]+ ab012ab 2 5
-[\D] !
-\D+ 01abc01 2 5
-\s+ "ab   ab" 2 5
-[\s]+ "ab   ab" 2 5
-[\S] !
-\S+ "  abc  " 2 5
-- match_default normal REG_EXTENDED REG_STARTEND
-\Qabc !
-\Qabc\E abcd 0 3
-\Qabc\Ed abcde 0 4
-\Q+*?\\E +*?\\ 0 4
-
-\C+ abcde 0 5
-\X+ abcde 0 5
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_UNICODE_ONLY
-\X+ a\768\769 0 3
-\X+ \2309\2307 0 2   ;DEVANAGARI script
-\X+ \2489\2494 0 2   ;BENGALI script
-
-- match_default normal REG_EXTENDED REG_STARTEND
-\Aabc abc 0 3
-\Aabc aabc -1 -1
-abc\z abc 0 3
-abc\z abcd -1 -1
-abc\Z abc\n\n 0 3
-abc\Z abc 0 3
-
-
-\Gabc abc 0 3
-\Gabc dabcd -1 -1
-a\Gbc abc -1 -1
-a\Aab abc -1 -1
-
-;
-; now test grep,
-; basically check all our restart types - line, word, etc
-; checking each one for null and non-null matches.
-;
-- match_default normal REG_EXTENDED REG_STARTEND REG_GREP
-a " a a a aa" 1 2 3 4 5 6 7 8 8 9
-a+b+ "aabaabbb ab" 0 3 3 8 9 11
-a(b*|c|e)d adabbdacd 0 2 2 6 6 9
-a "\na\na\na\naa" 1 2 3 4 5 6 7 8 8 9
-
-^ "   \n\n  \n\n\n" 0 0 4 4 5 5 8 8 9 9 10 10
-^ab  "ab  \nab  ab\n" 0 2 5 7
-^[^\n]*\n "   \n  \n\n  \n" 0 4 4 7 7 8 8 11
-\<abc "abcabc abc\n\nabc" 0 3 7 10 12 15
-\< "  ab a aaa  "  2 2 5 5 7 7
-\<\w+\W+ " aa  aa  a " 1 5 5 9 9 11
-
-\Aabc "abc   abc"  0 3
-\G\w+\W+ "abc  abc a cbbb   " 0 5 5 9 9 11 11 18
-\Ga+b+ "aaababb  abb" 0 4 4 7
-
-abc abc 0 3
-abc " abc abcabc " 1 4 5 8 8 11
-\n\n " \n\n\n       \n      \n\n\n\n  " 1 3 18 20 20 22
-
-$ "   \n\n  \n\n\n" 3 3 4 4 7 7 8 8 9 9 10 10
-\b "  abb a abbb " 2 2 5 5 6 6 7 7 8 8 12 12
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_GREP REG_ICASE
-A " a a a aa" 1 2 3 4 5 6 7 8 8 9
-A+B+ "aabaabbb ab" 0 3 3 8 9 11
-A(B*|c|e)D adabbdacd 0 2 2 6 6 9
-A "\na\na\na\naa" 1 2 3 4 5 6 7 8 8 9
-
-^aB  "Ab  \nab  Ab\n" 0 2 5 7
-\<abc "Abcabc aBc\n\nabc" 0 3 7 10 12 15
-
-ABC abc 0 3
-abc " ABC ABCABC " 1 4 5 8 8 11
-
-
-;
-; now test merge,
-;
-- match_default normal REG_EXTENDED REG_STARTEND REG_MERGE format_no_copy
-; start by testing subs:
-a+ "...aaa,,," $` "..." 
-a+ "...aaa,,," $' ",,," 
-a+ "...aaa,,," $& "aaa" 
-a+ "...aaa,,," $0 aaa
-a+ "...aaa,,," $1 ""
-a+ "...aaa,,," $15 ""
-(a+)b+ "...aaabbb,,," $1 aaa
-[[:digit:]]* 123ab <$0> <123><><><>
-[[:digit:]]* 123ab1 <$0> <123><><><1>
-
-; and now escapes:
-a+ "...aaa,,," $x "$x" 
-a+ "...aaa,,," \a "\a" 
-a+ "...aaa,,," \f "\f" 
-a+ "...aaa,,," \n "\n" 
-a+ "...aaa,,," \r "\r" 
-a+ "...aaa,,," \t "\t" 
-a+ "...aaa,,," \v "\v" 
-
-a+ "...aaa,,," \x21 "!" 
-a+ "...aaa,,," \x{21} "!" 
-a+ "...aaa,,," \c@ \0
-a+ "...aaa,,," \e \27
-a+ "...aaa,,," \0101 A
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_MERGE format_sed format_no_copy
-(a+)(b+) ...aabb,, \0 aabb
-(a+)(b+) ...aabb,, \1 aa
-(a+)(b+) ...aabb,, \2 bb
-(a+)(b+) ...aabb,, & aabb
-(a+)(b+) ...aabb,, $ $
-(a+)(b+) ...aabb,, $1 $1
-(a+)(b+) ...aabb,, ()?: ()?:
-(a+)(b+) ...aabb,, \\ \\
-(a+)(b+) ...aabb,, \& &
-
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_MERGE format_perl format_no_copy
-(a+)(b+) ...aabb,, $0 aabb
-(a+)(b+) ...aabb,, $1 aa
-(a+)(b+) ...aabb,, $2 bb
-(a+)(b+) ...aabb,, $& aabb
-(a+)(b+) ...aabb,, & &
-(a+)(b+) ...aabb,, \0 \0
-(a+)(b+) ...aabb,, ()?: ()?:
-a+ "...aaa,,," \0101 A
-
-- match_default format_all normal REG_EXTENDED REG_STARTEND REG_MERGE
-; move to copying unmatched data:
-a+ "...aaa,,," bbb "...bbb,,," 
-a+(b+) "...aaabb,,," $1 "...bb,,," 
-a+(b+) "...aaabb,,,ab*abbb?" $1 "...bb,,,b*bbb?" 
-
-(a+)|(b+) "...aaabb,,,ab*abbb?" (?1A)(?2B) "...AB,,,AB*AB?" 
-(a+)|(b+) "...aaabb,,,ab*abbb?" ?1A:B "...AB,,,AB*AB?" 
-(a+)|(b+) "...aaabb,,,ab*abbb?" (?1A:B)C "...ACBC,,,ACBC*ACBC?" 
-(a+)|(b+) "...aaabb,,,ab*abbb?" ?1:B "...B,,,B*B?" 
-
-- match_default format_all normal REG_EXTENDED REG_STARTEND REG_MERGE format_first_only
-; move to copying unmatched data, but replace first occurance only:
-a+ "...aaa,,," bbb "...bbb,,," 
-a+(b+) "...aaabb,,," $1 "...bb,,," 
-a+(b+) "...aaabb,,,ab*abbb?" $1 "...bb,,,ab*abbb?" 
-(a+)|(b+) "...aaabb,,,ab*abbb?" (?1A)(?2B) "...Abb,,,ab*abbb?" 
-
-;
-; changes to newline handling with 2.11:
-;
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_GREP
-
-^. "  \n  \r\n  " 0 1 3 4 7 8
-.$ "  \n  \r\n  " 1 2 4 5 8 9
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_GREP REG_UNICODE_ONLY
-^. "  \8232 \8233  " 0 1 3 4 5 6
-.$ "  \8232 \8233  " 1 2 3 4 6 7
-
-;
-; non-greedy repeats added 21/04/00
-- match_default normal REG_EXTENDED REG_PERL
-a** !
-a*? aa 0 0
-^a*?$ aa 0 2
-^.*?$ aa 0 2
-^(?:a)*?$ aa 0 2
-^[ab]*?$ aa 0 2
-a?? aa 0 0
-a++ !
-a+? aa 0 1
-a{1,3}{1} !
-a{1,3}? aaa 0 1
-\w+?w ...ccccccwcccccw 3 10
-\W+\w+?w ...ccccccwcccccw 0 10
-abc|\w+? abd 0 1
-abc|\w+? abcd 0 3
-<\s*tag[^>]*>(.*?)<\s*/tag\s*> " <tag>here is some text</tag> <tag></tag>" 1 29 6 23
-<\s*tag[^>]*>(.*?)<\s*/tag\s*> " < tag attr=\"something\">here is some text< /tag > <tag></tag>" 1 49 24 41
-
-;
-; non-marking parenthesis added 25/04/00
-- match_default normal REG_EXTENDED REG_PERL
-(?:abc)+ xxabcabcxx 2 8
-(?:a+)(b+) xaaabbbx 1 7 4 7
-(a+)(?:b+) xaaabbba 1 7 1 4
-(?:(a+)b+) xaaabbba 1 7 1 4
-(?:a+(b+)) xaaabbba 1 7 4 7
-a+(?#b+)b+ xaaabbba 1 7
-(a)(?:b|$) ab 0 2 0 1
-(a)(?:b|$) a 0 1 0 1
-
-
-;
-; try some partial matches:
-- match_partial match_default normal REG_EXTENDED REG_NO_POSIX_TEST REG_PARTIAL_MATCH REG_PERL
-(xyz)(.*)abc xyzaaab 0 7
-(xyz)(.*)abc xyz 0 3
-(xyz)(.*)abc xy 0 2
-(xyz)(.*)abc x 0 1
-(xyz)(.*)abc "" -1 -1
-(xyz)(.*)abc aaaa -1 -1
-.abc aaab 1 4
-a[_] xxa 2 3
-
-;
-; forward lookahead asserts added 21/01/02
-- match_default normal REG_EXTENDED REG_NO_POSIX_TEST REG_PERL
-((?:(?!a|b)\w)+)(\w+) "  xxxabaxxx  " 2 11 2 5 5 11
-
-/\*(?:(?!\*/).)*\*/ "  /**/  " 2 6
-/\*(?:(?!\*/).)*\*/ "  /***/  " 2 7
-/\*(?:(?!\*/).)*\*/ "  /********/  " 2 12
-/\*(?:(?!\*/).)*\*/ "  /* comment */  " 2 15
-
-<\s*a[^>]*>((?:(?!<\s*/\s*a\s*>).)*)<\s*/\s*a\s*> " <a href=\"here\">here</a> " 1 24 16 20
-<\s*a[^>]*>((?:(?!<\s*/\s*a\s*>).)*)<\s*/\s*a\s*> " <a href=\"here\">here< /  a > " 1 28 16 20
-
-<\s*a[^>]*>((?:(?!<\s*/\s*a\s*>).)*)(?=<\s*/\s*a\s*>) " <a href=\"here\">here</a> " 1 20 16 20
-<\s*a[^>]*>((?:(?!<\s*/\s*a\s*>).)*)(?=<\s*/\s*a\s*>) " <a href=\"here\">here< /  a > " 1 20 16 20
-
-; filename matching:
-^(?!^(?:PRN|AUX|CLOCK\$|NUL|CON|COM\d|LPT\d|\..*)(?:\..+)?$)[^\x00-\x1f\\?*:\"|/]+$ command.com 0 11
-^(?!^(?:PRN|AUX|CLOCK\$|NUL|CON|COM\d|LPT\d|\..*)(?:\..+)?$)[^\x00-\x1f\\?*:\"|/]+$ PRN -1 -1
-^(?!^(?:PRN|AUX|CLOCK\$|NUL|CON|COM\d|LPT\d|\..*)(?:\..+)?$)[^\x00-\x1f\\?*:\"|/]+$ COM2 -1 -1
-
-; password checking:
-^(?=.*\d).{4,8}$ abc3 0 4
-^(?=.*\d).{4,8}$ abc3def4 0 8
-^(?=.*\d).{4,8}$ ab2 -1 -1
-^(?=.*\d).{4,8}$ abcdefg -1 -1
-^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{4,8}$ abc3 -1 -1
-^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{4,8}$ abC3 0 4
-^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{4,8}$ ABCD3 -1 -1
-
-; extended repeat checking to exercise new algorithms:
-ab.*xy abxy_ 0 4
-ab.*xy ab_xy_ 0 5
-ab.*xy abxy 0 4
-ab.*xy ab_xy 0 5
-ab.* ab 0 2
-ab.* ab__ 0 4
-
-ab.{2,5}xy ab__xy_ 0 6
-ab.{2,5}xy ab____xy_ 0 8
-ab.{2,5}xy ab_____xy_ 0 9
-ab.{2,5}xy ab__xy 0 6
-ab.{2,5}xy ab_____xy 0 9
-ab.{2,5} ab__ 0 4
-ab.{2,5} ab_______ 0 7
-ab.{2,5}xy ab______xy -1 -1
-ab.{2,5}xy ab_xy -1 -1
-
-ab.*?xy abxy_ 0 4
-ab.*?xy ab_xy_ 0 5
-ab.*?xy abxy 0 4
-ab.*?xy ab_xy 0 5
-ab.*? ab 0 2
-ab.*? ab__ 0 2
-
-ab.{2,5}?xy ab__xy_ 0 6
-ab.{2,5}?xy ab____xy_ 0 8
-ab.{2,5}?xy ab_____xy_ 0 9
-ab.{2,5}?xy ab__xy 0 6
-ab.{2,5}?xy ab_____xy 0 9
-ab.{2,5}? ab__ 0 4
-ab.{2,5}? ab_______ 0 4
-ab.{2,5}?xy ab______xy -1 -1
-ab.{2,5}xy ab_xy -1 -1
-
-; again but with slower algorithm variant:
-- match_default normal REG_PERL REG_NO_POSIX_TEST match_not_dot_newline match_not_dot_null
-ab.*xy abxy_ 0 4
-ab.*xy ab_xy_ 0 5
-ab.*xy abxy 0 4
-ab.*xy ab_xy 0 5
-ab.* ab 0 2
-ab.* ab__ 0 4
-
-ab.{2,5}xy ab__xy_ 0 6
-ab.{2,5}xy ab____xy_ 0 8
-ab.{2,5}xy ab_____xy_ 0 9
-ab.{2,5}xy ab__xy 0 6
-ab.{2,5}xy ab_____xy 0 9
-ab.{2,5} ab__ 0 4
-ab.{2,5} ab_______ 0 7
-ab.{2,5}xy ab______xy -1 -1
-ab.{2,5}xy ab_xy -1 -1
-
-ab.*?xy abxy_ 0 4
-ab.*?xy ab_xy_ 0 5
-ab.*?xy abxy 0 4
-ab.*?xy ab_xy 0 5
-ab.*? ab 0 2
-ab.*? ab__ 0 2
-
-ab.{2,5}?xy ab__xy_ 0 6
-ab.{2,5}?xy ab____xy_ 0 8
-ab.{2,5}?xy ab_____xy_ 0 9
-ab.{2,5}?xy ab__xy 0 6
-ab.{2,5}?xy ab_____xy 0 9
-ab.{2,5}? ab__ 0 4
-ab.{2,5}? ab_______ 0 4
-ab.{2,5}?xy ab______xy -1 -1
-ab.{2,5}xy ab_xy -1 -1
-
-; now again for single character repeats:
-
-ab_*xy abxy_ 0 4
-ab_*xy ab_xy_ 0 5
-ab_*xy abxy 0 4
-ab_*xy ab_xy 0 5
-ab_* ab 0 2
-ab_* ab__ 0 4
-
-ab_{2,5}xy ab__xy_ 0 6
-ab_{2,5}xy ab____xy_ 0 8
-ab_{2,5}xy ab_____xy_ 0 9
-ab_{2,5}xy ab__xy 0 6
-ab_{2,5}xy ab_____xy 0 9
-ab_{2,5} ab__ 0 4
-ab_{2,5} ab_______ 0 7
-ab_{2,5}xy ab______xy -1 -1
-ab_{2,5}xy ab_xy -1 -1
-
-ab_*?xy abxy_ 0 4
-ab_*?xy ab_xy_ 0 5
-ab_*?xy abxy 0 4
-ab_*?xy ab_xy 0 5
-ab_*? ab 0 2
-ab_*? ab__ 0 2
-
-ab_{2,5}?xy ab__xy_ 0 6
-ab_{2,5}?xy ab____xy_ 0 8
-ab_{2,5}?xy ab_____xy_ 0 9
-ab_{2,5}?xy ab__xy 0 6
-ab_{2,5}?xy ab_____xy 0 9
-ab_{2,5}? ab__ 0 4
-ab_{2,5}? ab_______ 0 4
-ab_{2,5}?xy ab______xy -1 -1
-ab_{2,5}xy ab_xy -1 -1
-
-; and again for sets:
-ab[_,;]*xy abxy_ 0 4
-ab[_,;]*xy ab_xy_ 0 5
-ab[_,;]*xy abxy 0 4
-ab[_,;]*xy ab_xy 0 5
-ab[_,;]* ab 0 2
-ab[_,;]* ab__ 0 4
-
-ab[_,;]{2,5}xy ab__xy_ 0 6
-ab[_,;]{2,5}xy ab____xy_ 0 8
-ab[_,;]{2,5}xy ab_____xy_ 0 9
-ab[_,;]{2,5}xy ab__xy 0 6
-ab[_,;]{2,5}xy ab_____xy 0 9
-ab[_,;]{2,5} ab__ 0 4
-ab[_,;]{2,5} ab_______ 0 7
-ab[_,;]{2,5}xy ab______xy -1 -1
-ab[_,;]{2,5}xy ab_xy -1 -1
-
-ab[_,;]*?xy abxy_ 0 4
-ab[_,;]*?xy ab_xy_ 0 5
-ab[_,;]*?xy abxy 0 4
-ab[_,;]*?xy ab_xy 0 5
-ab[_,;]*? ab 0 2
-ab[_,;]*? ab__ 0 2
-
-ab[_,;]{2,5}?xy ab__xy_ 0 6
-ab[_,;]{2,5}?xy ab____xy_ 0 8
-ab[_,;]{2,5}?xy ab_____xy_ 0 9
-ab[_,;]{2,5}?xy ab__xy 0 6
-ab[_,;]{2,5}?xy ab_____xy 0 9
-ab[_,;]{2,5}? ab__ 0 4
-ab[_,;]{2,5}? ab_______ 0 4
-ab[_,;]{2,5}?xy ab______xy -1 -1
-ab[_,;]{2,5}xy ab_xy -1 -1
-
-; and again for tricky sets with digraphs:
-ab[_[.ae.]]*xy abxy_ 0 4
-ab[_[.ae.]]*xy ab_xy_ 0 5
-ab[_[.ae.]]*xy abxy 0 4
-ab[_[.ae.]]*xy ab_xy 0 5
-ab[_[.ae.]]* ab 0 2
-ab[_[.ae.]]* ab__ 0 4
-
-ab[_[.ae.]]{2,5}xy ab__xy_ 0 6
-ab[_[.ae.]]{2,5}xy ab____xy_ 0 8
-ab[_[.ae.]]{2,5}xy ab_____xy_ 0 9
-ab[_[.ae.]]{2,5}xy ab__xy 0 6
-ab[_[.ae.]]{2,5}xy ab_____xy 0 9
-ab[_[.ae.]]{2,5} ab__ 0 4
-ab[_[.ae.]]{2,5} ab_______ 0 7
-ab[_[.ae.]]{2,5}xy ab______xy -1 -1
-ab[_[.ae.]]{2,5}xy ab_xy -1 -1
-
-ab[_[.ae.]]*?xy abxy_ 0 4
-ab[_[.ae.]]*?xy ab_xy_ 0 5
-ab[_[.ae.]]*?xy abxy 0 4
-ab[_[.ae.]]*?xy ab_xy 0 5
-ab[_[.ae.]]*? ab 0 2
-ab[_[.ae.]]*? ab__ 0 2
-
-ab[_[.ae.]]{2,5}?xy ab__xy_ 0 6
-ab[_[.ae.]]{2,5}?xy ab____xy_ 0 8
-ab[_[.ae.]]{2,5}?xy ab_____xy_ 0 9
-ab[_[.ae.]]{2,5}?xy ab__xy 0 6
-ab[_[.ae.]]{2,5}?xy ab_____xy 0 9
-ab[_[.ae.]]{2,5}? ab__ 0 4
-ab[_[.ae.]]{2,5}? ab_______ 0 4
-ab[_[.ae.]]{2,5}?xy ab______xy -1 -1
-ab[_[.ae.]]{2,5}xy ab_xy -1 -1
-
-; new bugs detected in spring 2003:
-- normal match_continuous REG_NO_POSIX_TEST
-b abc -1 -1
-
-- normal REG_PERL
-(?!foo)bar foobar 3 6
-(?!foo)bar "??bar" 2 5
-(?!foo)bar "barfoo" 0 3
-(?!foo)bar "bar??" 0 3
-(?!foo)bar bar 0 3
-
-a\Z a\nb -1 -1
-() abc 0 0 0 0
-^() abc 0 0 0 0
-^()+ abc 0 0 0 0
-^(){1} abc 0 0 0 0
-^(){2} abc 0 0 0 0
-^((){2}) abc 0 0 0 0 0 0
-() "" 0 0 0 0
-()\1 "" 0 0 0 0
-()\1 a 0 0 0 0
-a()\1b ab 0 2 1 1
-a()b\1 ab 0 2 1 1
-
-- normal match_not_dot_newline REG_NO_POSIX_TEST
-
-"(.*\r\n){3}.* abcdefghijklmnopqrstuvwxyz.*\r\n" "00001 01 \r\n00002 02 1         2         3         4         5         6         7         8         9         0\r\n00003 03 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\r\n00004 04 \r\n00005 05 \r\n00006 06                                                             Seite: 0001\r\n00007 07                                                             StartSeitEEnde: 0001\r\n00008 08                                                             StartSeiTe Ende: 0001\r\n00009 09                                                             Start seiteEnde: 0001\r\n00010 10                                                             28.2.03\r\n00011 11                                                             Page: 0001\r\n00012 12                                                             Juhu die Erste: 0001\r\n00013 13                                                             Es war einmal! 0001\r\n00014 14                               ABCDEFGHIJKLMNOPQRSTUVWXYZ0001\r\n00015 15                               abcdefghijklmnopqrstuvwxyz0001\r\n00016 16                               lars.schmeiser@gft.com\r\n00017 17 \r\n00018 18 \r\n00019 19 \r\n00020 20 \r\n00021 21 1         2         3         4         5         6         7         8         9         0\r\n00022 22 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\r\n00023 01 \r\n00024 02 1         2         3         4         5         6         7         8         9         0\r\n00025 03 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\r\n00026 04 \r\n00027 05 \r\n00028 06                                                             Seite: 0002\r\n00029 07                                                             StartSeitEEnde: 0002\r\n00030 08                                                             StartSeiTe Ende: 0002\r\n00031 09                                                             Start seiteEnde: 0002\r\n00032 10                                                             28.02.2003\r\n00033 11                                                             Page: 0002\r\n00034 12                                                             Juhu die Erste: 0002\r\n00035 13                                                             Es war einmal! 0002\r\n00036 14                               ABCDEFGHIJKLMNOPQRSTUVWXYZ0002\r\n00037 15                               abcdefghijklmnopqrstuvwxyz0002\r\n00038 16                               lars.schmeiser@194.1.12.111\r\n00039 17 \r\n00040 18 \r\n00041 19 \r\n00042 20 \r\n00043 21 1         2         3         4         5         6         7         8         9         0\r\n" 753 1076 934 1005
-
-- normal REG_PERL
-
-; new (?: construct )
-(?>^abc) abc 0 3
-(?>^abc) def\nabc 4 7
-(?>^abc) defabc -1 -1
-(?>.*/)foo /this/is/a/very/long/line/in/deed/with/very/many/slashes/in/it/you/see/ -1 -1
-(?>.*/)foo /this/is/a/very/long/line/in/deed/with/very/many/slashes/in/and/foo 0 67
-(?>(\.\d\d[1-9]?))\d+ 1.230003938 1 11 1 4
-(?>(\.\d\d[1-9]?))\d+ 1.875000282 1 11 1 5
-(?>(\.\d\d[1-9]?))\d+ 1.235 -1 -1
-^((?>\w+)|(?>\s+))*$ "now is the time for all good men to come to the aid of the party" 0 64 59 64
-^((?>\w+)|(?>\s+))*$ "this is not a line with only words and spaces!" -1 -1
-((?>\d+))(\w) 12345a 0 6 0 5 5 6
-((?>\d+))(\w) 12345+ -1 -1
-((?>\d+))(\d) 12345 -1 -1
-(?>a+)b aaab 0 4
-((?>a+)b) aaab 0 4 0 4
-(?>(a+))b aaab 0 4 0 3
-(?>b)+ aaabbbccc 3 6
-(?>a+|b+|c+)*c aaabbbbccccd 0 8
-((?>[^()]+)|\([^()]*\))+ ((abc(ade)ufh()()x 2 18 17 18
-\(((?>[^()]+)|\([^()]+\))+\) (abc) 0 5 1 4
-\(((?>[^()]+)|\([^()]+\))+\) (abc(def)xyz) 0 13 9 12
-\(((?>[^()]+)|\([^()]+\))+\) ((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -1 -1
-(?>a*)* a 0 1
-(?>a*)* aa 0 2
-(?>a*)* aaaa 0 4
-(?>a*)* a 0 1
-(?>a*)* aaabcde 0 3
-((?>a*))* aaaaa 0 5 5 5
-((?>a*))* aabbaa 0 2 2 2
-((?>a*?))* aaaaa 0 0 0 0
-((?>a*?))*    aabbaa 0 0 0 0
-"word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword" "word cat dog elephant mussel cow horse canary baboon snake shark otherword" 0 74
-"word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword" "word cat dog elephant mussel cow horse canary baboon snake shark" -1 -1
-"word (?>[a-zA-Z0-9]+ ){0,30}otherword" "word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope" -1 -1
-"word (?>[a-zA-Z0-9]+ ){0,30}otherword" "word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I really really hope otherword" -1 -1
-((?>Z)+|A)* ZABCDEFG 0 2 1 2
-((?>)+|A)* !
-
-; subtleties of matching with no sub-expressions marked
-- normal match_nosubs REG_NO_POSIX_TEST
-a(b?c)+d accd 0 4 
-(wee|week)(knights|night) weeknights 0 10 
-.* abc 0 3
-a(b|(c))d abd 0 3 
-a(b|(c))d acd 0 3
-a(b*|c|e)d abbd 0 4
-a(b*|c|e)d acd 0 3 
-a(b*|c|e)d ad 0 2
-a(b?)c abc 0 3
-a(b?)c ac 0 2
-a(b+)c abc 0 3
-a(b+)c abbbc 0 5
-a(b*)c ac 0 2
-(a|ab)(bc([de]+)f|cde) abcdef 0 6
-a([bc]?)c abc 0 3
-a([bc]?)c ac 0 2
-a([bc]+)c abc 0 3
-a([bc]+)c abcc 0 4
-a([bc]+)bc abcbc 0 5
-a(bb+|b)b abb 0 3
-a(bbb+|bb+|b)b abb 0 3
-a(bbb+|bb+|b)b abbb 0 4
-a(bbb+|bb+|b)bb abbb 0 4
-(.*).* abcdef 0 6
-(a*)* bc 0 0
-
-- normal nosubs REG_NO_POSIX_TEST
-a(b?c)+d accd 0 4 
-(wee|week)(knights|night) weeknights 0 10 
-.* abc 0 3
-a(b|(c))d abd 0 3 
-a(b|(c))d acd 0 3
-a(b*|c|e)d abbd 0 4
-a(b*|c|e)d acd 0 3 
-a(b*|c|e)d ad 0 2
-a(b?)c abc 0 3
-a(b?)c ac 0 2
-a(b+)c abc 0 3
-a(b+)c abbbc 0 5
-a(b*)c ac 0 2
-(a|ab)(bc([de]+)f|cde) abcdef 0 6
-a([bc]?)c abc 0 3
-a([bc]?)c ac 0 2
-a([bc]+)c abc 0 3
-a([bc]+)c abcc 0 4
-a([bc]+)bc abcbc 0 5
-a(bb+|b)b abb 0 3
-a(bbb+|bb+|b)b abb 0 3
-a(bbb+|bb+|b)b abbb 0 4
-a(bbb+|bb+|b)bb abbb 0 4
-(.*).* abcdef 0 6
-(a*)* bc 0 0
-
diff --git a/test/regress/v3_tests.txt b/test/regress/v3_tests.txt
deleted file mode 100644
index 5ad00e7f..00000000
--- a/test/regress/v3_tests.txt
+++ /dev/null
@@ -1,908 +0,0 @@
-; 
-; 
-; this file contains a script of tests to run through regress.exe
-;
-; comments start with a semicolon and proceed to the end of the line
-;
-; changes to regular expression compile flags start with a "-" as the first
-; non-whitespace character and consist of a list of the printable names
-; of the flags, for example "match_default"
-;
-; Other lines contain a test to perform using the current flag status
-; the first token contains the expression to compile, the second the string
-; to match it against. If the second string is "!" then the expression should
-; not compile, that is the first string is an invalid regular expression.
-; This is then followed by a list of integers that specify what should match,
-; each pair represents the starting and ending positions of a subexpression
-; starting with the zeroth subexpression (the whole match).
-; A value of -1 indicates that the subexpression should not take part in the
-; match at all, if the first value is -1 then no part of the expression should
-; match the string.
-;
-
-- match_default normal REG_EXTENDED
-
-;
-; try some really simple literals:
-a a 0 1
-Z Z 0 1
-Z aaa -1 -1
-Z xxxxZZxxx 4 5
-
-; and some simple brackets:
-(a) zzzaazz 3 4 3 4
-() zzz 0 0 0 0
-() "" 0 0 0 0
-( !
-) !
-(aa !
-aa) !
-a b -1 -1
-\(\) () 0 2
-\(a\) (a) 0 3
-\() !
-(\) !
-p(a)rameter ABCparameterXYZ 3 12 4 5
-[pq](a)rameter ABCparameterXYZ 3 12 4 5
-
-; now try escaped brackets:
-- match_default bk_parens REG_BASIC
-\(a\) zzzaazz 3 4 3 4
-\(\) zzz 0 0 0 0
-\(\) "" 0 0 0 0
-\( !
-\) !
-\(aa !
-aa\) !
-() () 0 2
-(a) (a) 0 3
-(\) !
-\() !
-
-; now move on to "." wildcards
-- match_default normal REG_EXTENDED REG_STARTEND
-. a 0 1
-. \n 0 1
-. \r 0 1
-. \0 0 1
-- match_default normal match_not_dot_newline REG_EXTENDED REG_STARTEND REG_NEWLINE
-. a 0 1
-. \n -1 -1
-. \r -1 -1
-. \0 0 1
-- match_default normal match_not_dot_null match_not_dot_newline REG_EXTENDED REG_STARTEND REG_NEWLINE
-. \n -1 -1
-. \r -1 -1
-; this *WILL* produce an error from the POSIX API functions:
-- match_default normal match_not_dot_null match_not_dot_newline REG_EXTENDED REG_STARTEND REG_NEWLINE REG_NO_POSIX_TEST
-. \0 -1 -1
-
-
-;
-; now move on to the repetion ops,
-; starting with operator *
-- match_default normal REG_EXTENDED
-a* b 0 0
-ab* a 0 1
-ab* ab 0 2
-ab* sssabbbbbbsss 3 10
-ab*c* a 0 1
-ab*c* abbb 0 4
-ab*c* accc 0 4
-ab*c* abbcc 0 5
-*a !
-\<* !
-\>* !
-\n* \n\n 0 2
-\** ** 0 2
-\* * 0 1
-
-; now try operator +
-ab+ a -1 -1
-ab+ ab 0 2
-ab+ sssabbbbbbsss 3 10
-ab+c+ a -1 -1
-ab+c+ abbb -1 -1
-ab+c+ accc -1 -1
-ab+c+ abbcc 0 5
-+a !
-\<+ !
-\>+ !
-\n+ \n\n 0 2
-\+ + 0 1
-\+ ++ 0 1
-\++ ++ 0 2
-- match_default normal bk_plus_qm REG_EXTENDED REG_NO_POSIX_TEST
-+ + 0 1
-\+ !
-a\+ aa 0 2
-
-; now try operator ?
-- match_default normal REG_EXTENDED
-a? b 0 0
-ab? a 0 1
-ab? ab 0 2
-ab? sssabbbbbbsss 3 5
-ab?c? a 0 1
-ab?c? abbb 0 2
-ab?c? accc 0 2
-ab?c? abcc 0 3
-?a !
-\<? !
-\>? !
-\n? \n\n 0 1
-\? ? 0 1
-\? ?? 0 1
-\?? ?? 0 1
-- match_default normal bk_plus_qm REG_EXTENDED REG_NO_POSIX_TEST
-? ? 0 1
-\? !
-a\? aa 0 1
-a\? b 0 0
-
-- match_default normal limited_ops
-a? a? 0 2
-a+ a+ 0 2
-a\? a? 0 2
-a\+ a+ 0 2
-
-; now try operator {}
-- match_default normal REG_EXTENDED
-a{2} a -1 -1
-a{2} aa 0 2
-a{2} aaa 0 2
-a{2,} a -1 -1
-a{2,} aa 0 2
-a{2,} aaaaa 0 5
-a{2,4} a -1 -1
-a{2,4} aa 0 2
-a{2,4} aaa 0 3
-a{2,4} aaaa 0 4
-a{2,4} aaaaa 0 4
-; spaces are now allowed inside {}
-"a{ 2 , 4 }" aaaaa 0 4
-a{} !
-"a{ }" !
-a{2 !
-a} !
-\{\} {} 0 2
-
-- match_default normal bk_braces
-a\{2\} a -1 -1
-a\{2\} aa 0 2
-a\{2\} aaa 0 2
-a\{2,\} a -1 -1
-a\{2,\} aa 0 2
-a\{2,\} aaaaa 0 5
-a\{2,4\} a -1 -1
-a\{2,4\} aa 0 2
-a\{2,4\} aaa 0 3
-a\{2,4\} aaaa 0 4
-a\{2,4\} aaaaa 0 4
-"a\{ 2 , 4 \}" aaaaa 0 4
-{} {} 0 2
-
-; now test the alternation operator |
-- match_default normal REG_EXTENDED
-a|b a 0 1
-a|b b 0 1
-a(b|c) ab 0 2 1 2
-a(b|c) ac 0 2 1 2
-a(b|c) ad -1 -1 -1 -1
-|c !
-c| !
-(|) !
-(a|) !
-(|a) !
-a\| a| 0 2
-- match_default normal limited_ops
-a| a| 0 2
-a\| a| 0 2
-| | 0 1
-- match_default normal bk_vbar REG_NO_POSIX_TEST
-a| a| 0 2
-a\|b a 0 1
-a\|b b 0 1
-
-; now test the set operator []
-- match_default normal REG_EXTENDED
-; try some literals first
-[abc] a 0 1
-[abc] b 0 1
-[abc] c 0 1
-[abc] d -1 -1
-[^bcd] a 0 1
-[^bcd] b -1 -1
-[^bcd] d -1 -1
-[^bcd] e 0 1
-a[b]c abc 0 3
-a[ab]c abc 0 3
-a[^ab]c adc 0 3
-a[]b]c a]c 0 3
-a[[b]c a[c 0 3
-a[-b]c a-c 0 3
-a[^]b]c adc 0 3
-a[^-b]c adc 0 3
-a[b-]c a-c 0 3
-a[b !
-a[] !
-
-; then some ranges
-[b-e] a -1 -1
-[b-e] b 0 1
-[b-e] e 0 1
-[b-e] f -1 -1
-[^b-e] a 0 1
-[^b-e] b -1 -1
-[^b-e] e -1 -1
-[^b-e] f 0 1
-a[1-3]c a2c 0 3
-a[3-1]c !
-a[1-3-5]c !
-a[1- !
-
-; and some classes
-a[[:alpha:]]c abc 0 3
-a[[:unknown:]]c !
-a[[: !
-a[[:alpha !
-a[[:alpha:] !
-a[[:alpha,:] !
-a[[:]:]]b !
-a[[:-:]]b !
-a[[:alph:]] !
-a[[:alphabet:]] !
-[[:alnum:]]+ -%@a0X_- 3 6
-[[:alpha:]]+ -%@aX_0- 3 5
-[[:blank:]]+ "a  \tb" 1 4
-[[:cntrl:]]+ a\n\tb 1 3
-[[:digit:]]+ a019b 1 4
-[[:graph:]]+ " a%b " 1 4
-[[:lower:]]+ AabC 1 3
-; This test fails with STLPort, disable for now as this is a corner case anyway...
-;[[:print:]]+ "\na b\n" 1 4
-[[:punct:]]+ " %-&\t" 1 4
-[[:space:]]+ "a \n\t\rb" 1 5
-[[:upper:]]+ aBCd 1 3
-[[:xdigit:]]+ p0f3Cx 1 5
-
-; now test flag settings:
-- escape_in_lists REG_NO_POSIX_TEST
-[\n] \n 0 1
-- REG_NO_POSIX_TEST
-[\n] \n -1 -1
-[\n] \\ 0 1
-[[:class:] : 0 1
-[[:class:] [ 0 1
-[[:class:] c 0 1
-
-; line anchors
-- match_default normal REG_EXTENDED
-^ab ab 0 2
-^ab xxabxx -1 -1
-^ab xx\nabzz 3 5
-ab$ ab 0 2
-ab$ abxx -1 -1
-ab$ ab\nzz 0 2
-- match_default match_not_bol match_not_eol normal REG_EXTENDED REG_NOTBOL REG_NOTEOL
-^ab ab -1 -1
-^ab xxabxx -1 -1
-^ab xx\nabzz 3 5
-ab$ ab -1 -1
-ab$ abxx -1 -1
-ab$ ab\nzz 0 2
-
-; back references
-- match_default normal REG_EXTENDED
-a(b)\2c	!
-a(b\1)c	!
-a(b*)c\1d abbcbbd 0 7 1 3
-a(b*)c\1d abbcbd -1 -1
-a(b*)c\1d abbcbbbd -1 -1
-^(.)\1 abc -1 -1
-a([bc])\1d abcdabbd	4 8 5 6
-; strictly speaking this is at best ambiguous, at worst wrong, this is what most
-; re implimentations will match though.
-a(([bc])\2)*d abbccd 0 6 3 5 3 4
-
-a(([bc])\2)*d abbcbd -1 -1
-a((b)*\2)*d abbbd 0 5 1 4 2 3
-(ab*)[ab]*\1 ababaaa 0 7 0 1
-(a)\1bcd aabcd 0 5 0 1
-(a)\1bc*d aabcd 0 5 0 1
-(a)\1bc*d aabd 0 4 0 1
-(a)\1bc*d aabcccd 0 7 0 1
-(a)\1bc*[ce]d aabcccd 0 7 0 1
-^(a)\1b(c)*cd$ aabcccd 0 7 0 1 4 5
-
-;
-; characters by code:
-- match_default normal REG_EXTENDED REG_STARTEND
-\0101 A 0 1
-\00 \0 0 1
-\0 \0 0 1
-\0172 z 0 1
-
-;
-; word operators:
-\w a 0 1
-\w z 0 1
-\w A 0 1
-\w Z 0 1
-\w _ 0 1
-\w } -1 -1
-\w ` -1 -1
-\w [ -1 -1
-\w @ -1 -1
-; non-word:
-\W a -1 -1
-\W z -1 -1
-\W A -1 -1
-\W Z -1 -1
-\W _ -1 -1
-\W } 0 1
-\W ` 0 1
-\W [ 0 1
-\W @ 0 1
-; word start:
-\<abcd "  abcd" 2 6
-\<ab cab -1 -1
-\<ab "\nab" 1 3
-\<tag ::tag 2 5
-;word end:
-abc\> abc 0 3
-abc\> abcd -1 -1
-abc\> abc\n 0 3
-abc\> abc:: 0 3
-; word boundary:
-\babcd "  abcd" 2 6
-\bab cab -1 -1
-\bab "\nab" 1 3
-\btag ::tag 2 5
-abc\b abc 0 3
-abc\b abcd -1 -1
-abc\b abc\n 0 3
-abc\b abc:: 0 3
-; within word:
-\B ab 1 1
-a\Bb ab 0 2
-a\B ab 0 1
-a\B a -1 -1
-a\B "a " -1 -1
-
-;
-; buffer operators:
-\`abc abc 0 3
-\`abc \nabc -1 -1
-\`abc " abc" -1 -1
-abc\' abc 0 3
-abc\' abc\n -1 -1
-abc\' "abc " -1 -1
-
-;
-; extra escape sequences:
-\a \a 0 1
-\f \f 0 1
-\n \n 0 1
-\r \r 0 1
-\t \t 0 1
-\v \v 0 1
-
-
-;
-; now follows various complex expressions designed to try and bust the matcher:
-a(((b)))c abc 0 3 1 2 1 2 1 2
-a(b|(c))d abd 0 3 1 2 -1 -1
-a(b|(c))d acd 0 3 1 2 1 2
-a(b*|c)d abbd 0 4 1 3
-; just gotta have one DFA-buster, of course
-a[ab]{20} aaaaabaaaabaaaabaaaab 0 21
-; and an inline expansion in case somebody gets tricky
-a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab] aaaaabaaaabaaaabaaaab 0 21
-; and in case somebody just slips in an NFA...
-a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab](wee|week)(knights|night) aaaaabaaaabaaaabaaaabweeknights 0 31 21 24 24 31
-; one really big one
-1234567890123456789012345678901234567890123456789012345678901234567890 a1234567890123456789012345678901234567890123456789012345678901234567890b 1 71
-; fish for problems as brackets go past 8
-[ab][cd][ef][gh][ij][kl][mn] xacegikmoq 1 8
-[ab][cd][ef][gh][ij][kl][mn][op] xacegikmoq 1 9
-[ab][cd][ef][gh][ij][kl][mn][op][qr] xacegikmoqy 1 10
-[ab][cd][ef][gh][ij][kl][mn][op][q] xacegikmoqy 1 10
-; and as parenthesis go past 9:
-(a)(b)(c)(d)(e)(f)(g)(h) zabcdefghi 1 9 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9
-(a)(b)(c)(d)(e)(f)(g)(h)(i) zabcdefghij 1 10 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9 9 10
-(a)(b)(c)(d)(e)(f)(g)(h)(i)(j) zabcdefghijk 1 11 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9 9 10 10 11
-(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k) zabcdefghijkl 1 12 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9 9 10 10 11 11 12
-(a)d|(b)c abc 1 3 -1 -1 1 2
-"_+((www)|(ftp)|(mailto)):_*" "_wwwnocolon _mailto:" 12 20 13 19 -1 -1 -1 -1 13 19
-
-; subtleties of matching
-a(b)?c\1d acd 0 3 -1 -1
-a(b?c)+d accd 0 4 2 3
-(wee|week)(knights|night) weeknights 0 10 0 3 3 10
-.* abc 0 3
-a(b|(c))d abd 0 3 1 2 -1 -1
-a(b|(c))d acd 0 3 1 2 1 2
-a(b*|c|e)d abbd 0 4 1 3
-a(b*|c|e)d acd 0 3 1 2
-a(b*|c|e)d ad 0 2 1 1
-a(b?)c abc 0 3 1 2
-a(b?)c ac 0 2 1 1
-a(b+)c abc 0 3 1 2
-a(b+)c abbbc 0 5 1 4 
-a(b*)c ac 0 2 1 1 
-(a|ab)(bc([de]+)f|cde) abcdef 0 6 0 1 1 6 3 5
-a([bc]?)c abc 0 3 1 2
-a([bc]?)c ac 0 2 1 1 
-a([bc]+)c abc 0 3 1 2
-a([bc]+)c abcc 0 4 1 3
-a([bc]+)bc abcbc 0 5 1 3
-a(bb+|b)b abb 0 3 1 2
-a(bbb+|bb+|b)b abb 0 3 1 2
-a(bbb+|bb+|b)b abbb 0 4 1 3
-a(bbb+|bb+|b)bb abbb 0 4 1 2
-(.*).* abcdef 0 6 0 6
-(a*)* bc 0 0 0 0
-
-; do we get the right subexpression when it is used more than once?
-a(b|c)*d ad 0 2 -1 -1
-a(b|c)*d abcd 0 4 2 3
-a(b|c)+d abd 0 3 1 2
-a(b|c)+d abcd 0 4 2 3
-a(b|c?)+d ad 0 2 1 1
-a(b|c?)+d abcd 0 4 2 3
-a(b|c){0,0}d ad 0 2 -1 -1
-a(b|c){0,1}d ad 0 2 -1 -1
-a(b|c){0,1}d abd 0 3 1 2
-a(b|c){0,2}d ad 0 2 -1 -1
-a(b|c){0,2}d abcd 0 4 2 3
-a(b|c){0,}d ad 0 2 -1 -1
-a(b|c){0,}d abcd 0 4 2 3
-a(b|c){1,1}d abd 0 3 1 2
-a(b|c){1,2}d abd 0 3 1 2
-a(b|c){1,2}d abcd 0 4 2 3
-a(b|c){1,}d abd 0 3 1 2
-a(b|c){1,}d abcd 0 4 2 3
-a(b|c){2,2}d acbd 0 4 2 3
-a(b|c){2,2}d abcd 0 4 2 3
-a(b|c){2,4}d abcd 0 4 2 3
-a(b|c){2,4}d abcbd 0 5 3 4
-a(b|c){2,4}d abcbcd 0 6 4 5
-a(b|c){2,}d abcd 0 4 2 3
-a(b|c){2,}d abcbd 0 5 3 4
-a(b+|((c)*))+d abd 0 3 1 2 -1 -1 -1 -1
-a(b+|((c)*))+d abcd 0 4 2 3 2 3 2 3
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_NOSPEC literal
-\**?/{} \\**?/{} 0 7
-
-- match_default normal REG_EXTENDED REG_NO_POSIX_TEST ; we disable POSIX testing because it can't handle escapes in sets
-; try to match C++ syntax elements:
-; line comment:
-//[^\n]* "++i //here is a line comment\n" 4 28
-; block comment:
-/\*([^*]|\*+[^*/])*\*+/ "/* here is a block comment */" 0 29 26 27
-/\*([^*]|\*+[^*/])*\*+/ "/**/" 0 4 -1 -1
-/\*([^*]|\*+[^*/])*\*+/ "/***/" 0 5 -1 -1
-/\*([^*]|\*+[^*/])*\*+/ "/****/" 0 6 -1 -1
-/\*([^*]|\*+[^*/])*\*+/ "/*****/" 0 7 -1 -1
-/\*([^*]|\*+[^*/])*\*+/ "/*****/*/" 0 7 -1 -1
-; preprossor directives:
-^[[:blank:]]*#([^\n]*\\[[:space:]]+)*[^\n]* "#define some_symbol" 0 19 -1 -1
-^[[:blank:]]*#([^\n]*\\[[:space:]]+)*[^\n]* "#define some_symbol(x) #x" 0 25 -1 -1
-^[[:blank:]]*#([^\n]*\\[[:space:]]+)*[^\n]* "#define some_symbol(x) \\  \r\n  foo();\\\r\n   printf(#x);" 0 53 28 42
-; literals:
-((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)? 0xFF         						0 4		0 4		0 4 	-1 -1 	-1 -1 	-1 -1 	-1 -1
-((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)? 35 									0 2 	0 2		-1 -1 	0 2 	-1 -1 	-1 -1 	-1 -1
-((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)? 0xFFu 								0 5		0 4		0 4 	-1 -1 	-1 -1 	-1 -1 	-1 -1
-((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)? 0xFFL 								0 5		0 4		0 4 	-1 -1 	4 5 	-1 -1 	-1 -1
-((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)? 0xFFFFFFFFFFFFFFFFuint64 			0 24	0 18	0 18 	-1 -1 	19 24 	19 24 	22 24
-; strings:
-'([^\\']|\\.)*' '\\x3A' 0 6 4 5
-'([^\\']|\\.)*' '\\'' 0 4 1 3
-'([^\\']|\\.)*' '\\n' 0 4 1 3
-
-; now try and test some unicode specific characters:
-- match_default normal REG_PERL REG_UNICODE_ONLY
-[[:unicode:]]+  a\0300\0400z 1 3
-[\x10-\xff] \39135\12409 -1 -1
-[\01-\05]{5} \36865\36865\36865\36865\36865 -1 -1
-
-; finally try some case insensitive matches:
-- match_default normal REG_EXTENDED REG_ICASE
-; upper and lower have no meaning here so they fail, however these
-; may compile with other libraries...
-;[[:lower:]] !
-;[[:upper:]] !
-0123456789@abcdefghijklmnopqrstuvwxyz\[\\\]\^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ\{\|\} 0123456789@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]\^_`abcdefghijklmnopqrstuvwxyz\{\|\} 0 72
-
-; known and suspected bugs:
-- match_default normal REG_EXTENDED
-\( ( 0 1
-\) ) 0 1
-\$ $ 0 1
-\^ ^ 0 1
-\. . 0 1
-\* * 0 1
-\+ + 0 1
-\? ? 0 1
-\[ [ 0 1
-\] ] 0 1
-\| | 0 1
-\\ \\ 0 1
-# # 0 1
-\# # 0 1
-a- a- 0 2
-\- - 0 1
-\{ { 0 1
-\} } 0 1
-0 0 0 1
-1 1 0 1
-9 9 0 1
-b b 0 1
-B B 0 1
-< < 0 1
-> > 0 1
-w w 0 1
-W W 0 1
-` ` 0 1
-' ' 0 1
-\n \n 0 1
-, , 0 1
-a a 0 1
-f f 0 1
-n n 0 1
-r r 0 1
-t t 0 1
-v v 0 1
-c c 0 1
-x x 0 1
-: : 0 1
-(\.[[:alnum:]]+){2} "w.a.b " 1 5 3 5
-
-- match_default normal REG_EXTENDED REG_ICASE
-a A 0 1
-A a 0 1
-[abc]+ abcABC 0 6
-[ABC]+ abcABC 0 6
-[a-z]+ abcABC 0 6
-[A-Z]+ abzANZ 0 6
-[a-Z]+ abzABZ 0 6
-[A-z]+ abzABZ 0 6
-[[:lower:]]+ abyzABYZ 0 8
-[[:upper:]]+ abzABZ 0 6
-[[:word:]]+ abcZZZ 0 6
-[[:alpha:]]+ abyzABYZ 0 8
-[[:alnum:]]+ 09abyzABYZ 0 10
-
-; updated tests for version 2:
-- match_default normal REG_EXTENDED
-\x41 A 0 1
-\xff \255 0 1
-\xFF \255 0 1
-- match_default normal REG_EXTENDED REG_NO_POSIX_TEST
-\c@ \0 0 1
-- match_default normal REG_EXTENDED
-\cA \1 0 1
-\cz \58 0 1
-\c= !
-\c? !
-=: =: 0 2
-
-; word start:
-[[:<:]]abcd "  abcd" 2 6
-[[:<:]]ab cab -1 -1
-[[:<:]]ab "\nab" 1 3
-[[:<:]]tag ::tag 2 5
-;word end:
-abc[[:>:]] abc 0 3
-abc[[:>:]] abcd -1 -1
-abc[[:>:]] abc\n 0 3
-abc[[:>:]] abc:: 0 3
-
-; collating elements and rewritten set code:
-- match_default normal REG_EXTENDED REG_STARTEND
-[[.zero.]] 0 0 1
-[[.one.]] 1 0 1
-[[.two.]] 2 0 1
-[[.three.]] 3 0 1
-[[.a.]] baa 1 2
-[[.right-curly-bracket.]] } 0 1
-[[.NUL.]] \0 0 1
-[[:<:]z] !
-[a[:>:]] !
-[[=a=]] a 0 1
-[[=right-curly-bracket=]] } 0 1
-- match_default normal REG_EXTENDED REG_STARTEND REG_ICASE
-[[.A.]] A 0 1
-[[.A.]] a 0 1
-[[.A.]-b]+ AaBb 0 4
-[A-[.b.]]+ AaBb 0 4
-[[.a.]-B]+ AaBb 0 4
-[a-[.B.]]+ AaBb 0 4
-- match_default normal REG_EXTENDED REG_NO_POSIX_TEST
-[\x61] a 0 1
-[\x61-c]+ abcd 0 3
-[a-\x63]+ abcd 0 3
-- match_default normal REG_EXTENDED REG_STARTEND
-[[.a.]-c]+ abcd 0 3
-[a-[.c.]]+ abcd 0 3
-[[:alpha:]-a] !
-[a-[:alpha:]] !
-
-; try mutli-character ligatures:
-[[.ae.]] ae 0 2
-[[.ae.]] aE -1 -1
-[[.AE.]] AE 0 2
-[[.Ae.]] Ae 0 2
-[[.ae.]-b] a -1 -1
-[[.ae.]-b] b 0 1
-[[.ae.]-b] ae 0 2
-[a-[.ae.]] a 0 1
-[a-[.ae.]] b -1 -1
-[a-[.ae.]] ae 0 2
-- match_default normal REG_EXTENDED REG_STARTEND REG_ICASE
-[[.ae.]] AE 0 2
-[[.ae.]] Ae 0 2
-[[.AE.]] Ae 0 2
-[[.Ae.]] aE 0 2
-[[.AE.]-B] a -1 -1
-[[.Ae.]-b] b 0 1
-[[.Ae.]-b] B 0 1
-[[.ae.]-b] AE 0 2
-
-- match_default normal REG_EXTENDED REG_STARTEND
-;extended perl style escape sequences:
-\e \27 0 1
-\x1b \27 0 1
-\x{1b} \27 0 1
-\x{} !
-\x{ !
-\x} !
-\x !
-\x{yy !
-\x{1b !
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_NO_POSIX_TEST
-\l+ ABabcAB 2 5
-[\l]+ ABabcAB 2 5
-[a-\l] !
-[\l-a] !
-[\L] !
-\L+ abABCab 2 5
-\u+ abABCab 2 5
-[\u]+ abABCab 2 5
-[\U] !
-\U+ ABabcAB 2 5
-\d+ ab012ab 2 5
-[\d]+ ab012ab 2 5
-[\D] !
-\D+ 01abc01 2 5
-\s+ "ab   ab" 2 5
-[\s]+ "ab   ab" 2 5
-[\S] !
-\S+ "  abc  " 2 5
-- match_default normal REG_EXTENDED REG_STARTEND
-\Qabc !
-\Qabc\E abcd 0 3
-\Qabc\Ed abcde 0 4
-\Q+*?\\E +*?\\ 0 4
-
-\C+ abcde 0 5
-\X+ abcde 0 5
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_UNICODE_ONLY
-\X+ a\768\769 0 3
-\X+ \2309\2307 0 2   ;DEVANAGARI script
-\X+ \2489\2494 0 2   ;BENGALI script
-
-- match_default normal REG_EXTENDED REG_STARTEND
-\Aabc abc 0 3
-\Aabc aabc -1 -1
-abc\z abc 0 3
-abc\z abcd -1 -1
-abc\Z abc\n\n 0 3
-abc\Z abc 0 3
-
-
-\Gabc abc 0 3
-\Gabc dabcd -1 -1
-a\Gbc abc -1 -1
-a\Aab abc -1 -1
-
-;
-; now test grep,
-; basically check all our restart types - line, word, etc
-; checking each one for null and non-null matches.
-;
-- match_default normal REG_EXTENDED REG_STARTEND REG_GREP
-a " a a a aa" 1 2 3 4 5 6 7 8 8 9
-a+b+ "aabaabbb ab" 0 3 3 8 9 11
-a(b*|c|e)d adabbdacd 0 2 2 6 6 9
-a "\na\na\na\naa" 1 2 3 4 5 6 7 8 8 9
-
-^ "   \n\n  \n\n\n" 0 0 4 4 5 5 8 8 9 9 10 10
-^ab  "ab  \nab  ab\n" 0 2 5 7
-^[^\n]*\n "   \n  \n\n  \n" 0 4 4 7 7 8 8 11
-\<abc "abcabc abc\n\nabc" 0 3 7 10 12 15
-\< "  ab a aaa  "  2 2 5 5 7 7
-\<\w+\W+ " aa  aa  a " 1 5 5 9 9 11
-
-\Aabc "abc   abc"  0 3
-\G\w+\W+ "abc  abc a cbbb   " 0 5 5 9 9 11 11 18
-\Ga+b+ "aaababb  abb" 0 4 4 7
-
-abc abc 0 3
-abc " abc abcabc " 1 4 5 8 8 11
-\n\n " \n\n\n       \n      \n\n\n\n  " 1 3 18 20 20 22
-
-$ "   \n\n  \n\n\n" 3 3 4 4 7 7 8 8 9 9 10 10
-\b "  abb a abbb " 2 2 5 5 6 6 7 7 8 8 12 12
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_GREP REG_ICASE
-A " a a a aa" 1 2 3 4 5 6 7 8 8 9
-A+B+ "aabaabbb ab" 0 3 3 8 9 11
-A(B*|c|e)D adabbdacd 0 2 2 6 6 9
-A "\na\na\na\naa" 1 2 3 4 5 6 7 8 8 9
-
-^aB  "Ab  \nab  Ab\n" 0 2 5 7
-\<abc "Abcabc aBc\n\nabc" 0 3 7 10 12 15
-
-ABC abc 0 3
-abc " ABC ABCABC " 1 4 5 8 8 11
-
-
-;
-; now test merge,
-;
-- match_default normal REG_EXTENDED REG_STARTEND REG_MERGE format_no_copy
-; start by testing subs:
-a+ "...aaa,,," $` "..." 
-a+ "...aaa,,," $' ",,," 
-a+ "...aaa,,," $& "aaa" 
-a+ "...aaa,,," $0 aaa
-a+ "...aaa,,," $1 ""
-a+ "...aaa,,," $15 ""
-(a+)b+ "...aaabbb,,," $1 aaa
-[[:digit:]]* 123ab <$0> <123><><><>
-[[:digit:]]* 123ab1 <$0> <123><><><1>
-
-; and now escapes:
-a+ "...aaa,,," $x "$x" 
-a+ "...aaa,,," \a "\a" 
-a+ "...aaa,,," \f "\f" 
-a+ "...aaa,,," \n "\n" 
-a+ "...aaa,,," \r "\r" 
-a+ "...aaa,,," \t "\t" 
-a+ "...aaa,,," \v "\v" 
-
-a+ "...aaa,,," \x21 "!" 
-a+ "...aaa,,," \x{21} "!" 
-a+ "...aaa,,," \c@ \0
-a+ "...aaa,,," \e \27
-a+ "...aaa,,," \0101 A
-a+ "...aaa,,," (\0101) A
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_MERGE format_sed format_no_copy
-(a+)(b+) ...aabb,, \0 aabb
-(a+)(b+) ...aabb,, \1 aa
-(a+)(b+) ...aabb,, \2 bb
-(a+)(b+) ...aabb,, & aabb
-(a+)(b+) ...aabb,, $ $
-(a+)(b+) ...aabb,, $1 $1
-(a+)(b+) ...aabb,, ()?: ()?:
-(a+)(b+) ...aabb,, \\ \\
-(a+)(b+) ...aabb,, \& &
-
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_MERGE format_perl format_no_copy
-(a+)(b+) ...aabb,, $0 aabb
-(a+)(b+) ...aabb,, $1 aa
-(a+)(b+) ...aabb,, $2 bb
-(a+)(b+) ...aabb,, $& aabb
-(a+)(b+) ...aabb,, & &
-(a+)(b+) ...aabb,, \0 \0
-(a+)(b+) ...aabb,, ()?: ()?:
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_MERGE
-; move to copying unmatched data:
-a+ "...aaa,,," bbb "...bbb,,," 
-a+(b+) "...aaabb,,," $1 "...bb,,," 
-a+(b+) "...aaabb,,,ab*abbb?" $1 "...bb,,,b*bbb?" 
-
-(a+)|(b+) "...aaabb,,,ab*abbb?" (?1A)(?2B) "...AB,,,AB*AB?" 
-(a+)|(b+) "...aaabb,,,ab*abbb?" ?1A:B "...AB,,,AB*AB?" 
-(a+)|(b+) "...aaabb,,,ab*abbb?" (?1A:B)C "...ACBC,,,ACBC*ACBC?" 
-(a+)|(b+) "...aaabb,,,ab*abbb?" ?1:B "...B,,,B*B?" 
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_MERGE format_first_only
-; move to copying unmatched data, but replace first occurance only:
-a+ "...aaa,,," bbb "...bbb,,," 
-a+(b+) "...aaabb,,," $1 "...bb,,," 
-a+(b+) "...aaabb,,,ab*abbb?" $1 "...bb,,,ab*abbb?" 
-(a+)|(b+) "...aaabb,,,ab*abbb?" (?1A)(?2B) "...Abb,,,ab*abbb?" 
-
-;
-; changes to newline handling with 2.11:
-;
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_GREP
-
-^. "  \n  \r\n  " 0 1 3 4 7 8
-.$ "  \n  \r\n  " 1 2 4 5 8 9
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_GREP REG_UNICODE_ONLY
-^. "  \8232 \8233  " 0 1 3 4 5 6
-.$ "  \8232 \8233  " 1 2 3 4 6 7
-
-;
-; non-greedy repeats added 21/04/00
-- match_default normal REG_EXTENDED
-a** !
-a*? aa 0 0
-a?? aa 0 0
-a++ !
-a+? aa 0 1
-a{1,3}{1} !
-a{1,3}? aaa 0 1
-\w+?w ...ccccccwcccccw 3 10
-\W+\w+?w ...ccccccwcccccw 0 10
-abc|\w+? abd 0 1
-abc|\w+? abcd 0 3
-<\s*tag[^>]*>(.*?)<\s*/tag\s*> " <tag>here is some text</tag> <tag></tag>" 1 29 6 23
-<\s*tag[^>]*>(.*?)<\s*/tag\s*> " < tag attr=\"something\">here is some text< /tag > <tag></tag>" 1 49 24 41
-
-;
-; non-marking parenthesis added 25/04/00
-- match_default normal REG_EXTENDED
-(?:abc)+ xxabcabcxx 2 8
-(?:a+)(b+) xaaabbbx 1 7 4 7
-(a+)(?:b+) xaaabbba 1 7 1 4
-(?:(a+)b+) xaaabbba 1 7 1 4
-(?:a+(b+)) xaaabbba 1 7 4 7
-a+(?#b+)b+ xaaabbba 1 7
-(a)(?:b|$) ab 0 2 0 1
-(a)(?:b|$) a 0 1 0 1
-
-
-;
-; try some partial matches:
-- match_partial match_default normal REG_EXTENDED REG_NO_POSIX_TEST
-(xyz)(.*)abc xyzaaab -1 -1 0 3 3 7
-(xyz)(.*)abc xyz -1 -1 0 3 3 3
-(xyz)(.*)abc xy -1 -1 -1 -1 -1 -1
-
-;
-; forward lookahead asserts added 21/01/02
-- match_default normal REG_EXTENDED REG_NO_POSIX_TEST
-((?:(?!a|b)\w)+)(\w+) "  xxxabaxxx  " 2 11 2 5 5 11
-
-/\*(?:(?!\*/).)*\*/ "  /**/  " 2 6
-/\*(?:(?!\*/).)*\*/ "  /***/  " 2 7
-/\*(?:(?!\*/).)*\*/ "  /********/  " 2 12
-/\*(?:(?!\*/).)*\*/ "  /* comment */  " 2 15
-
-<\s*a[^>]*>((?:(?!<\s*/\s*a\s*>).)*)<\s*/\s*a\s*> " <a href=\"here\">here</a> " 1 24 16 20
-<\s*a[^>]*>((?:(?!<\s*/\s*a\s*>).)*)<\s*/\s*a\s*> " <a href=\"here\">here< /  a > " 1 28 16 20
-
-<\s*a[^>]*>((?:(?!<\s*/\s*a\s*>).)*)(?=<\s*/\s*a\s*>) " <a href=\"here\">here</a> " 1 20 16 20
-<\s*a[^>]*>((?:(?!<\s*/\s*a\s*>).)*)(?=<\s*/\s*a\s*>) " <a href=\"here\">here< /  a > " 1 20 16 20
-
-; filename matching:
-^(?!^(?:PRN|AUX|CLOCK\$|NUL|CON|COM\d|LPT\d|\..*)(?:\..+)?$)[^\x00-\x1f\\?*:\"|/]+$ command.com 0 11
-^(?!^(?:PRN|AUX|CLOCK\$|NUL|CON|COM\d|LPT\d|\..*)(?:\..+)?$)[^\x00-\x1f\\?*:\"|/]+$ PRN -1 -1
-^(?!^(?:PRN|AUX|CLOCK\$|NUL|CON|COM\d|LPT\d|\..*)(?:\..+)?$)[^\x00-\x1f\\?*:\"|/]+$ COM2 -1 -1
-
-; password checking:
-^(?=.*\d).{4,8}$ abc3 0 4
-^(?=.*\d).{4,8}$ abc3def4 0 8
-^(?=.*\d).{4,8}$ ab2 -1 -1
-^(?=.*\d).{4,8}$ abcdefg -1 -1
-^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{4,8}$ abc3 -1 -1
-^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{4,8}$ abC3 0 4
-^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{4,8}$ ABCD3 -1 -1
-
-
-
-
-
diff --git a/test/regress/vc6-stlport.mak b/test/regress/vc6-stlport.mak
index b8fb913b..0dd6a515 100644
--- a/test/regress/vc6-stlport.mak
+++ b/test/regress/vc6-stlport.mak
@@ -24,7 +24,7 @@ XLFLAGS=
 #
 # sources to compile for each test:
 #
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 !IF "$(MSVCDIR)" == ""
 !ERROR Variable MSVCDIR not set.
@@ -218,3 +218,4 @@ r6mdd.exe : $(SOURCES)
 
 
 
+
diff --git a/test/regress/vc6.mak b/test/regress/vc6.mak
index 39901832..8c0cab3e 100644
--- a/test/regress/vc6.mak
+++ b/test/regress/vc6.mak
@@ -18,7 +18,7 @@ XLFLAGS=
 #
 # sources to compile for each test:
 #
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 CFLAGS= $(INCLUDES) /O2 /GB /GF /Gy -GX -GR -I..\..\..\..\ $(CXXFLAGS)
 
@@ -226,5 +226,6 @@ r6lmd.exe : $(SOURCES)
 
 
 
+
 
 
diff --git a/test/regress/vc7.mak b/test/regress/vc7.mak
index 5fb9282e..7a1794f7 100644
--- a/test/regress/vc7.mak
+++ b/test/regress/vc7.mak
@@ -18,7 +18,7 @@ XLFLAGS=
 #
 # sources to compile for each test:
 #
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 CFLAGS= $(INCLUDES) /O2 /GB /GF /Gy -GX -GR -I..\..\..\..\ $(CXXFLAGS) /DBOOST_LIB_DIAGNOSTIC=1 /Zc:wchar_t
 
@@ -228,5 +228,6 @@ r6lmd.exe : $(SOURCES)
 
 
 
+
 
 
diff --git a/test/regress/vc71.mak b/test/regress/vc71.mak
index 9db1aa1c..008e97fa 100644
--- a/test/regress/vc71.mak
+++ b/test/regress/vc71.mak
@@ -18,7 +18,7 @@ XLFLAGS=
 #
 # sources to compile for each test:
 #
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 CFLAGS= $(INCLUDES) /GB /GF /Gy -GX -GR -I..\..\..\..\ $(CXXFLAGS) /DBOOST_LIB_DIAGNOSTIC=1 /Zc:wchar_t
 
@@ -239,5 +239,6 @@ r6lmd.exe : $(SOURCES)
 
 
 
+