commit of split-config, including any changes required to existing libraries (mainly regex).

[SVN r11138]

appendix.htm

@@ -226,7 +226,7 @@ treated as &quot;unknown&quot; graphic characters. </p>
 an operating system other than Win32, and is encapsulated by the
 traits class <a href="template_class_ref.htm#regex_char_traits"><i>c_regex_traits</i></a>,
 Win32 users can force this model to take effect by defining the
-pre-processor symbol BOOST_RE_LOCALE_C. When this model is in
+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
@@ -261,7 +261,7 @@ regular expression libraries including version 1 of this library.
 </p>
 
 <p>This model is only in effect if the library is built with the
-pre-processor symbol BOOST_RE_LOCALE_CPP defined. When this model
+pre-processor symbol BOOST_REGEX_USE_CPP_LOCALE defined. When this model
 is in effect each instance of reg_expression&lt;&gt; has its own
 instance of std::locale, class reg_expression&lt;&gt; also has a
 member function <i>imbue</i> which allows the locale for the
@@ -292,8 +292,8 @@ supports either message catalogues, or locales other than &quot;C&quot;
 or &quot;POSIX&quot;. </p>
 
 <p>Finally note that if you build the library with a non-default
-localization model, then the appropriate pre-processor symbol (BOOST_RE_LOCALE_C
+localization model, then the appropriate pre-processor symbol (BOOST_REGEX_USE_C_LOCALE
-or BOOST_RE_LOCALE_CPP) must be defined both when you build the
+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/detail/regex_options.hpp&gt;.
@@ -1241,7 +1241,7 @@ regex++ dll's are as follows: <br>
 </table>
 
 <p>Note: you can disable automatic library selection by defining
-the symbol BOOST_RE_NO_LIB when compiling, this is useful if you
+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 regex++. </p>
 

build/bc55.mak

@@ -35,7 +35,7 @@ BCROOT=$(MAKEDIR)\..
 !endif
 
 
-ALL_HEADER=../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_config.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_options.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp
 
 all : bcb5 bcb5\bcb5re300 bcb5\bcb5re300.lib bcb5\bcb5re300m bcb5\bcb5re300m.lib bcb5\bcb5re300lm bcb5\bcb5re300lm.lib bcb5\bcb5re300l bcb5\bcb5re300l.lib
 
@@ -208,57 +208,57 @@ bcb5\bcb5re300m.lib : bcb5\bcb5re300m\c_regex_traits.obj bcb5\bcb5re300m\c_regex
 ########################################################
 bcb5\bcb5re300lm\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb5\bcb5re300lm\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb5\bcb5re300lm\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb5\bcb5re300lm\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\cregex.obj ../src/cregex.cpp
 |
 
 bcb5\bcb5re300lm\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb5\bcb5re300lm\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb5\bcb5re300lm\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\regex.obj ../src/regex.cpp
 |
 
 bcb5\bcb5re300lm\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb5\bcb5re300lm\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb5\bcb5re300lm\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb5\bcb5re300lm\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb5\bcb5re300lm :
@@ -273,7 +273,7 @@ bcb5re300lm_clean :
 
 bcb5\bcb5re300lm.lib : bcb5\bcb5re300lm\c_regex_traits.obj bcb5\bcb5re300lm\c_regex_traits_common.obj bcb5\bcb5re300lm\cpp_regex_traits.obj bcb5\bcb5re300lm\cregex.obj bcb5\bcb5re300lm\fileiter.obj bcb5\bcb5re300lm\posix_api.obj bcb5\bcb5re300lm\regex.obj bcb5\bcb5re300lm\regex_debug.obj bcb5\bcb5re300lm\regex_synch.obj bcb5\bcb5re300lm\w32_regex_traits.obj bcb5\bcb5re300lm\wide_posix_api.obj
 	bcc32 @&&|
--DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb5\bcb5re300lm.dll $(XLFLAGS)  bcb5\bcb5re300lm\c_regex_traits.obj bcb5\bcb5re300lm\c_regex_traits_common.obj bcb5\bcb5re300lm\cpp_regex_traits.obj bcb5\bcb5re300lm\cregex.obj bcb5\bcb5re300lm\fileiter.obj bcb5\bcb5re300lm\posix_api.obj bcb5\bcb5re300lm\regex.obj bcb5\bcb5re300lm\regex_debug.obj bcb5\bcb5re300lm\regex_synch.obj bcb5\bcb5re300lm\w32_regex_traits.obj bcb5\bcb5re300lm\wide_posix_api.obj $(LIBS)
+-tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb5\bcb5re300lm.dll $(XLFLAGS)  bcb5\bcb5re300lm\c_regex_traits.obj bcb5\bcb5re300lm\c_regex_traits_common.obj bcb5\bcb5re300lm\cpp_regex_traits.obj bcb5\bcb5re300lm\cregex.obj bcb5\bcb5re300lm\fileiter.obj bcb5\bcb5re300lm\posix_api.obj bcb5\bcb5re300lm\regex.obj bcb5\bcb5re300lm\regex_debug.obj bcb5\bcb5re300lm\regex_synch.obj bcb5\bcb5re300lm\w32_regex_traits.obj bcb5\bcb5re300lm\wide_posix_api.obj $(LIBS)
 |
 	implib -c bcb5\bcb5re300lm.lib bcb5\bcb5re300lm.dll
 
@@ -284,57 +284,57 @@ bcb5\bcb5re300lm.lib : bcb5\bcb5re300lm\c_regex_traits.obj bcb5\bcb5re300lm\c_re
 ########################################################
 bcb5\bcb5re300l\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb5\bcb5re300l\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb5\bcb5re300l\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb5\bcb5re300l\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\cregex.obj ../src/cregex.cpp
 |
 
 bcb5\bcb5re300l\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb5\bcb5re300l\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb5\bcb5re300l\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\regex.obj ../src/regex.cpp
 |
 
 bcb5\bcb5re300l\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb5\bcb5re300l\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb5\bcb5re300l\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb5\bcb5re300l\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb5\bcb5re300l :
@@ -349,7 +349,7 @@ bcb5re300l_clean :
 
 bcb5\bcb5re300l.lib : bcb5\bcb5re300l\c_regex_traits.obj bcb5\bcb5re300l\c_regex_traits_common.obj bcb5\bcb5re300l\cpp_regex_traits.obj bcb5\bcb5re300l\cregex.obj bcb5\bcb5re300l\fileiter.obj bcb5\bcb5re300l\posix_api.obj bcb5\bcb5re300l\regex.obj bcb5\bcb5re300l\regex_debug.obj bcb5\bcb5re300l\regex_synch.obj bcb5\bcb5re300l\w32_regex_traits.obj bcb5\bcb5re300l\wide_posix_api.obj
 	bcc32 @&&|
--DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb5\bcb5re300l.dll $(XLFLAGS)  bcb5\bcb5re300l\c_regex_traits.obj bcb5\bcb5re300l\c_regex_traits_common.obj bcb5\bcb5re300l\cpp_regex_traits.obj bcb5\bcb5re300l\cregex.obj bcb5\bcb5re300l\fileiter.obj bcb5\bcb5re300l\posix_api.obj bcb5\bcb5re300l\regex.obj bcb5\bcb5re300l\regex_debug.obj bcb5\bcb5re300l\regex_synch.obj bcb5\bcb5re300l\w32_regex_traits.obj bcb5\bcb5re300l\wide_posix_api.obj $(LIBS)
+-tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb5\bcb5re300l.dll $(XLFLAGS)  bcb5\bcb5re300l\c_regex_traits.obj bcb5\bcb5re300l\c_regex_traits_common.obj bcb5\bcb5re300l\cpp_regex_traits.obj bcb5\bcb5re300l\cregex.obj bcb5\bcb5re300l\fileiter.obj bcb5\bcb5re300l\posix_api.obj bcb5\bcb5re300l\regex.obj bcb5\bcb5re300l\regex_debug.obj bcb5\bcb5re300l\regex_synch.obj bcb5\bcb5re300l\w32_regex_traits.obj bcb5\bcb5re300l\wide_posix_api.obj $(LIBS)
 |
 	implib -c bcb5\bcb5re300l.lib bcb5\bcb5re300l.dll
 

build/bcb4.mak

@@ -35,7 +35,7 @@ BCROOT=$(MAKEDIR)\..
 !endif
 
 
-ALL_HEADER=../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_config.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_options.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp
 
 all : bcb4 bcb4\bcb4re300 bcb4\bcb4re300.lib bcb4\bcb4re300m bcb4\bcb4re300m.lib bcb4\bcb4re300v bcb4\bcb4re300v.lib bcb4\bcb4re300lv bcb4\bcb4re300lv.lib bcb4\bcb4re300lm bcb4\bcb4re300lm.lib bcb4\bcb4re300l bcb4\bcb4re300l.lib
 
@@ -285,57 +285,57 @@ bcb4\bcb4re300v.lib : bcb4\bcb4re300v\c_regex_traits.obj bcb4\bcb4re300v\c_regex
 ########################################################
 bcb4\bcb4re300lv\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb4\bcb4re300lv\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb4\bcb4re300lv\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb4\bcb4re300lv\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\cregex.obj ../src/cregex.cpp
 |
 
 bcb4\bcb4re300lv\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb4\bcb4re300lv\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb4\bcb4re300lv\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\regex.obj ../src/regex.cpp
 |
 
 bcb4\bcb4re300lv\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb4\bcb4re300lv\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb4\bcb4re300lv\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb4\bcb4re300lv\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lv\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb4\bcb4re300lv :
@@ -350,7 +350,7 @@ bcb4re300lv_clean :
 
 bcb4\bcb4re300lv.lib : bcb4\bcb4re300lv\c_regex_traits.obj bcb4\bcb4re300lv\c_regex_traits_common.obj bcb4\bcb4re300lv\cpp_regex_traits.obj bcb4\bcb4re300lv\cregex.obj bcb4\bcb4re300lv\fileiter.obj bcb4\bcb4re300lv\posix_api.obj bcb4\bcb4re300lv\regex.obj bcb4\bcb4re300lv\regex_debug.obj bcb4\bcb4re300lv\regex_synch.obj bcb4\bcb4re300lv\w32_regex_traits.obj bcb4\bcb4re300lv\wide_posix_api.obj
 	bcc32 @&&|
--DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb4\bcb4re300lv.dll $(XLFLAGS)  bcb4\bcb4re300lv\c_regex_traits.obj bcb4\bcb4re300lv\c_regex_traits_common.obj bcb4\bcb4re300lv\cpp_regex_traits.obj bcb4\bcb4re300lv\cregex.obj bcb4\bcb4re300lv\fileiter.obj bcb4\bcb4re300lv\posix_api.obj bcb4\bcb4re300lv\regex.obj bcb4\bcb4re300lv\regex_debug.obj bcb4\bcb4re300lv\regex_synch.obj bcb4\bcb4re300lv\w32_regex_traits.obj bcb4\bcb4re300lv\wide_posix_api.obj $(LIBS)
+-tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb4\bcb4re300lv.dll $(XLFLAGS)  bcb4\bcb4re300lv\c_regex_traits.obj bcb4\bcb4re300lv\c_regex_traits_common.obj bcb4\bcb4re300lv\cpp_regex_traits.obj bcb4\bcb4re300lv\cregex.obj bcb4\bcb4re300lv\fileiter.obj bcb4\bcb4re300lv\posix_api.obj bcb4\bcb4re300lv\regex.obj bcb4\bcb4re300lv\regex_debug.obj bcb4\bcb4re300lv\regex_synch.obj bcb4\bcb4re300lv\w32_regex_traits.obj bcb4\bcb4re300lv\wide_posix_api.obj $(LIBS)
 |
 	implib -c bcb4\bcb4re300lv.lib bcb4\bcb4re300lv.dll
 
@@ -361,57 +361,57 @@ bcb4\bcb4re300lv.lib : bcb4\bcb4re300lv\c_regex_traits.obj bcb4\bcb4re300lv\c_re
 ########################################################
 bcb4\bcb4re300lm\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb4\bcb4re300lm\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb4\bcb4re300lm\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb4\bcb4re300lm\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\cregex.obj ../src/cregex.cpp
 |
 
 bcb4\bcb4re300lm\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb4\bcb4re300lm\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb4\bcb4re300lm\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\regex.obj ../src/regex.cpp
 |
 
 bcb4\bcb4re300lm\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb4\bcb4re300lm\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb4\bcb4re300lm\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb4\bcb4re300lm\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300lm\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb4\bcb4re300lm :
@@ -426,7 +426,7 @@ bcb4re300lm_clean :
 
 bcb4\bcb4re300lm.lib : bcb4\bcb4re300lm\c_regex_traits.obj bcb4\bcb4re300lm\c_regex_traits_common.obj bcb4\bcb4re300lm\cpp_regex_traits.obj bcb4\bcb4re300lm\cregex.obj bcb4\bcb4re300lm\fileiter.obj bcb4\bcb4re300lm\posix_api.obj bcb4\bcb4re300lm\regex.obj bcb4\bcb4re300lm\regex_debug.obj bcb4\bcb4re300lm\regex_synch.obj bcb4\bcb4re300lm\w32_regex_traits.obj bcb4\bcb4re300lm\wide_posix_api.obj
 	bcc32 @&&|
--DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb4\bcb4re300lm.dll $(XLFLAGS)  bcb4\bcb4re300lm\c_regex_traits.obj bcb4\bcb4re300lm\c_regex_traits_common.obj bcb4\bcb4re300lm\cpp_regex_traits.obj bcb4\bcb4re300lm\cregex.obj bcb4\bcb4re300lm\fileiter.obj bcb4\bcb4re300lm\posix_api.obj bcb4\bcb4re300lm\regex.obj bcb4\bcb4re300lm\regex_debug.obj bcb4\bcb4re300lm\regex_synch.obj bcb4\bcb4re300lm\w32_regex_traits.obj bcb4\bcb4re300lm\wide_posix_api.obj $(LIBS)
+-tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb4\bcb4re300lm.dll $(XLFLAGS)  bcb4\bcb4re300lm\c_regex_traits.obj bcb4\bcb4re300lm\c_regex_traits_common.obj bcb4\bcb4re300lm\cpp_regex_traits.obj bcb4\bcb4re300lm\cregex.obj bcb4\bcb4re300lm\fileiter.obj bcb4\bcb4re300lm\posix_api.obj bcb4\bcb4re300lm\regex.obj bcb4\bcb4re300lm\regex_debug.obj bcb4\bcb4re300lm\regex_synch.obj bcb4\bcb4re300lm\w32_regex_traits.obj bcb4\bcb4re300lm\wide_posix_api.obj $(LIBS)
 |
 	implib -c bcb4\bcb4re300lm.lib bcb4\bcb4re300lm.dll
 
@@ -437,57 +437,57 @@ bcb4\bcb4re300lm.lib : bcb4\bcb4re300lm\c_regex_traits.obj bcb4\bcb4re300lm\c_re
 ########################################################
 bcb4\bcb4re300l\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb4\bcb4re300l\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb4\bcb4re300l\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb4\bcb4re300l\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\cregex.obj ../src/cregex.cpp
 |
 
 bcb4\bcb4re300l\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb4\bcb4re300l\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb4\bcb4re300l\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\regex.obj ../src/regex.cpp
 |
 
 bcb4\bcb4re300l\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb4\bcb4re300l\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb4\bcb4re300l\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb4\bcb4re300l\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb4\bcb4re300l\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb4\bcb4re300l :
@@ -502,7 +502,7 @@ bcb4re300l_clean :
 
 bcb4\bcb4re300l.lib : bcb4\bcb4re300l\c_regex_traits.obj bcb4\bcb4re300l\c_regex_traits_common.obj bcb4\bcb4re300l\cpp_regex_traits.obj bcb4\bcb4re300l\cregex.obj bcb4\bcb4re300l\fileiter.obj bcb4\bcb4re300l\posix_api.obj bcb4\bcb4re300l\regex.obj bcb4\bcb4re300l\regex_debug.obj bcb4\bcb4re300l\regex_synch.obj bcb4\bcb4re300l\w32_regex_traits.obj bcb4\bcb4re300l\wide_posix_api.obj
 	bcc32 @&&|
--DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb4\bcb4re300l.dll $(XLFLAGS)  bcb4\bcb4re300l\c_regex_traits.obj bcb4\bcb4re300l\c_regex_traits_common.obj bcb4\bcb4re300l\cpp_regex_traits.obj bcb4\bcb4re300l\cregex.obj bcb4\bcb4re300l\fileiter.obj bcb4\bcb4re300l\posix_api.obj bcb4\bcb4re300l\regex.obj bcb4\bcb4re300l\regex_debug.obj bcb4\bcb4re300l\regex_synch.obj bcb4\bcb4re300l\w32_regex_traits.obj bcb4\bcb4re300l\wide_posix_api.obj $(LIBS)
+-tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb4\bcb4re300l.dll $(XLFLAGS)  bcb4\bcb4re300l\c_regex_traits.obj bcb4\bcb4re300l\c_regex_traits_common.obj bcb4\bcb4re300l\cpp_regex_traits.obj bcb4\bcb4re300l\cregex.obj bcb4\bcb4re300l\fileiter.obj bcb4\bcb4re300l\posix_api.obj bcb4\bcb4re300l\regex.obj bcb4\bcb4re300l\regex_debug.obj bcb4\bcb4re300l\regex_synch.obj bcb4\bcb4re300l\w32_regex_traits.obj bcb4\bcb4re300l\wide_posix_api.obj $(LIBS)
 |
 	implib -c bcb4\bcb4re300l.lib bcb4\bcb4re300l.dll
 

build/bcb5.mak

@@ -35,7 +35,7 @@ BCROOT=$(MAKEDIR)\..
 !endif
 
 
-ALL_HEADER=../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_config.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_options.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp
 
 all : bcb5 bcb5\bcb5re300 bcb5\bcb5re300.lib bcb5\bcb5re300m bcb5\bcb5re300m.lib bcb5\bcb5re300v bcb5\bcb5re300v.lib bcb5\bcb5re300lv bcb5\bcb5re300lv.lib bcb5\bcb5re300lm bcb5\bcb5re300lm.lib bcb5\bcb5re300l bcb5\bcb5re300l.lib
 
@@ -285,57 +285,57 @@ bcb5\bcb5re300v.lib : bcb5\bcb5re300v\c_regex_traits.obj bcb5\bcb5re300v\c_regex
 ########################################################
 bcb5\bcb5re300lv\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb5\bcb5re300lv\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb5\bcb5re300lv\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb5\bcb5re300lv\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\cregex.obj ../src/cregex.cpp
 |
 
 bcb5\bcb5re300lv\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb5\bcb5re300lv\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb5\bcb5re300lv\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\regex.obj ../src/regex.cpp
 |
 
 bcb5\bcb5re300lv\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb5\bcb5re300lv\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb5\bcb5re300lv\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb5\bcb5re300lv\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lv\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb5\bcb5re300lv :
@@ -350,7 +350,7 @@ bcb5re300lv_clean :
 
 bcb5\bcb5re300lv.lib : bcb5\bcb5re300lv\c_regex_traits.obj bcb5\bcb5re300lv\c_regex_traits_common.obj bcb5\bcb5re300lv\cpp_regex_traits.obj bcb5\bcb5re300lv\cregex.obj bcb5\bcb5re300lv\fileiter.obj bcb5\bcb5re300lv\posix_api.obj bcb5\bcb5re300lv\regex.obj bcb5\bcb5re300lv\regex_debug.obj bcb5\bcb5re300lv\regex_synch.obj bcb5\bcb5re300lv\w32_regex_traits.obj bcb5\bcb5re300lv\wide_posix_api.obj
 	bcc32 @&&|
--DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb5\bcb5re300lv.dll $(XLFLAGS)  bcb5\bcb5re300lv\c_regex_traits.obj bcb5\bcb5re300lv\c_regex_traits_common.obj bcb5\bcb5re300lv\cpp_regex_traits.obj bcb5\bcb5re300lv\cregex.obj bcb5\bcb5re300lv\fileiter.obj bcb5\bcb5re300lv\posix_api.obj bcb5\bcb5re300lv\regex.obj bcb5\bcb5re300lv\regex_debug.obj bcb5\bcb5re300lv\regex_synch.obj bcb5\bcb5re300lv\w32_regex_traits.obj bcb5\bcb5re300lv\wide_posix_api.obj $(LIBS)
+-tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb5\bcb5re300lv.dll $(XLFLAGS)  bcb5\bcb5re300lv\c_regex_traits.obj bcb5\bcb5re300lv\c_regex_traits_common.obj bcb5\bcb5re300lv\cpp_regex_traits.obj bcb5\bcb5re300lv\cregex.obj bcb5\bcb5re300lv\fileiter.obj bcb5\bcb5re300lv\posix_api.obj bcb5\bcb5re300lv\regex.obj bcb5\bcb5re300lv\regex_debug.obj bcb5\bcb5re300lv\regex_synch.obj bcb5\bcb5re300lv\w32_regex_traits.obj bcb5\bcb5re300lv\wide_posix_api.obj $(LIBS)
 |
 	implib -c bcb5\bcb5re300lv.lib bcb5\bcb5re300lv.dll
 
@@ -361,57 +361,57 @@ bcb5\bcb5re300lv.lib : bcb5\bcb5re300lv\c_regex_traits.obj bcb5\bcb5re300lv\c_re
 ########################################################
 bcb5\bcb5re300lm\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb5\bcb5re300lm\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb5\bcb5re300lm\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb5\bcb5re300lm\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\cregex.obj ../src/cregex.cpp
 |
 
 bcb5\bcb5re300lm\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb5\bcb5re300lm\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb5\bcb5re300lm\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\regex.obj ../src/regex.cpp
 |
 
 bcb5\bcb5re300lm\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb5\bcb5re300lm\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb5\bcb5re300lm\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb5\bcb5re300lm\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300lm\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb5\bcb5re300lm :
@@ -426,7 +426,7 @@ bcb5re300lm_clean :
 
 bcb5\bcb5re300lm.lib : bcb5\bcb5re300lm\c_regex_traits.obj bcb5\bcb5re300lm\c_regex_traits_common.obj bcb5\bcb5re300lm\cpp_regex_traits.obj bcb5\bcb5re300lm\cregex.obj bcb5\bcb5re300lm\fileiter.obj bcb5\bcb5re300lm\posix_api.obj bcb5\bcb5re300lm\regex.obj bcb5\bcb5re300lm\regex_debug.obj bcb5\bcb5re300lm\regex_synch.obj bcb5\bcb5re300lm\w32_regex_traits.obj bcb5\bcb5re300lm\wide_posix_api.obj
 	bcc32 @&&|
--DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb5\bcb5re300lm.dll $(XLFLAGS)  bcb5\bcb5re300lm\c_regex_traits.obj bcb5\bcb5re300lm\c_regex_traits_common.obj bcb5\bcb5re300lm\cpp_regex_traits.obj bcb5\bcb5re300lm\cregex.obj bcb5\bcb5re300lm\fileiter.obj bcb5\bcb5re300lm\posix_api.obj bcb5\bcb5re300lm\regex.obj bcb5\bcb5re300lm\regex_debug.obj bcb5\bcb5re300lm\regex_synch.obj bcb5\bcb5re300lm\w32_regex_traits.obj bcb5\bcb5re300lm\wide_posix_api.obj $(LIBS)
+-tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb5\bcb5re300lm.dll $(XLFLAGS)  bcb5\bcb5re300lm\c_regex_traits.obj bcb5\bcb5re300lm\c_regex_traits_common.obj bcb5\bcb5re300lm\cpp_regex_traits.obj bcb5\bcb5re300lm\cregex.obj bcb5\bcb5re300lm\fileiter.obj bcb5\bcb5re300lm\posix_api.obj bcb5\bcb5re300lm\regex.obj bcb5\bcb5re300lm\regex_debug.obj bcb5\bcb5re300lm\regex_synch.obj bcb5\bcb5re300lm\w32_regex_traits.obj bcb5\bcb5re300lm\wide_posix_api.obj $(LIBS)
 |
 	implib -c bcb5\bcb5re300lm.lib bcb5\bcb5re300lm.dll
 
@@ -437,57 +437,57 @@ bcb5\bcb5re300lm.lib : bcb5\bcb5re300lm\c_regex_traits.obj bcb5\bcb5re300lm\c_re
 ########################################################
 bcb5\bcb5re300l\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\c_regex_traits.obj ../src/c_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
 bcb5\bcb5re300l\c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
 |
 
 bcb5\bcb5re300l\cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
 |
 
 bcb5\bcb5re300l\cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\cregex.obj ../src/cregex.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\cregex.obj ../src/cregex.cpp
 |
 
 bcb5\bcb5re300l\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\fileiter.obj ../src/fileiter.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\fileiter.obj ../src/fileiter.cpp
 |
 
 bcb5\bcb5re300l\posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\posix_api.obj ../src/posix_api.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\posix_api.obj ../src/posix_api.cpp
 |
 
 bcb5\bcb5re300l\regex.obj: ../src/regex.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\regex.obj ../src/regex.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\regex.obj ../src/regex.cpp
 |
 
 bcb5\bcb5re300l\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\regex_debug.obj ../src/regex_debug.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\regex_debug.obj ../src/regex_debug.cpp
 |
 
 bcb5\bcb5re300l\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\regex_synch.obj ../src/regex_synch.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\regex_synch.obj ../src/regex_synch.cpp
 |
 
 bcb5\bcb5re300l\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\w32_regex_traits.obj ../src/w32_regex_traits.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
 bcb5\bcb5re300l\wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	bcc32 @&&|
--c $(INCLUDES) -DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\wide_posix_api.obj ../src/wide_posix_api.cpp
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb5\bcb5re300l\wide_posix_api.obj ../src/wide_posix_api.cpp
 |
 
 bcb5\bcb5re300l :
@@ -502,7 +502,7 @@ bcb5re300l_clean :
 
 bcb5\bcb5re300l.lib : bcb5\bcb5re300l\c_regex_traits.obj bcb5\bcb5re300l\c_regex_traits_common.obj bcb5\bcb5re300l\cpp_regex_traits.obj bcb5\bcb5re300l\cregex.obj bcb5\bcb5re300l\fileiter.obj bcb5\bcb5re300l\posix_api.obj bcb5\bcb5re300l\regex.obj bcb5\bcb5re300l\regex_debug.obj bcb5\bcb5re300l\regex_synch.obj bcb5\bcb5re300l\w32_regex_traits.obj bcb5\bcb5re300l\wide_posix_api.obj
 	bcc32 @&&|
--DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb5\bcb5re300l.dll $(XLFLAGS)  bcb5\bcb5re300l\c_regex_traits.obj bcb5\bcb5re300l\c_regex_traits_common.obj bcb5\bcb5re300l\cpp_regex_traits.obj bcb5\bcb5re300l\cregex.obj bcb5\bcb5re300l\fileiter.obj bcb5\bcb5re300l\posix_api.obj bcb5\bcb5re300l\regex.obj bcb5\bcb5re300l\regex_debug.obj bcb5\bcb5re300l\regex_synch.obj bcb5\bcb5re300l\w32_regex_traits.obj bcb5\bcb5re300l\wide_posix_api.obj $(LIBS)
+-tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb5\bcb5re300l.dll $(XLFLAGS)  bcb5\bcb5re300l\c_regex_traits.obj bcb5\bcb5re300l\c_regex_traits_common.obj bcb5\bcb5re300l\cpp_regex_traits.obj bcb5\bcb5re300l\cregex.obj bcb5\bcb5re300l\fileiter.obj bcb5\bcb5re300l\posix_api.obj bcb5\bcb5re300l\regex.obj bcb5\bcb5re300l\regex_debug.obj bcb5\bcb5re300l\regex_synch.obj bcb5\bcb5re300l\w32_regex_traits.obj bcb5\bcb5re300l\wide_posix_api.obj $(LIBS)
 |
 	implib -c bcb5\bcb5re300l.lib bcb5\bcb5re300l.dll
 

build/gcc-shared.mak

@@ -29,7 +29,7 @@ C1=-c -O2 -I../../../ -fPIC
 C2=-c -g -I../../../ -fPIC
 
 
-ALL_HEADER=../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_config.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_options.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp
 
 all : gcc  gcc gcc/boost_regex_shared ./gcc/libboost_regex.so gcc gcc/boost_regex_debug_shared ./gcc/libboost_regex_debug.so
 

build/gcc.mak

@@ -30,7 +30,7 @@ C2=-c -g -I../../../
 
 
 
-ALL_HEADER=../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_config.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_options.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp
 
 all : gcc  gcc gcc/boost_regex ./gcc/libboost_regex.a gcc gcc/boost_regex_debug ./gcc/libboost_regex_debug.a
 

build/generic.mak

@@ -26,7 +26,7 @@ C1=-c -O2 -I../../../
 
 
 
-ALL_HEADER=../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_config.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_options.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp
 
 all : $(DIRNAME)  $(DIRNAME) $(DIRNAME)/boost_regex ./$(DIRNAME)/libboost_regex.so
 

build/makefile.in

@@ -1,74 +0,0 @@
-
-LIBNAME=boost_regex
-
-CPP=@CXX@
-AR=ar
-
-CPP_PROJ=@CXXFLAGS@ -I../../../ -c 
-	
-ALL_O=@ac_all_o@
-ALL_H=@ac_all_h@
-
-lib$(LIBNAME).a : $(ALL_O)
-
-
-
-
-
-
-
-
-c_regex_traits.o: $(ALL_H) ../src/c_regex_traits.cpp
-	$(CPP) $(CPP_PROJ) ../src/c_regex_traits.cpp
-	$(AR) -rc lib$(LIBNAME).a c_regex_traits.o
-
-
-c_regex_traits_common.o: $(ALL_H) ../src/c_regex_traits_common.cpp
-	$(CPP) $(CPP_PROJ) ../src/c_regex_traits_common.cpp
-	$(AR) -rc lib$(LIBNAME).a c_regex_traits_common.o
-
-
-cpp_regex_traits.o: $(ALL_H) ../src/cpp_regex_traits.cpp
-	$(CPP) $(CPP_PROJ) ../src/cpp_regex_traits.cpp
-	$(AR) -rc lib$(LIBNAME).a cpp_regex_traits.o
-
-
-cregex.o: $(ALL_H) ../src/cregex.cpp
-	$(CPP) $(CPP_PROJ) ../src/cregex.cpp
-	$(AR) -rc lib$(LIBNAME).a cregex.o
-
-
-fileiter.o: $(ALL_H) ../src/fileiter.cpp
-	$(CPP) $(CPP_PROJ) ../src/fileiter.cpp
-	$(AR) -rc lib$(LIBNAME).a fileiter.o
-
-
-posix_api.o: $(ALL_H) ../src/posix_api.cpp
-	$(CPP) $(CPP_PROJ) ../src/posix_api.cpp
-	$(AR) -rc lib$(LIBNAME).a posix_api.o
-
-
-regex.o: $(ALL_H) ../src/regex.cpp
-	$(CPP) $(CPP_PROJ) ../src/regex.cpp
-	$(AR) -rc lib$(LIBNAME).a regex.o
-
-
-regex_debug.o: $(ALL_H) ../src/regex_debug.cpp
-	$(CPP) $(CPP_PROJ) ../src/regex_debug.cpp
-	$(AR) -rc lib$(LIBNAME).a regex_debug.o
-
-
-regex_synch.o: $(ALL_H) ../src/regex_synch.cpp
-	$(CPP) $(CPP_PROJ) ../src/regex_synch.cpp
-	$(AR) -rc lib$(LIBNAME).a regex_synch.o
-
-
-w32_regex_traits.o: $(ALL_H) ../src/w32_regex_traits.cpp
-	$(CPP) $(CPP_PROJ) ../src/w32_regex_traits.cpp
-	$(AR) -rc lib$(LIBNAME).a w32_regex_traits.o
-
-
-wide_posix_api.o: $(ALL_H) ../src/wide_posix_api.cpp
-	$(CPP) $(CPP_PROJ) ../src/wide_posix_api.cpp
-	$(AR) -rc lib$(LIBNAME).a wide_posix_api.o
-

build/makefile.org

@@ -1,19 +0,0 @@
-
-LIBNAME=boost_regex
-
-CPP=@CXX@
-AR=ar
-
-CPP_PROJ=@CXXFLAGS@ -I../../../ -c 
-	
-ALL_O=@ac_all_o@
-ALL_H=@ac_all_h@
-
-lib$(LIBNAME).a : $(ALL_O)
-
-
-
-
-
-
-

build/sunpro.mak

@@ -34,7 +34,7 @@ SUNWS_CACHE_NAME=SunWS_cache
 
 
 
-ALL_HEADER=../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_config.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_options.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.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
 

build/vc6-stlport.mak

@@ -32,7 +32,7 @@ NULL=nul
 !ENDIF 
 
 
-ALL_HEADER=../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_config.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_options.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp
 
 all : main_dir vc6-stlport-re300m_dir ./vc6-stlport/vc6-stlport-re300m.lib vc6-stlport-re300dm_dir ./vc6-stlport/vc6-stlport-re300dm.lib vc6-stlport-re300dl_dir ./vc6-stlport/vc6-stlport-re300dl.lib vc6-stlport-re300l_dir ./vc6-stlport/vc6-stlport-re300l.lib vc6-stlport-re300ls_dir ./vc6-stlport/vc6-stlport-re300ls.lib vc6-stlport-re300ddl_dir ./vc6-stlport/vc6-stlport-re300ddl.lib vc6-stlport-re300ddm_dir ./vc6-stlport/vc6-stlport-re300ddm.lib
 
@@ -62,37 +62,37 @@ main_dir :
 #
 ########################################################
 vc6-stlport/vc6-stlport-re300m/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/c_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/c_regex_traits.cpp
 
 vc6-stlport/vc6-stlport-re300m/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/c_regex_traits_common.cpp
 
 vc6-stlport/vc6-stlport-re300m/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/cpp_regex_traits.cpp
 
 vc6-stlport/vc6-stlport-re300m/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/cregex.cpp
 
 vc6-stlport/vc6-stlport-re300m/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/fileiter.cpp
 
 vc6-stlport/vc6-stlport-re300m/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/posix_api.cpp
 
 vc6-stlport/vc6-stlport-re300m/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/regex.cpp
 
 vc6-stlport/vc6-stlport-re300m/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/regex_debug.cpp
 
 vc6-stlport/vc6-stlport-re300m/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/regex_synch.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/regex_synch.cpp
 
 vc6-stlport/vc6-stlport-re300m/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/w32_regex_traits.cpp
 
 vc6-stlport/vc6-stlport-re300m/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300m/vc6-stlport-re300m.pch -Fo./vc6-stlport/vc6-stlport-re300m/ -Fdvc6-stlport/vc6-stlport-re300m.pdb ../src/wide_posix_api.cpp
 
 vc6-stlport-re300m_dir :
 	if not exist "vc6-stlport\vc6-stlport-re300m\$(NULL)" mkdir vc6-stlport\vc6-stlport-re300m
@@ -162,37 +162,37 @@ vc6-stlport-re300dm_clean :
 #
 ########################################################
 vc6-stlport/vc6-stlport-re300dl/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/c_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/c_regex_traits.cpp
 
 vc6-stlport/vc6-stlport-re300dl/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 /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/c_regex_traits_common.cpp
 
 vc6-stlport/vc6-stlport-re300dl/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/cpp_regex_traits.cpp
 
 vc6-stlport/vc6-stlport-re300dl/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/cregex.cpp
 
 vc6-stlport/vc6-stlport-re300dl/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/fileiter.cpp
 
 vc6-stlport/vc6-stlport-re300dl/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/posix_api.cpp
 
 vc6-stlport/vc6-stlport-re300dl/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/regex.cpp
 
 vc6-stlport/vc6-stlport-re300dl/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/regex_debug.cpp
 
 vc6-stlport/vc6-stlport-re300dl/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/regex_synch.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/regex_synch.cpp
 
 vc6-stlport/vc6-stlport-re300dl/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/w32_regex_traits.cpp
 
 vc6-stlport/vc6-stlport-re300dl/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300dl/vc6-stlport-re300dl.pch -Fo./vc6-stlport/vc6-stlport-re300dl/ -Fdvc6-stlport/vc6-stlport-re300dl.pdb ../src/wide_posix_api.cpp
 
 vc6-stlport-re300dl_dir :
 	if not exist "vc6-stlport\vc6-stlport-re300dl\$(NULL)" mkdir vc6-stlport\vc6-stlport-re300dl
@@ -204,9 +204,7 @@ vc6-stlport-re300dl_clean :
 	del vc6-stlport\vc6-stlport-re300dl\*.pch
 
 ./vc6-stlport/vc6-stlport-re300dl.lib : vc6-stlport/vc6-stlport-re300dl/c_regex_traits.obj vc6-stlport/vc6-stlport-re300dl/c_regex_traits_common.obj vc6-stlport/vc6-stlport-re300dl/cpp_regex_traits.obj vc6-stlport/vc6-stlport-re300dl/cregex.obj vc6-stlport/vc6-stlport-re300dl/fileiter.obj vc6-stlport/vc6-stlport-re300dl/posix_api.obj vc6-stlport/vc6-stlport-re300dl/regex.obj vc6-stlport/vc6-stlport-re300dl/regex_debug.obj vc6-stlport/vc6-stlport-re300dl/regex_synch.obj vc6-stlport/vc6-stlport-re300dl/w32_regex_traits.obj vc6-stlport/vc6-stlport-re300dl/wide_posix_api.obj
-	link @<<
+	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/vc6-stlport-re300dl.pdb" /debug /machine:I386 /out:"vc6-stlport/vc6-stlport-re300dl.dll" /implib:"vc6-stlport/vc6-stlport-re300dl.lib" $(XLFLAGS)  vc6-stlport/vc6-stlport-re300dl/c_regex_traits.obj vc6-stlport/vc6-stlport-re300dl/c_regex_traits_common.obj vc6-stlport/vc6-stlport-re300dl/cpp_regex_traits.obj vc6-stlport/vc6-stlport-re300dl/cregex.obj vc6-stlport/vc6-stlport-re300dl/fileiter.obj vc6-stlport/vc6-stlport-re300dl/posix_api.obj vc6-stlport/vc6-stlport-re300dl/regex.obj vc6-stlport/vc6-stlport-re300dl/regex_debug.obj vc6-stlport/vc6-stlport-re300dl/regex_synch.obj vc6-stlport/vc6-stlport-re300dl/w32_regex_traits.obj vc6-stlport/vc6-stlport-re300dl/wide_posix_api.obj
-	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/vc6-stlport-re300dl.pdb" /debug /machine:I386 /out:"vc6-stlport/vc6-stlport-re300dl.dll" /implib:"vc6-stlport/vc6-stlport-re300dl.lib" /pdbtype:sept $(XLFLAGS)  vc6-stlport/vc6-stlport-re300dl/c_regex_traits.obj vc6-stlport/vc6-stlport-re300dl/c_regex_traits_common.obj vc6-stlport/vc6-stlport-re300dl/cpp_regex_traits.obj vc6-stlport/vc6-stlport-re300dl/cregex.obj vc6-stlport/vc6-stlport-re300dl/fileiter.obj vc6-stlport/vc6-stlport-re300dl/posix_api.obj vc6-stlport/vc6-stlport-re300dl/regex.obj vc6-stlport/vc6-stlport-re300dl/regex_debug.obj vc6-stlport/vc6-stlport-re300dl/regex_synch.obj vc6-stlport/vc6-stlport-re300dl/w32_regex_traits.obj vc6-stlport/vc6-stlport-re300dl/wide_posix_api.obj
-<<
 
 ########################################################
 #
@@ -214,37 +212,37 @@ vc6-stlport-re300dl_clean :
 #
 ########################################################
 vc6-stlport/vc6-stlport-re300l/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/c_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/c_regex_traits.cpp
 
 vc6-stlport/vc6-stlport-re300l/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/c_regex_traits_common.cpp
 
 vc6-stlport/vc6-stlport-re300l/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/cpp_regex_traits.cpp
 
 vc6-stlport/vc6-stlport-re300l/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/cregex.cpp
 
 vc6-stlport/vc6-stlport-re300l/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/fileiter.cpp
 
 vc6-stlport/vc6-stlport-re300l/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/posix_api.cpp
 
 vc6-stlport/vc6-stlport-re300l/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/regex.cpp
 
 vc6-stlport/vc6-stlport-re300l/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/regex_debug.cpp
 
 vc6-stlport/vc6-stlport-re300l/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/regex_synch.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/regex_synch.cpp
 
 vc6-stlport/vc6-stlport-re300l/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/w32_regex_traits.cpp
 
 vc6-stlport/vc6-stlport-re300l/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300l/vc6-stlport-re300l.pch -Fo./vc6-stlport/vc6-stlport-re300l/ -Fdvc6-stlport/vc6-stlport-re300l.pdb ../src/wide_posix_api.cpp
 
 vc6-stlport-re300l_dir :
 	if not exist "vc6-stlport\vc6-stlport-re300l\$(NULL)" mkdir vc6-stlport\vc6-stlport-re300l
@@ -256,9 +254,7 @@ vc6-stlport-re300l_clean :
 	del vc6-stlport\vc6-stlport-re300l\*.pch
 
 ./vc6-stlport/vc6-stlport-re300l.lib : vc6-stlport/vc6-stlport-re300l/c_regex_traits.obj vc6-stlport/vc6-stlport-re300l/c_regex_traits_common.obj vc6-stlport/vc6-stlport-re300l/cpp_regex_traits.obj vc6-stlport/vc6-stlport-re300l/cregex.obj vc6-stlport/vc6-stlport-re300l/fileiter.obj vc6-stlport/vc6-stlport-re300l/posix_api.obj vc6-stlport/vc6-stlport-re300l/regex.obj vc6-stlport/vc6-stlport-re300l/regex_debug.obj vc6-stlport/vc6-stlport-re300l/regex_synch.obj vc6-stlport/vc6-stlport-re300l/w32_regex_traits.obj vc6-stlport/vc6-stlport-re300l/wide_posix_api.obj
-	link @<<
+	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/vc6-stlport-re300l.pdb" /debug /machine:I386 /out:"vc6-stlport/vc6-stlport-re300l.dll" /implib:"vc6-stlport/vc6-stlport-re300l.lib" $(XLFLAGS)  vc6-stlport/vc6-stlport-re300l/c_regex_traits.obj vc6-stlport/vc6-stlport-re300l/c_regex_traits_common.obj vc6-stlport/vc6-stlport-re300l/cpp_regex_traits.obj vc6-stlport/vc6-stlport-re300l/cregex.obj vc6-stlport/vc6-stlport-re300l/fileiter.obj vc6-stlport/vc6-stlport-re300l/posix_api.obj vc6-stlport/vc6-stlport-re300l/regex.obj vc6-stlport/vc6-stlport-re300l/regex_debug.obj vc6-stlport/vc6-stlport-re300l/regex_synch.obj vc6-stlport/vc6-stlport-re300l/w32_regex_traits.obj vc6-stlport/vc6-stlport-re300l/wide_posix_api.obj
-	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/vc6-stlport-re300l.pdb" /debug /machine:I386 /out:"vc6-stlport/vc6-stlport-re300l.dll" /implib:"vc6-stlport/vc6-stlport-re300l.lib" /pdbtype:sept $(XLFLAGS)  vc6-stlport/vc6-stlport-re300l/c_regex_traits.obj vc6-stlport/vc6-stlport-re300l/c_regex_traits_common.obj vc6-stlport/vc6-stlport-re300l/cpp_regex_traits.obj vc6-stlport/vc6-stlport-re300l/cregex.obj vc6-stlport/vc6-stlport-re300l/fileiter.obj vc6-stlport/vc6-stlport-re300l/posix_api.obj vc6-stlport/vc6-stlport-re300l/regex.obj vc6-stlport/vc6-stlport-re300l/regex_debug.obj vc6-stlport/vc6-stlport-re300l/regex_synch.obj vc6-stlport/vc6-stlport-re300l/w32_regex_traits.obj vc6-stlport/vc6-stlport-re300l/wide_posix_api.obj
-<<
 
 ########################################################
 #
@@ -266,37 +262,37 @@ vc6-stlport-re300l_clean :
 #
 ########################################################
 vc6-stlport/vc6-stlport-re300ls/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/c_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2/ /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/c_regex_traits.cpp
 
 vc6-stlport/vc6-stlport-re300ls/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2/ /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/c_regex_traits_common.cpp
 
 vc6-stlport/vc6-stlport-re300ls/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2/ /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/cpp_regex_traits.cpp
 
 vc6-stlport/vc6-stlport-re300ls/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2/ /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/cregex.cpp
 
 vc6-stlport/vc6-stlport-re300ls/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2/ /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/fileiter.cpp
 
 vc6-stlport/vc6-stlport-re300ls/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2/ /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/posix_api.cpp
 
 vc6-stlport/vc6-stlport-re300ls/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2/ /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/regex.cpp
 
 vc6-stlport/vc6-stlport-re300ls/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2/ /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/regex_debug.cpp
 
 vc6-stlport/vc6-stlport-re300ls/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/regex_synch.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2/ /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/regex_synch.cpp
 
 vc6-stlport/vc6-stlport-re300ls/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2/ /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/w32_regex_traits.cpp
 
 vc6-stlport/vc6-stlport-re300ls/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2/ /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ls/vc6-stlport-re300ls.pch -Fo./vc6-stlport/vc6-stlport-re300ls/ -Fdvc6-stlport/vc6-stlport-re300ls.pdb ../src/wide_posix_api.cpp
 
 vc6-stlport-re300ls_dir :
 	if not exist "vc6-stlport\vc6-stlport-re300ls\$(NULL)" mkdir vc6-stlport\vc6-stlport-re300ls
@@ -316,37 +312,37 @@ vc6-stlport-re300ls_clean :
 #
 ########################################################
 vc6-stlport/vc6-stlport-re300ddl/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/c_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/c_regex_traits.cpp
 
 vc6-stlport/vc6-stlport-re300ddl/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/c_regex_traits_common.cpp
 
 vc6-stlport/vc6-stlport-re300ddl/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/cpp_regex_traits.cpp
 
 vc6-stlport/vc6-stlport-re300ddl/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/cregex.cpp
 
 vc6-stlport/vc6-stlport-re300ddl/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/fileiter.cpp
 
 vc6-stlport/vc6-stlport-re300ddl/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/posix_api.cpp
 
 vc6-stlport/vc6-stlport-re300ddl/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/regex.cpp
 
 vc6-stlport/vc6-stlport-re300ddl/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/regex_debug.cpp
 
 vc6-stlport/vc6-stlport-re300ddl/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/regex_synch.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/regex_synch.cpp
 
 vc6-stlport/vc6-stlport-re300ddl/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/w32_regex_traits.cpp
 
 vc6-stlport/vc6-stlport-re300ddl/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GZ  /c $(CXXFLAGS) -Fpvc6-stlport/vc6-stlport-re300ddl/vc6-stlport-re300ddl.pch -Fo./vc6-stlport/vc6-stlport-re300ddl/ -Fdvc6-stlport/vc6-stlport-re300ddl.pdb ../src/wide_posix_api.cpp
 
 vc6-stlport-re300ddl_dir :
 	if not exist "vc6-stlport\vc6-stlport-re300ddl\$(NULL)" mkdir vc6-stlport\vc6-stlport-re300ddl
@@ -358,9 +354,7 @@ vc6-stlport-re300ddl_clean :
 	del vc6-stlport\vc6-stlport-re300ddl\*.pch
 
 ./vc6-stlport/vc6-stlport-re300ddl.lib : vc6-stlport/vc6-stlport-re300ddl/c_regex_traits.obj vc6-stlport/vc6-stlport-re300ddl/c_regex_traits_common.obj vc6-stlport/vc6-stlport-re300ddl/cpp_regex_traits.obj vc6-stlport/vc6-stlport-re300ddl/cregex.obj vc6-stlport/vc6-stlport-re300ddl/fileiter.obj vc6-stlport/vc6-stlport-re300ddl/posix_api.obj vc6-stlport/vc6-stlport-re300ddl/regex.obj vc6-stlport/vc6-stlport-re300ddl/regex_debug.obj vc6-stlport/vc6-stlport-re300ddl/regex_synch.obj vc6-stlport/vc6-stlport-re300ddl/w32_regex_traits.obj vc6-stlport/vc6-stlport-re300ddl/wide_posix_api.obj
-	link @<<
+	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/vc6-stlport-re300ddl.pdb" /debug /machine:I386 /out:"vc6-stlport/vc6-stlport-re300ddl.dll" /implib:"vc6-stlport/vc6-stlport-re300ddl.lib" $(XLFLAGS)  vc6-stlport/vc6-stlport-re300ddl/c_regex_traits.obj vc6-stlport/vc6-stlport-re300ddl/c_regex_traits_common.obj vc6-stlport/vc6-stlport-re300ddl/cpp_regex_traits.obj vc6-stlport/vc6-stlport-re300ddl/cregex.obj vc6-stlport/vc6-stlport-re300ddl/fileiter.obj vc6-stlport/vc6-stlport-re300ddl/posix_api.obj vc6-stlport/vc6-stlport-re300ddl/regex.obj vc6-stlport/vc6-stlport-re300ddl/regex_debug.obj vc6-stlport/vc6-stlport-re300ddl/regex_synch.obj vc6-stlport/vc6-stlport-re300ddl/w32_regex_traits.obj vc6-stlport/vc6-stlport-re300ddl/wide_posix_api.obj
-	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/vc6-stlport-re300ddl.pdb" /debug /machine:I386 /out:"vc6-stlport/vc6-stlport-re300ddl.dll" /implib:"vc6-stlport/vc6-stlport-re300ddl.lib" /pdbtype:sept $(XLFLAGS)  vc6-stlport/vc6-stlport-re300ddl/c_regex_traits.obj vc6-stlport/vc6-stlport-re300ddl/c_regex_traits_common.obj vc6-stlport/vc6-stlport-re300ddl/cpp_regex_traits.obj vc6-stlport/vc6-stlport-re300ddl/cregex.obj vc6-stlport/vc6-stlport-re300ddl/fileiter.obj vc6-stlport/vc6-stlport-re300ddl/posix_api.obj vc6-stlport/vc6-stlport-re300ddl/regex.obj vc6-stlport/vc6-stlport-re300ddl/regex_debug.obj vc6-stlport/vc6-stlport-re300ddl/regex_synch.obj vc6-stlport/vc6-stlport-re300ddl/w32_regex_traits.obj vc6-stlport/vc6-stlport-re300ddl/wide_posix_api.obj
-<<
 
 ########################################################
 #

build/vc6.mak

@@ -32,7 +32,7 @@ NULL=nul
 !ENDIF 
 
 
-ALL_HEADER=../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_config.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_options.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp
+ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp
 
 all : main_dir vc6-re300_dir ./vc6/vc6-re300.lib vc6-re300m_dir ./vc6/vc6-re300m.lib vc6-re300d_dir ./vc6/vc6-re300d.lib vc6-re300dm_dir ./vc6/vc6-re300dm.lib vc6-re300dl_dir ./vc6/vc6-re300dl.lib vc6-re300l_dir ./vc6/vc6-re300l.lib vc6-re300ls_dir ./vc6/vc6-re300ls.lib
 
@@ -62,37 +62,37 @@ main_dir :
 #
 ########################################################
 vc6/vc6-re300/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/c_regex_traits.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/c_regex_traits.cpp
 
 vc6/vc6-re300/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/c_regex_traits_common.cpp
 
 vc6/vc6-re300/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/cpp_regex_traits.cpp
 
 vc6/vc6-re300/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/cregex.cpp
 
 vc6/vc6-re300/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/fileiter.cpp
 
 vc6/vc6-re300/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/posix_api.cpp
 
 vc6/vc6-re300/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/regex.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/regex.cpp
 
 vc6/vc6-re300/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/regex_debug.cpp
 
 vc6/vc6-re300/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/regex_synch.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/regex_synch.cpp
 
 vc6/vc6-re300/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/w32_regex_traits.cpp
 
 vc6/vc6-re300/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc6/vc6-re300/vc6-re300.pch -Fo./vc6/vc6-re300/ -Fdvc6/vc6-re300.pdb ../src/wide_posix_api.cpp
 
 vc6-re300_dir :
 	if not exist "vc6\vc6-re300\$(NULL)" mkdir vc6\vc6-re300
@@ -112,37 +112,37 @@ vc6-re300_clean :
 #
 ########################################################
 vc6/vc6-re300m/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/c_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/c_regex_traits.cpp
 
 vc6/vc6-re300m/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/c_regex_traits_common.cpp
 
 vc6/vc6-re300m/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/cpp_regex_traits.cpp
 
 vc6/vc6-re300m/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/cregex.cpp
 
 vc6/vc6-re300m/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/fileiter.cpp
 
 vc6/vc6-re300m/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/posix_api.cpp
 
 vc6/vc6-re300m/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/regex.cpp
 
 vc6/vc6-re300m/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/regex_debug.cpp
 
 vc6/vc6-re300m/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/regex_synch.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/regex_synch.cpp
 
 vc6/vc6-re300m/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/w32_regex_traits.cpp
 
 vc6/vc6-re300m/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300m/vc6-re300m.pch -Fo./vc6/vc6-re300m/ -Fdvc6/vc6-re300m.pdb ../src/wide_posix_api.cpp
 
 vc6-re300m_dir :
 	if not exist "vc6\vc6-re300m\$(NULL)" mkdir vc6\vc6-re300m
@@ -262,37 +262,37 @@ vc6-re300dm_clean :
 #
 ########################################################
 vc6/vc6-re300dl/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/c_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/c_regex_traits.cpp
 
 vc6/vc6-re300dl/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 /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/c_regex_traits_common.cpp
 
 vc6/vc6-re300dl/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/cpp_regex_traits.cpp
 
 vc6/vc6-re300dl/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/cregex.cpp
 
 vc6/vc6-re300dl/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/fileiter.cpp
 
 vc6/vc6-re300dl/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/posix_api.cpp
 
 vc6/vc6-re300dl/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/regex.cpp
 
 vc6/vc6-re300dl/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/regex_debug.cpp
 
 vc6/vc6-re300dl/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/regex_synch.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/regex_synch.cpp
 
 vc6/vc6-re300dl/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/w32_regex_traits.cpp
 
 vc6/vc6-re300dl/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc6/vc6-re300dl/vc6-re300dl.pch -Fo./vc6/vc6-re300dl/ -Fdvc6/vc6-re300dl.pdb ../src/wide_posix_api.cpp
 
 vc6-re300dl_dir :
 	if not exist "vc6\vc6-re300dl\$(NULL)" mkdir vc6\vc6-re300dl
@@ -304,9 +304,7 @@ vc6-re300dl_clean :
 	del vc6\vc6-re300dl\*.pch
 
 ./vc6/vc6-re300dl.lib : vc6/vc6-re300dl/c_regex_traits.obj vc6/vc6-re300dl/c_regex_traits_common.obj vc6/vc6-re300dl/cpp_regex_traits.obj vc6/vc6-re300dl/cregex.obj vc6/vc6-re300dl/fileiter.obj vc6/vc6-re300dl/posix_api.obj vc6/vc6-re300dl/regex.obj vc6/vc6-re300dl/regex_debug.obj vc6/vc6-re300dl/regex_synch.obj vc6/vc6-re300dl/w32_regex_traits.obj vc6/vc6-re300dl/wide_posix_api.obj
-	link @<<
+	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/vc6-re300dl.pdb" /debug /machine:I386 /out:"vc6/vc6-re300dl.dll" /implib:"vc6/vc6-re300dl.lib" $(XLFLAGS)  vc6/vc6-re300dl/c_regex_traits.obj vc6/vc6-re300dl/c_regex_traits_common.obj vc6/vc6-re300dl/cpp_regex_traits.obj vc6/vc6-re300dl/cregex.obj vc6/vc6-re300dl/fileiter.obj vc6/vc6-re300dl/posix_api.obj vc6/vc6-re300dl/regex.obj vc6/vc6-re300dl/regex_debug.obj vc6/vc6-re300dl/regex_synch.obj vc6/vc6-re300dl/w32_regex_traits.obj vc6/vc6-re300dl/wide_posix_api.obj
-	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/vc6-re300dl.pdb" /debug /machine:I386 /out:"vc6/vc6-re300dl.dll" /implib:"vc6/vc6-re300dl.lib" /pdbtype:sept $(XLFLAGS)  vc6/vc6-re300dl/c_regex_traits.obj vc6/vc6-re300dl/c_regex_traits_common.obj vc6/vc6-re300dl/cpp_regex_traits.obj vc6/vc6-re300dl/cregex.obj vc6/vc6-re300dl/fileiter.obj vc6/vc6-re300dl/posix_api.obj vc6/vc6-re300dl/regex.obj vc6/vc6-re300dl/regex_debug.obj vc6/vc6-re300dl/regex_synch.obj vc6/vc6-re300dl/w32_regex_traits.obj vc6/vc6-re300dl/wide_posix_api.obj
-<<
 
 ########################################################
 #
@@ -314,37 +312,37 @@ vc6-re300dl_clean :
 #
 ########################################################
 vc6/vc6-re300l/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/c_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/c_regex_traits.cpp
 
 vc6/vc6-re300l/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/c_regex_traits_common.cpp
 
 vc6/vc6-re300l/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/cpp_regex_traits.cpp
 
 vc6/vc6-re300l/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/cregex.cpp
 
 vc6/vc6-re300l/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/fileiter.cpp
 
 vc6/vc6-re300l/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/posix_api.cpp
 
 vc6/vc6-re300l/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/regex.cpp
 
 vc6/vc6-re300l/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/regex_debug.cpp
 
 vc6/vc6-re300l/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/regex_synch.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/regex_synch.cpp
 
 vc6/vc6-re300l/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/w32_regex_traits.cpp
 
 vc6/vc6-re300l/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300l/vc6-re300l.pch -Fo./vc6/vc6-re300l/ -Fdvc6/vc6-re300l.pdb ../src/wide_posix_api.cpp
 
 vc6-re300l_dir :
 	if not exist "vc6\vc6-re300l\$(NULL)" mkdir vc6\vc6-re300l
@@ -356,9 +354,7 @@ vc6-re300l_clean :
 	del vc6\vc6-re300l\*.pch
 
 ./vc6/vc6-re300l.lib : vc6/vc6-re300l/c_regex_traits.obj vc6/vc6-re300l/c_regex_traits_common.obj vc6/vc6-re300l/cpp_regex_traits.obj vc6/vc6-re300l/cregex.obj vc6/vc6-re300l/fileiter.obj vc6/vc6-re300l/posix_api.obj vc6/vc6-re300l/regex.obj vc6/vc6-re300l/regex_debug.obj vc6/vc6-re300l/regex_synch.obj vc6/vc6-re300l/w32_regex_traits.obj vc6/vc6-re300l/wide_posix_api.obj
-	link @<<
+	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/vc6-re300l.pdb" /debug /machine:I386 /out:"vc6/vc6-re300l.dll" /implib:"vc6/vc6-re300l.lib" $(XLFLAGS)  vc6/vc6-re300l/c_regex_traits.obj vc6/vc6-re300l/c_regex_traits_common.obj vc6/vc6-re300l/cpp_regex_traits.obj vc6/vc6-re300l/cregex.obj vc6/vc6-re300l/fileiter.obj vc6/vc6-re300l/posix_api.obj vc6/vc6-re300l/regex.obj vc6/vc6-re300l/regex_debug.obj vc6/vc6-re300l/regex_synch.obj vc6/vc6-re300l/w32_regex_traits.obj vc6/vc6-re300l/wide_posix_api.obj
-	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/vc6-re300l.pdb" /debug /machine:I386 /out:"vc6/vc6-re300l.dll" /implib:"vc6/vc6-re300l.lib" /pdbtype:sept $(XLFLAGS)  vc6/vc6-re300l/c_regex_traits.obj vc6/vc6-re300l/c_regex_traits_common.obj vc6/vc6-re300l/cpp_regex_traits.obj vc6/vc6-re300l/cregex.obj vc6/vc6-re300l/fileiter.obj vc6/vc6-re300l/posix_api.obj vc6/vc6-re300l/regex.obj vc6/vc6-re300l/regex_debug.obj vc6/vc6-re300l/regex_synch.obj vc6/vc6-re300l/w32_regex_traits.obj vc6/vc6-re300l/wide_posix_api.obj
-<<
 
 ########################################################
 #
@@ -366,37 +362,37 @@ vc6-re300l_clean :
 #
 ########################################################
 vc6/vc6-re300ls/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/c_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/c_regex_traits.cpp
 
 vc6/vc6-re300ls/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/c_regex_traits_common.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/c_regex_traits_common.cpp
 
 vc6/vc6-re300ls/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/cpp_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/cpp_regex_traits.cpp
 
 vc6/vc6-re300ls/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/cregex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/cregex.cpp
 
 vc6/vc6-re300ls/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/fileiter.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/fileiter.cpp
 
 vc6/vc6-re300ls/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/posix_api.cpp
 
 vc6/vc6-re300ls/regex.obj: ../src/regex.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/regex.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/regex.cpp
 
 vc6/vc6-re300ls/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/regex_debug.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/regex_debug.cpp
 
 vc6/vc6-re300ls/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/regex_synch.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/regex_synch.cpp
 
 vc6/vc6-re300ls/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/w32_regex_traits.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/w32_regex_traits.cpp
 
 vc6/vc6-re300ls/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/wide_posix_api.cpp
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc6/vc6-re300ls/vc6-re300ls.pch -Fo./vc6/vc6-re300ls/ -Fdvc6/vc6-re300ls.pdb ../src/wide_posix_api.cpp
 
 vc6-re300ls_dir :
 	if not exist "vc6\vc6-re300ls\$(NULL)" mkdir vc6\vc6-re300ls
@@ -410,3 +406,4 @@ vc6-re300ls_clean :
 ./vc6/vc6-re300ls.lib : vc6/vc6-re300ls/c_regex_traits.obj vc6/vc6-re300ls/c_regex_traits_common.obj vc6/vc6-re300ls/cpp_regex_traits.obj vc6/vc6-re300ls/cregex.obj vc6/vc6-re300ls/fileiter.obj vc6/vc6-re300ls/posix_api.obj vc6/vc6-re300ls/regex.obj vc6/vc6-re300ls/regex_debug.obj vc6/vc6-re300ls/regex_synch.obj vc6/vc6-re300ls/w32_regex_traits.obj vc6/vc6-re300ls/wide_posix_api.obj
 	link -lib /nologo /out:vc6/vc6-re300ls.lib $(XSFLAGS)  vc6/vc6-re300ls/c_regex_traits.obj vc6/vc6-re300ls/c_regex_traits_common.obj vc6/vc6-re300ls/cpp_regex_traits.obj vc6/vc6-re300ls/cregex.obj vc6/vc6-re300ls/fileiter.obj vc6/vc6-re300ls/posix_api.obj vc6/vc6-re300ls/regex.obj vc6/vc6-re300ls/regex_debug.obj vc6/vc6-re300ls/regex_synch.obj vc6/vc6-re300ls/w32_regex_traits.obj vc6/vc6-re300ls/wide_posix_api.obj
 
+

build/vc7.mak

@@ -0,0 +1,411 @@
+#
+# auto generated makefile for VC6 compiler
+#
+# usage:
+# make
+#   brings libraries up to date
+# make install
+#   brings libraries up to date and copies binaries to your VC6 /lib and /bin directories (recomended)
+#
+
+#
+# Add additional compiler options here:
+#
+CXXFLAGS=
+#
+# Add additional include directories here:
+#
+INCLUDES=
+#
+# add additional linker flags here:
+#
+XLFLAGS=
+#
+# add additional static-library creation flags here:
+#
+XSFLAGS=
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+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/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp
+
+all : main_dir vc7-re300_dir ./vc7/vc7-re300.lib vc7-re300m_dir ./vc7/vc7-re300m.lib vc7-re300d_dir ./vc7/vc7-re300d.lib vc7-re300dm_dir ./vc7/vc7-re300dm.lib vc7-re300dl_dir ./vc7/vc7-re300dl.lib vc7-re300l_dir ./vc7/vc7-re300l.lib vc7-re300ls_dir ./vc7/vc7-re300ls.lib
+
+clean :  vc7-re300_clean vc7-re300m_clean vc7-re300d_clean vc7-re300dm_clean vc7-re300dl_clean vc7-re300l_clean vc7-re300ls_clean
+
+install : all
+	copy vc7\vc7-re300.lib "$(MSVCDIR)\lib"
+	copy vc7\vc7-re300.pdb "$(MSVCDIR)\lib"
+	copy vc7\vc7-re300m.lib "$(MSVCDIR)\lib"
+	copy vc7\vc7-re300m.pdb "$(MSVCDIR)\lib"
+	copy vc7\vc7-re300d.lib "$(MSVCDIR)\lib"
+	copy vc7\vc7-re300d.pdb "$(MSVCDIR)\lib"
+	copy vc7\vc7-re300dm.lib "$(MSVCDIR)\lib"
+	copy vc7\vc7-re300dm.pdb "$(MSVCDIR)\lib"
+	copy vc7\vc7-re300dl.lib "$(MSVCDIR)\lib"
+	copy vc7\vc7-re300dl.dll "$(MSVCDIR)\bin"
+	copy vc7\vc7-re300dl.pdb "$(MSVCDIR)\lib"
+	copy vc7\vc7-re300l.lib "$(MSVCDIR)\lib"
+	copy vc7\vc7-re300l.dll "$(MSVCDIR)\bin"
+	copy vc7\vc7-re300ls.lib "$(MSVCDIR)\lib"
+
+main_dir :
+	if not exist "vc7\$(NULL)" mkdir vc7
+
+
+########################################################
+#
+# section for vc7-re300.lib
+#
+########################################################
+vc7/vc7-re300/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 /YX /FD $(CXXFLAGS) -Fpvc7/vc7-re300/vc7-re300.pch -Fo./vc7/vc7-re300/ -Fdvc7/vc7-re300.pdb ../src/c_regex_traits.cpp
+
+vc7/vc7-re300/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 /YX /FD $(CXXFLAGS) -Fpvc7/vc7-re300/vc7-re300.pch -Fo./vc7/vc7-re300/ -Fdvc7/vc7-re300.pdb ../src/c_regex_traits_common.cpp
+
+vc7/vc7-re300/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 /YX /FD $(CXXFLAGS) -Fpvc7/vc7-re300/vc7-re300.pch -Fo./vc7/vc7-re300/ -Fdvc7/vc7-re300.pdb ../src/cpp_regex_traits.cpp
+
+vc7/vc7-re300/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc7/vc7-re300/vc7-re300.pch -Fo./vc7/vc7-re300/ -Fdvc7/vc7-re300.pdb ../src/cregex.cpp
+
+vc7/vc7-re300/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc7/vc7-re300/vc7-re300.pch -Fo./vc7/vc7-re300/ -Fdvc7/vc7-re300.pdb ../src/fileiter.cpp
+
+vc7/vc7-re300/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc7/vc7-re300/vc7-re300.pch -Fo./vc7/vc7-re300/ -Fdvc7/vc7-re300.pdb ../src/posix_api.cpp
+
+vc7/vc7-re300/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD $(CXXFLAGS) -Fpvc7/vc7-re300/vc7-re300.pch -Fo./vc7/vc7-re300/ -Fdvc7/vc7-re300.pdb ../src/regex.cpp
+
+vc7/vc7-re300/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 /YX /FD $(CXXFLAGS) -Fpvc7/vc7-re300/vc7-re300.pch -Fo./vc7/vc7-re300/ -Fdvc7/vc7-re300.pdb ../src/regex_debug.cpp
+
+vc7/vc7-re300/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 /YX /FD $(CXXFLAGS) -Fpvc7/vc7-re300/vc7-re300.pch -Fo./vc7/vc7-re300/ -Fdvc7/vc7-re300.pdb ../src/regex_synch.cpp
+
+vc7/vc7-re300/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 /YX /FD $(CXXFLAGS) -Fpvc7/vc7-re300/vc7-re300.pch -Fo./vc7/vc7-re300/ -Fdvc7/vc7-re300.pdb ../src/w32_regex_traits.cpp
+
+vc7/vc7-re300/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 /YX /FD $(CXXFLAGS) -Fpvc7/vc7-re300/vc7-re300.pch -Fo./vc7/vc7-re300/ -Fdvc7/vc7-re300.pdb ../src/wide_posix_api.cpp
+
+vc7-re300_dir :
+	if not exist "vc7\vc7-re300\$(NULL)" mkdir vc7\vc7-re300
+
+vc7-re300_clean :
+	del vc7\vc7-re300\*.obj
+	del vc7\vc7-re300\*.idb
+	del vc7\vc7-re300\*.exp
+	del vc7\vc7-re300\*.pch
+
+./vc7/vc7-re300.lib : vc7/vc7-re300/c_regex_traits.obj vc7/vc7-re300/c_regex_traits_common.obj vc7/vc7-re300/cpp_regex_traits.obj vc7/vc7-re300/cregex.obj vc7/vc7-re300/fileiter.obj vc7/vc7-re300/posix_api.obj vc7/vc7-re300/regex.obj vc7/vc7-re300/regex_debug.obj vc7/vc7-re300/regex_synch.obj vc7/vc7-re300/w32_regex_traits.obj vc7/vc7-re300/wide_posix_api.obj
+	link -lib /nologo /out:vc7/vc7-re300.lib $(XSFLAGS)  vc7/vc7-re300/c_regex_traits.obj vc7/vc7-re300/c_regex_traits_common.obj vc7/vc7-re300/cpp_regex_traits.obj vc7/vc7-re300/cregex.obj vc7/vc7-re300/fileiter.obj vc7/vc7-re300/posix_api.obj vc7/vc7-re300/regex.obj vc7/vc7-re300/regex_debug.obj vc7/vc7-re300/regex_synch.obj vc7/vc7-re300/w32_regex_traits.obj vc7/vc7-re300/wide_posix_api.obj
+
+########################################################
+#
+# section for vc7-re300m.lib
+#
+########################################################
+vc7/vc7-re300m/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 /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300m/vc7-re300m.pch -Fo./vc7/vc7-re300m/ -Fdvc7/vc7-re300m.pdb ../src/c_regex_traits.cpp
+
+vc7/vc7-re300m/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 /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300m/vc7-re300m.pch -Fo./vc7/vc7-re300m/ -Fdvc7/vc7-re300m.pdb ../src/c_regex_traits_common.cpp
+
+vc7/vc7-re300m/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 /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300m/vc7-re300m.pch -Fo./vc7/vc7-re300m/ -Fdvc7/vc7-re300m.pdb ../src/cpp_regex_traits.cpp
+
+vc7/vc7-re300m/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300m/vc7-re300m.pch -Fo./vc7/vc7-re300m/ -Fdvc7/vc7-re300m.pdb ../src/cregex.cpp
+
+vc7/vc7-re300m/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300m/vc7-re300m.pch -Fo./vc7/vc7-re300m/ -Fdvc7/vc7-re300m.pdb ../src/fileiter.cpp
+
+vc7/vc7-re300m/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300m/vc7-re300m.pch -Fo./vc7/vc7-re300m/ -Fdvc7/vc7-re300m.pdb ../src/posix_api.cpp
+
+vc7/vc7-re300m/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300m/vc7-re300m.pch -Fo./vc7/vc7-re300m/ -Fdvc7/vc7-re300m.pdb ../src/regex.cpp
+
+vc7/vc7-re300m/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 /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300m/vc7-re300m.pch -Fo./vc7/vc7-re300m/ -Fdvc7/vc7-re300m.pdb ../src/regex_debug.cpp
+
+vc7/vc7-re300m/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 /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300m/vc7-re300m.pch -Fo./vc7/vc7-re300m/ -Fdvc7/vc7-re300m.pdb ../src/regex_synch.cpp
+
+vc7/vc7-re300m/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 /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300m/vc7-re300m.pch -Fo./vc7/vc7-re300m/ -Fdvc7/vc7-re300m.pdb ../src/w32_regex_traits.cpp
+
+vc7/vc7-re300m/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 /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300m/vc7-re300m.pch -Fo./vc7/vc7-re300m/ -Fdvc7/vc7-re300m.pdb ../src/wide_posix_api.cpp
+
+vc7-re300m_dir :
+	if not exist "vc7\vc7-re300m\$(NULL)" mkdir vc7\vc7-re300m
+
+vc7-re300m_clean :
+	del vc7\vc7-re300m\*.obj
+	del vc7\vc7-re300m\*.idb
+	del vc7\vc7-re300m\*.exp
+	del vc7\vc7-re300m\*.pch
+
+./vc7/vc7-re300m.lib : vc7/vc7-re300m/c_regex_traits.obj vc7/vc7-re300m/c_regex_traits_common.obj vc7/vc7-re300m/cpp_regex_traits.obj vc7/vc7-re300m/cregex.obj vc7/vc7-re300m/fileiter.obj vc7/vc7-re300m/posix_api.obj vc7/vc7-re300m/regex.obj vc7/vc7-re300m/regex_debug.obj vc7/vc7-re300m/regex_synch.obj vc7/vc7-re300m/w32_regex_traits.obj vc7/vc7-re300m/wide_posix_api.obj
+	link -lib /nologo /out:vc7/vc7-re300m.lib $(XSFLAGS)  vc7/vc7-re300m/c_regex_traits.obj vc7/vc7-re300m/c_regex_traits_common.obj vc7/vc7-re300m/cpp_regex_traits.obj vc7/vc7-re300m/cregex.obj vc7/vc7-re300m/fileiter.obj vc7/vc7-re300m/posix_api.obj vc7/vc7-re300m/regex.obj vc7/vc7-re300m/regex_debug.obj vc7/vc7-re300m/regex_synch.obj vc7/vc7-re300m/w32_regex_traits.obj vc7/vc7-re300m/wide_posix_api.obj
+
+########################################################
+#
+# section for vc7-re300d.lib
+#
+########################################################
+vc7/vc7-re300d/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 /YX /FD /GZ  /c  $(CXXFLAGS) -Fpvc7/vc7-re300d/vc7-re300d.pch -Fo./vc7/vc7-re300d/ -Fdvc7/vc7-re300d.pdb ../src/c_regex_traits.cpp
+
+vc7/vc7-re300d/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 /YX /FD /GZ  /c  $(CXXFLAGS) -Fpvc7/vc7-re300d/vc7-re300d.pch -Fo./vc7/vc7-re300d/ -Fdvc7/vc7-re300d.pdb ../src/c_regex_traits_common.cpp
+
+vc7/vc7-re300d/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 /YX /FD /GZ  /c  $(CXXFLAGS) -Fpvc7/vc7-re300d/vc7-re300d.pch -Fo./vc7/vc7-re300d/ -Fdvc7/vc7-re300d.pdb ../src/cpp_regex_traits.cpp
+
+vc7/vc7-re300d/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /YX /FD /GZ  /c  $(CXXFLAGS) -Fpvc7/vc7-re300d/vc7-re300d.pch -Fo./vc7/vc7-re300d/ -Fdvc7/vc7-re300d.pdb ../src/cregex.cpp
+
+vc7/vc7-re300d/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /YX /FD /GZ  /c  $(CXXFLAGS) -Fpvc7/vc7-re300d/vc7-re300d.pch -Fo./vc7/vc7-re300d/ -Fdvc7/vc7-re300d.pdb ../src/fileiter.cpp
+
+vc7/vc7-re300d/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /YX /FD /GZ  /c  $(CXXFLAGS) -Fpvc7/vc7-re300d/vc7-re300d.pch -Fo./vc7/vc7-re300d/ -Fdvc7/vc7-re300d.pdb ../src/posix_api.cpp
+
+vc7/vc7-re300d/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /YX /FD /GZ  /c  $(CXXFLAGS) -Fpvc7/vc7-re300d/vc7-re300d.pch -Fo./vc7/vc7-re300d/ -Fdvc7/vc7-re300d.pdb ../src/regex.cpp
+
+vc7/vc7-re300d/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 /YX /FD /GZ  /c  $(CXXFLAGS) -Fpvc7/vc7-re300d/vc7-re300d.pch -Fo./vc7/vc7-re300d/ -Fdvc7/vc7-re300d.pdb ../src/regex_debug.cpp
+
+vc7/vc7-re300d/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 /YX /FD /GZ  /c  $(CXXFLAGS) -Fpvc7/vc7-re300d/vc7-re300d.pch -Fo./vc7/vc7-re300d/ -Fdvc7/vc7-re300d.pdb ../src/regex_synch.cpp
+
+vc7/vc7-re300d/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 /YX /FD /GZ  /c  $(CXXFLAGS) -Fpvc7/vc7-re300d/vc7-re300d.pch -Fo./vc7/vc7-re300d/ -Fdvc7/vc7-re300d.pdb ../src/w32_regex_traits.cpp
+
+vc7/vc7-re300d/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 /YX /FD /GZ  /c  $(CXXFLAGS) -Fpvc7/vc7-re300d/vc7-re300d.pch -Fo./vc7/vc7-re300d/ -Fdvc7/vc7-re300d.pdb ../src/wide_posix_api.cpp
+
+vc7-re300d_dir :
+	if not exist "vc7\vc7-re300d\$(NULL)" mkdir vc7\vc7-re300d
+
+vc7-re300d_clean :
+	del vc7\vc7-re300d\*.obj
+	del vc7\vc7-re300d\*.idb
+	del vc7\vc7-re300d\*.exp
+	del vc7\vc7-re300d\*.pch
+
+./vc7/vc7-re300d.lib : vc7/vc7-re300d/c_regex_traits.obj vc7/vc7-re300d/c_regex_traits_common.obj vc7/vc7-re300d/cpp_regex_traits.obj vc7/vc7-re300d/cregex.obj vc7/vc7-re300d/fileiter.obj vc7/vc7-re300d/posix_api.obj vc7/vc7-re300d/regex.obj vc7/vc7-re300d/regex_debug.obj vc7/vc7-re300d/regex_synch.obj vc7/vc7-re300d/w32_regex_traits.obj vc7/vc7-re300d/wide_posix_api.obj
+	link -lib /nologo /out:vc7/vc7-re300d.lib $(XSFLAGS)  vc7/vc7-re300d/c_regex_traits.obj vc7/vc7-re300d/c_regex_traits_common.obj vc7/vc7-re300d/cpp_regex_traits.obj vc7/vc7-re300d/cregex.obj vc7/vc7-re300d/fileiter.obj vc7/vc7-re300d/posix_api.obj vc7/vc7-re300d/regex.obj vc7/vc7-re300d/regex_debug.obj vc7/vc7-re300d/regex_synch.obj vc7/vc7-re300d/w32_regex_traits.obj vc7/vc7-re300d/wide_posix_api.obj
+
+########################################################
+#
+# section for vc7-re300dm.lib
+#
+########################################################
+vc7/vc7-re300dm/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 /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dm/vc7-re300dm.pch -Fo./vc7/vc7-re300dm/ -Fdvc7/vc7-re300dm.pdb ../src/c_regex_traits.cpp
+
+vc7/vc7-re300dm/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 /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dm/vc7-re300dm.pch -Fo./vc7/vc7-re300dm/ -Fdvc7/vc7-re300dm.pdb ../src/c_regex_traits_common.cpp
+
+vc7/vc7-re300dm/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 /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dm/vc7-re300dm.pch -Fo./vc7/vc7-re300dm/ -Fdvc7/vc7-re300dm.pdb ../src/cpp_regex_traits.cpp
+
+vc7/vc7-re300dm/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dm/vc7-re300dm.pch -Fo./vc7/vc7-re300dm/ -Fdvc7/vc7-re300dm.pdb ../src/cregex.cpp
+
+vc7/vc7-re300dm/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dm/vc7-re300dm.pch -Fo./vc7/vc7-re300dm/ -Fdvc7/vc7-re300dm.pdb ../src/fileiter.cpp
+
+vc7/vc7-re300dm/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dm/vc7-re300dm.pch -Fo./vc7/vc7-re300dm/ -Fdvc7/vc7-re300dm.pdb ../src/posix_api.cpp
+
+vc7/vc7-re300dm/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dm/vc7-re300dm.pch -Fo./vc7/vc7-re300dm/ -Fdvc7/vc7-re300dm.pdb ../src/regex.cpp
+
+vc7/vc7-re300dm/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 /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dm/vc7-re300dm.pch -Fo./vc7/vc7-re300dm/ -Fdvc7/vc7-re300dm.pdb ../src/regex_debug.cpp
+
+vc7/vc7-re300dm/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 /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dm/vc7-re300dm.pch -Fo./vc7/vc7-re300dm/ -Fdvc7/vc7-re300dm.pdb ../src/regex_synch.cpp
+
+vc7/vc7-re300dm/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 /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dm/vc7-re300dm.pch -Fo./vc7/vc7-re300dm/ -Fdvc7/vc7-re300dm.pdb ../src/w32_regex_traits.cpp
+
+vc7/vc7-re300dm/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 /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dm/vc7-re300dm.pch -Fo./vc7/vc7-re300dm/ -Fdvc7/vc7-re300dm.pdb ../src/wide_posix_api.cpp
+
+vc7-re300dm_dir :
+	if not exist "vc7\vc7-re300dm\$(NULL)" mkdir vc7\vc7-re300dm
+
+vc7-re300dm_clean :
+	del vc7\vc7-re300dm\*.obj
+	del vc7\vc7-re300dm\*.idb
+	del vc7\vc7-re300dm\*.exp
+	del vc7\vc7-re300dm\*.pch
+
+./vc7/vc7-re300dm.lib : vc7/vc7-re300dm/c_regex_traits.obj vc7/vc7-re300dm/c_regex_traits_common.obj vc7/vc7-re300dm/cpp_regex_traits.obj vc7/vc7-re300dm/cregex.obj vc7/vc7-re300dm/fileiter.obj vc7/vc7-re300dm/posix_api.obj vc7/vc7-re300dm/regex.obj vc7/vc7-re300dm/regex_debug.obj vc7/vc7-re300dm/regex_synch.obj vc7/vc7-re300dm/w32_regex_traits.obj vc7/vc7-re300dm/wide_posix_api.obj
+	link -lib /nologo /out:vc7/vc7-re300dm.lib $(XSFLAGS)  vc7/vc7-re300dm/c_regex_traits.obj vc7/vc7-re300dm/c_regex_traits_common.obj vc7/vc7-re300dm/cpp_regex_traits.obj vc7/vc7-re300dm/cregex.obj vc7/vc7-re300dm/fileiter.obj vc7/vc7-re300dm/posix_api.obj vc7/vc7-re300dm/regex.obj vc7/vc7-re300dm/regex_debug.obj vc7/vc7-re300dm/regex_synch.obj vc7/vc7-re300dm/w32_regex_traits.obj vc7/vc7-re300dm/wide_posix_api.obj
+
+########################################################
+#
+# section for vc7-re300dl.lib
+#
+########################################################
+vc7/vc7-re300dl/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dl/vc7-re300dl.pch -Fo./vc7/vc7-re300dl/ -Fdvc7/vc7-re300dl.pdb ../src/c_regex_traits.cpp
+
+vc7/vc7-re300dl/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 /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dl/vc7-re300dl.pch -Fo./vc7/vc7-re300dl/ -Fdvc7/vc7-re300dl.pdb ../src/c_regex_traits_common.cpp
+
+vc7/vc7-re300dl/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dl/vc7-re300dl.pch -Fo./vc7/vc7-re300dl/ -Fdvc7/vc7-re300dl.pdb ../src/cpp_regex_traits.cpp
+
+vc7/vc7-re300dl/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dl/vc7-re300dl.pch -Fo./vc7/vc7-re300dl/ -Fdvc7/vc7-re300dl.pdb ../src/cregex.cpp
+
+vc7/vc7-re300dl/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dl/vc7-re300dl.pch -Fo./vc7/vc7-re300dl/ -Fdvc7/vc7-re300dl.pdb ../src/fileiter.cpp
+
+vc7/vc7-re300dl/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dl/vc7-re300dl.pch -Fo./vc7/vc7-re300dl/ -Fdvc7/vc7-re300dl.pdb ../src/posix_api.cpp
+
+vc7/vc7-re300dl/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dl/vc7-re300dl.pch -Fo./vc7/vc7-re300dl/ -Fdvc7/vc7-re300dl.pdb ../src/regex.cpp
+
+vc7/vc7-re300dl/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dl/vc7-re300dl.pch -Fo./vc7/vc7-re300dl/ -Fdvc7/vc7-re300dl.pdb ../src/regex_debug.cpp
+
+vc7/vc7-re300dl/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dl/vc7-re300dl.pch -Fo./vc7/vc7-re300dl/ -Fdvc7/vc7-re300dl.pdb ../src/regex_synch.cpp
+
+vc7/vc7-re300dl/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dl/vc7-re300dl.pch -Fo./vc7/vc7-re300dl/ -Fdvc7/vc7-re300dl.pdb ../src/w32_regex_traits.cpp
+
+vc7/vc7-re300dl/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c $(CXXFLAGS) -Fpvc7/vc7-re300dl/vc7-re300dl.pch -Fo./vc7/vc7-re300dl/ -Fdvc7/vc7-re300dl.pdb ../src/wide_posix_api.cpp
+
+vc7-re300dl_dir :
+	if not exist "vc7\vc7-re300dl\$(NULL)" mkdir vc7\vc7-re300dl
+
+vc7-re300dl_clean :
+	del vc7\vc7-re300dl\*.obj
+	del vc7\vc7-re300dl\*.idb
+	del vc7\vc7-re300dl\*.exp
+	del vc7\vc7-re300dl\*.pch
+
+./vc7/vc7-re300dl.lib : vc7/vc7-re300dl/c_regex_traits.obj vc7/vc7-re300dl/c_regex_traits_common.obj vc7/vc7-re300dl/cpp_regex_traits.obj vc7/vc7-re300dl/cregex.obj vc7/vc7-re300dl/fileiter.obj vc7/vc7-re300dl/posix_api.obj vc7/vc7-re300dl/regex.obj vc7/vc7-re300dl/regex_debug.obj vc7/vc7-re300dl/regex_synch.obj vc7/vc7-re300dl/w32_regex_traits.obj vc7/vc7-re300dl/wide_posix_api.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/vc7-re300dl.pdb" /debug /machine:I386 /out:"vc7/vc7-re300dl.dll" /implib:"vc7/vc7-re300dl.lib" $(XLFLAGS)  vc7/vc7-re300dl/c_regex_traits.obj vc7/vc7-re300dl/c_regex_traits_common.obj vc7/vc7-re300dl/cpp_regex_traits.obj vc7/vc7-re300dl/cregex.obj vc7/vc7-re300dl/fileiter.obj vc7/vc7-re300dl/posix_api.obj vc7/vc7-re300dl/regex.obj vc7/vc7-re300dl/regex_debug.obj vc7/vc7-re300dl/regex_synch.obj vc7/vc7-re300dl/w32_regex_traits.obj vc7/vc7-re300dl/wide_posix_api.obj
+
+########################################################
+#
+# section for vc7-re300l.lib
+#
+########################################################
+vc7/vc7-re300l/c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300l/vc7-re300l.pch -Fo./vc7/vc7-re300l/ -Fdvc7/vc7-re300l.pdb ../src/c_regex_traits.cpp
+
+vc7/vc7-re300l/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300l/vc7-re300l.pch -Fo./vc7/vc7-re300l/ -Fdvc7/vc7-re300l.pdb ../src/c_regex_traits_common.cpp
+
+vc7/vc7-re300l/cpp_regex_traits.obj: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300l/vc7-re300l.pch -Fo./vc7/vc7-re300l/ -Fdvc7/vc7-re300l.pdb ../src/cpp_regex_traits.cpp
+
+vc7/vc7-re300l/cregex.obj: ../src/cregex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300l/vc7-re300l.pch -Fo./vc7/vc7-re300l/ -Fdvc7/vc7-re300l.pdb ../src/cregex.cpp
+
+vc7/vc7-re300l/fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300l/vc7-re300l.pch -Fo./vc7/vc7-re300l/ -Fdvc7/vc7-re300l.pdb ../src/fileiter.cpp
+
+vc7/vc7-re300l/posix_api.obj: ../src/posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300l/vc7-re300l.pch -Fo./vc7/vc7-re300l/ -Fdvc7/vc7-re300l.pdb ../src/posix_api.cpp
+
+vc7/vc7-re300l/regex.obj: ../src/regex.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300l/vc7-re300l.pch -Fo./vc7/vc7-re300l/ -Fdvc7/vc7-re300l.pdb ../src/regex.cpp
+
+vc7/vc7-re300l/regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300l/vc7-re300l.pch -Fo./vc7/vc7-re300l/ -Fdvc7/vc7-re300l.pdb ../src/regex_debug.cpp
+
+vc7/vc7-re300l/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300l/vc7-re300l.pch -Fo./vc7/vc7-re300l/ -Fdvc7/vc7-re300l.pdb ../src/regex_synch.cpp
+
+vc7/vc7-re300l/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300l/vc7-re300l.pch -Fo./vc7/vc7-re300l/ -Fdvc7/vc7-re300l.pdb ../src/w32_regex_traits.cpp
+
+vc7/vc7-re300l/wide_posix_api.obj: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300l/vc7-re300l.pch -Fo./vc7/vc7-re300l/ -Fdvc7/vc7-re300l.pdb ../src/wide_posix_api.cpp
+
+vc7-re300l_dir :
+	if not exist "vc7\vc7-re300l\$(NULL)" mkdir vc7\vc7-re300l
+
+vc7-re300l_clean :
+	del vc7\vc7-re300l\*.obj
+	del vc7\vc7-re300l\*.idb
+	del vc7\vc7-re300l\*.exp
+	del vc7\vc7-re300l\*.pch
+
+./vc7/vc7-re300l.lib : vc7/vc7-re300l/c_regex_traits.obj vc7/vc7-re300l/c_regex_traits_common.obj vc7/vc7-re300l/cpp_regex_traits.obj vc7/vc7-re300l/cregex.obj vc7/vc7-re300l/fileiter.obj vc7/vc7-re300l/posix_api.obj vc7/vc7-re300l/regex.obj vc7/vc7-re300l/regex_debug.obj vc7/vc7-re300l/regex_synch.obj vc7/vc7-re300l/w32_regex_traits.obj vc7/vc7-re300l/wide_posix_api.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/vc7-re300l.pdb" /debug /machine:I386 /out:"vc7/vc7-re300l.dll" /implib:"vc7/vc7-re300l.lib" $(XLFLAGS)  vc7/vc7-re300l/c_regex_traits.obj vc7/vc7-re300l/c_regex_traits_common.obj vc7/vc7-re300l/cpp_regex_traits.obj vc7/vc7-re300l/cregex.obj vc7/vc7-re300l/fileiter.obj vc7/vc7-re300l/posix_api.obj vc7/vc7-re300l/regex.obj vc7/vc7-re300l/regex_debug.obj vc7/vc7-re300l/regex_synch.obj vc7/vc7-re300l/w32_regex_traits.obj vc7/vc7-re300l/wide_posix_api.obj
+
+########################################################
+#
+# section for vc7-re300ls.lib
+#
+########################################################
+vc7/vc7-re300ls/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 /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300ls/vc7-re300ls.pch -Fo./vc7/vc7-re300ls/ -Fdvc7/vc7-re300ls.pdb ../src/c_regex_traits.cpp
+
+vc7/vc7-re300ls/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 /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300ls/vc7-re300ls.pch -Fo./vc7/vc7-re300ls/ -Fdvc7/vc7-re300ls.pdb ../src/c_regex_traits_common.cpp
+
+vc7/vc7-re300ls/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 /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300ls/vc7-re300ls.pch -Fo./vc7/vc7-re300ls/ -Fdvc7/vc7-re300ls.pdb ../src/cpp_regex_traits.cpp
+
+vc7/vc7-re300ls/cregex.obj: ../src/cregex.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 /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300ls/vc7-re300ls.pch -Fo./vc7/vc7-re300ls/ -Fdvc7/vc7-re300ls.pdb ../src/cregex.cpp
+
+vc7/vc7-re300ls/fileiter.obj: ../src/fileiter.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 /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300ls/vc7-re300ls.pch -Fo./vc7/vc7-re300ls/ -Fdvc7/vc7-re300ls.pdb ../src/fileiter.cpp
+
+vc7/vc7-re300ls/posix_api.obj: ../src/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 /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300ls/vc7-re300ls.pch -Fo./vc7/vc7-re300ls/ -Fdvc7/vc7-re300ls.pdb ../src/posix_api.cpp
+
+vc7/vc7-re300ls/regex.obj: ../src/regex.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 /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300ls/vc7-re300ls.pch -Fo./vc7/vc7-re300ls/ -Fdvc7/vc7-re300ls.pdb ../src/regex.cpp
+
+vc7/vc7-re300ls/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 /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300ls/vc7-re300ls.pch -Fo./vc7/vc7-re300ls/ -Fdvc7/vc7-re300ls.pdb ../src/regex_debug.cpp
+
+vc7/vc7-re300ls/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 /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300ls/vc7-re300ls.pch -Fo./vc7/vc7-re300ls/ -Fdvc7/vc7-re300ls.pdb ../src/regex_synch.cpp
+
+vc7/vc7-re300ls/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 /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300ls/vc7-re300ls.pch -Fo./vc7/vc7-re300ls/ -Fdvc7/vc7-re300ls.pdb ../src/w32_regex_traits.cpp
+
+vc7/vc7-re300ls/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 /YX /FD /c $(CXXFLAGS) -Fpvc7/vc7-re300ls/vc7-re300ls.pch -Fo./vc7/vc7-re300ls/ -Fdvc7/vc7-re300ls.pdb ../src/wide_posix_api.cpp
+
+vc7-re300ls_dir :
+	if not exist "vc7\vc7-re300ls\$(NULL)" mkdir vc7\vc7-re300ls
+
+vc7-re300ls_clean :
+	del vc7\vc7-re300ls\*.obj
+	del vc7\vc7-re300ls\*.idb
+	del vc7\vc7-re300ls\*.exp
+	del vc7\vc7-re300ls\*.pch
+
+./vc7/vc7-re300ls.lib : vc7/vc7-re300ls/c_regex_traits.obj vc7/vc7-re300ls/c_regex_traits_common.obj vc7/vc7-re300ls/cpp_regex_traits.obj vc7/vc7-re300ls/cregex.obj vc7/vc7-re300ls/fileiter.obj vc7/vc7-re300ls/posix_api.obj vc7/vc7-re300ls/regex.obj vc7/vc7-re300ls/regex_debug.obj vc7/vc7-re300ls/regex_synch.obj vc7/vc7-re300ls/w32_regex_traits.obj vc7/vc7-re300ls/wide_posix_api.obj
+	link -lib /nologo /out:vc7/vc7-re300ls.lib $(XSFLAGS)  vc7/vc7-re300ls/c_regex_traits.obj vc7/vc7-re300ls/c_regex_traits_common.obj vc7/vc7-re300ls/cpp_regex_traits.obj vc7/vc7-re300ls/cregex.obj vc7/vc7-re300ls/fileiter.obj vc7/vc7-re300ls/posix_api.obj vc7/vc7-re300ls/regex.obj vc7/vc7-re300ls/regex_debug.obj vc7/vc7-re300ls/regex_synch.obj vc7/vc7-re300ls/w32_regex_traits.obj vc7/vc7-re300ls/wide_posix_api.obj
+
+

changes.txt

@@ -1,3 +1,8 @@
+Version 330:
+CHANGED:  Completely redesigned config support (now fully integrated with boost).
+FIXED:    Support for building with _UNICODE defined.
+FIXED:    Bug when running on Windows XP (character classification bitmaps wrong).
+
 Version 311:
 FIXED:    Support for STLPort 4.1b6.
 FIXED:    Library calling convention for VC6 debug builds.
@@ -263,5 +268,6 @@ BUG:      character sets don't function correctly when regbase::char_classes
 
 
 
+
 
 

dmi.sh

@@ -1,14 +0,0 @@
-#! /bin/sh
-
-if test "$#" != "1"; then
-exit 1
-fi
-
-cd "$1"
-
-if eval make; then
-exit 0
-fi
-
-exit 1
-

example/Jamfile

@@ -4,8 +4,8 @@ subproject libs/regex/example ;
 exe timer : timer/regex_timer.cpp 
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic
@@ -14,8 +14,8 @@ exe timer : timer/regex_timer.cpp
 exe jgrep : jgrep/jgrep.cpp jgrep/main.cpp
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic
@@ -24,8 +24,8 @@ exe jgrep : jgrep/jgrep.cpp jgrep/main.cpp
 exe credit_card_example : snippets/credit_card_example.cpp
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic
@@ -35,8 +35,8 @@ exe credit_card_example : snippets/credit_card_example.cpp
 exe partial_regex_grep : snippets/partial_regex_grep.cpp
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic
@@ -45,8 +45,8 @@ exe partial_regex_grep : snippets/partial_regex_grep.cpp
 exe partial_regex_match : snippets/partial_regex_match.cpp
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic
@@ -55,8 +55,8 @@ exe partial_regex_match : snippets/partial_regex_match.cpp
 exe regex_grep_example_1 : snippets/regex_grep_example_1.cpp
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic
@@ -65,8 +65,8 @@ exe regex_grep_example_1 : snippets/regex_grep_example_1.cpp
 exe regex_grep_example_2 : snippets/regex_grep_example_2.cpp
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic
@@ -75,8 +75,8 @@ exe regex_grep_example_2 : snippets/regex_grep_example_2.cpp
 exe regex_grep_example_3 : snippets/regex_grep_example_3.cpp
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic
@@ -85,8 +85,8 @@ exe regex_grep_example_3 : snippets/regex_grep_example_3.cpp
 exe regex_grep_example_4 : snippets/regex_grep_example_4.cpp
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic
@@ -95,8 +95,8 @@ exe regex_grep_example_4 : snippets/regex_grep_example_4.cpp
 exe regex_match_example : snippets/regex_match_example.cpp
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic
@@ -105,8 +105,8 @@ exe regex_match_example : snippets/regex_match_example.cpp
 exe regex_merge_example : snippets/regex_merge_example.cpp
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic
@@ -115,8 +115,8 @@ exe regex_merge_example : snippets/regex_merge_example.cpp
 exe regex_search_example : snippets/regex_search_example.cpp
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic
@@ -125,8 +125,8 @@ exe regex_search_example : snippets/regex_search_example.cpp
 exe regex_split_example_1 : snippets/regex_split_example_1.cpp
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic
@@ -135,8 +135,8 @@ exe regex_split_example_1 : snippets/regex_split_example_1.cpp
 exe regex_split_example_2 : snippets/regex_split_example_2.cpp
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic

example/jgrep/makefile.in

@@ -1,42 +0,0 @@
-
-# very basic makefile for jgrep
-#
-
-CXX=@CXX@
-CXXFLAGS=@CXXFLAGS@
-LIBS=@LIBS@
-EXE=@ac_exe_ext@
-OBJ=@ac_obj_ext@
-
-LIBDEP=../../build/libboost_regex.a ../../../../boost/regex/detail/regex_options.hpp ../../../../boost/regex/detail/regex_config.hpp
-
-jgrep$(EXE) : jgrep$(OBJ) main$(OBJ)
-	$(CXX) -o jgrep$(EXE) jgrep$(OBJ) main$(OBJ) -L../../build -lboost_regex $(LIBS)
-
-jgrep$(OBJ) : jgrep.cpp jgrep.h $(LIBDEP)
-	$(CXX) -c $(CXXFLAGS) -I../../../../ -I./ jgrep.cpp
-
-main$(OBJ) : main.cpp jgrep.h $(LIBDEP)
-	$(CXX) -c $(CXXFLAGS) -I../../../../ -I./ main.cpp
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

example/snippets/regex_split_example_2.cpp

@@ -24,6 +24,7 @@
 #include <list>
 #include <fstream>
 #include <iostream>
+#include <iterator>
 #include <boost/regex.hpp>
 
 boost::regex e("<\\s*A\\s+[^>]*href\\s*=\\s*\"([^\"]*)\"",

example/timer/makefile.in

@@ -1,39 +0,0 @@
-
-# very basic makefile for timer
-#
-CXX=@CXX@
-CXXFLAGS=@CXXFLAGS@
-LIBS=@LIBS@
-EXE=@ac_exe_ext@
-OBJ=@ac_obj_ext@
-
-LIBDEP=../../build/libboost_regex.a ../../../../boost/regex/detail/regex_options.hpp ../../../../boost/regex/detail/regex_config.hpp
-
-regex_timer$(EXE) : regex_timer$(OBJ)
-	$(CXX) -o timer$(EXE) regex_timer$(OBJ) -L../../build -lboost_regex $(LIBS)
-
-regex_timer$(OBJ) : regex_timer.cpp $(LIBDEP)
-	$(CXX) -c $(CXXFLAGS) -DSTRICT -I../../../../ -I./ regex_timer.cpp
-
-timer$(OBJ) : ../../../timer/timer.cpp $(LIBDEP)
-	$(CXX) -c $(CXXFLAGS) -DSTRICT -I../../../../ -I./ ../../../timer/timer.cpp
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

example/timer/regex_timer.cpp

@@ -28,6 +28,7 @@ using std::endl;
 #include <algorithm>
 #include <string>
 #include <deque>
+#include <boost/config.hpp>
 #include <boost/regex.hpp>
 #include <boost/timer.hpp> 
 #include <boost/smart_ptr.hpp>
@@ -37,7 +38,7 @@ using std::endl;
 using namespace boost;
 #endif
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 ostream& operator << (ostream& os, const std::wstring& s)
 {
    std::wstring::const_iterator i, j;
@@ -90,7 +91,7 @@ int main()
 {
    boost::regex ex;
    boost::match_results<std::string::const_iterator> sm;
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
    std::wstring ws1, ws2;
    boost::wregex wex;
    boost::match_results<std::wstring::const_iterator> wsm;
@@ -112,13 +113,13 @@ int main()
       getline(cin, s1);
       if(s1 == "quit")
          break;
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
       ws1.erase();
       std::copy(s1.begin(), s1.end(), string_out_iterator<std::wstring>(ws1));
 #endif
       try{
          ex.assign(s1);
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
          wex.assign(ws1);
 #endif
       }
@@ -145,7 +146,7 @@ int main()
          if(s2 == "quit")
             break;
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
          ws2.erase();
          std::copy(s2.begin(), s2.end(), string_out_iterator<std::wstring>(ws2));
 #endif
@@ -156,7 +157,7 @@ int main()
          iters = 10;
          tim = 1.1;
 
-#if defined(_WIN32) && defined(BOOST_RE_LOCALE_W32)
+#if defined(_WIN32) && defined(BOOST_REGEX_USE_WIN32_LOCALE)
          MSG msg;
          PeekMessage(&msg, 0, 0, 0, 0);
          Sleep(0);
@@ -194,7 +195,7 @@ int main()
             cout << "\" (matched=" << sm[-2].matched << ")" << endl << endl;
          }
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
          // measure time interval for boost::wregex
          iters = 10;
          tim = 1.1;

faq.htm

@@ -1,20 +1,28 @@
-<HTML>
+<html>
-<HEAD>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=windows-1252">
-<META NAME="Generator" CONTENT="Microsoft Word 97">
-<TITLE>Regex++ - FAQ</TITLE>
-<META NAME="Template" CONTENT="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
-</HEAD>
-<BODY LINK="#0000ff" VLINK="#800080" BGCOLOR="#ffffff">
 
-<P><!DOCTYPE HTML PUBLIC "-//w3c//dtd html 4.0 transitional//en">&nbsp; </P>
+<head>
-<TABLE CELLSPACING=0 BORDER=0 CELLPADDING=7 WIDTH=624>
+<meta http-equiv="Content-Type"
-<TR><TD WIDTH="50%" VALIGN="TOP">
+content="text/html; charset=iso-8859-1">
-<H3><IMG SRC="../../c++boost.gif" WIDTH=276 HEIGHT=86 ALT="C++ Boost"></H3></TD>
+<meta name="Template"
-<TD WIDTH="50%" VALIGN="TOP">
+content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
-<H3 ALIGN="CENTER">Regex++, FAQ.</H3>
+<meta name="GENERATOR" content="Microsoft FrontPage Express 2.0">
-<I><P ALIGN="CENTER">(version 3.12, 18 April 2000)</I> </P>
+<title>Regex++ - FAQ</title>
-<I><PRE>Copyright (c) 1998-2000
+</head>
+
+<body bgcolor="#FFFFFF" link="#0000FF" vlink="#800080">
+
+<p>&nbsp; </p>
+
+<table border="0" cellpadding="7" cellspacing="0" width="624">
+    <tr>
+        <td valign="top" width="50%"><h3><img
+        src="../../c++boost.gif" alt="C++ Boost" width="276"
+        height="86"></h3>
+        </td>
+        <td valign="top" width="50%"><h3 align="center">Regex++,
+        FAQ.</h3>
+        <p align="center"><i>(version 3.12, 18 April 2000)</i> </p>
+        <pre><i>Copyright (c) 1998-2000
 Dr John Maddock
 
 Permission to use, copy, modify, distribute and sell this software
@@ -23,49 +31,175 @@ provided that the above copyright notice appear in all copies and
 that both that copyright notice and this permission notice appear
 in supporting documentation.&nbsp; Dr John Maddock makes no representations
 about the suitability of this software for any purpose.&nbsp;&nbsp;
-It is provided "as is" without express or implied warranty.</PRE></I></TD>
+It is provided &quot;as is&quot; without express or implied warranty.</i></pre>
-</TR>
+        </td>
-</TABLE>
+    </tr>
+</table>
 
-<FONT COLOR="#ff0000"><P>Q. Why does using parenthesis in a regular expression change the result of a match?</P>
+<p><font color="#FF0000">Q. Why does using parenthesis in a
-</FONT><P>Parentheses don't only mark; they determine what the best match is as well.  regex++ tries to follow the POSIX standard leftmost longest rule for determining what matched.  So if there is more than one possible match after considering the whole expression, it looks next at the first sub-expression and then the second sub-expression and so on.  So...</P>
+regular expression change the result of a match?</font></p>
-<PRE>"(0*)([0-9]*)" against "00123" would produce
-$1 = "00"
-$2 = "123"</PRE>
-<P>where as</P>
-<PRE>"0*([0-9)*" against "00123" would produce
-$1 = "00123"</PRE>
-<P>If you think about it, had $1 only matched the "123", this would be "less good" than the match "00123" which is both further to the left and longer.  If you want $1 to match only the "123" part, then you need to use something like:</P>
-<PRE>"0*([1-9][0-9]*)"</PRE>
-<P>as the expression.</P>
-<FONT COLOR="#ff0000"><P>Q. Configure says that my compiler is unable to merge template instances, what does this mean?</FONT> </P>
-<P>A. When you compile template code, you can end up with the same template instances in multiple translation units - this will lead to link time errors unless your compiler/linker is smart enough to merge these template instances into a single record in the executable file. If you see this warning after running configure, then you can still link to libregex++.a if: </P>
-<OL>
 
-<LI>You use only the low-level template classes (reg_expression&lt;&gt; match_results&lt;&gt; etc), from a single translation unit, and use no other part of regex++.</LI>
+<p>Parentheses don't only mark; they determine what the best
-<LI>You use only the POSIX API functions (regcomp regexec etc), and no other part of regex++.</LI>
+match is as well. regex++ tries to follow the POSIX standard
-<LI>You use only the high level class RegEx, and no other part of regex++. </LI></OL>
+leftmost longest rule for determining what matched. So if there
+is more than one possible match after considering the whole
+expression, it looks next at the first sub-expression and then
+the second sub-expression and so on. So...</p>
 
-<P>Another option is to create a master include file, which #include's all the regex++ source files, and all the source files in which you use regex++. You then compile and link this master file as a single translation unit. </P>
+<pre>&quot;(0*)([0-9]*)&quot; against &quot;00123&quot; would produce
-<FONT COLOR="#ff0000"><P>Q. Configure says that my compiler is unable to merge template instances from archive files, what does this mean?</FONT> </P>
+$1 = &quot;00&quot;
-<P>A. When you compile template code, you can end up with the same template instances in multiple translation units - this will lead to link time errors unless your compiler/linker is smart enough to merge these template instances into a single record in the executable file. Some compilers are able to do this for normal .cpp or .o files, but fail if the object file has been placed in a library archive. If you see this warning after running configure, then you can still link to libregex++.a if: </P>
+$2 = &quot;123&quot;</pre>
-<OL>
 
-<LI>You use only the low-level template classes (reg_expression&lt;&gt; match_results&lt;&gt; etc), and use no other part of regex++.</LI>
+<p>where as</p>
-<LI>You use only the POSIX API functions (regcomp regexec etc), and no other part of regex++.</LI>
-<LI>You use only the high level class RegEx, and no other part of regex++. </LI></OL>
 
-<P>Another option is to add the regex++ source files directly to your project instead of linking to libregex++.a, generally you should do this only if you are getting link time errors with libregex++.a. </P>
+<pre>&quot;0*([0-9)*&quot; against &quot;00123&quot; would produce
-<FONT COLOR="#ff0000"><P>Q. Configure says that my compiler can't merge templates containing switch statements, what does this mean?</FONT> </P>
+$1 = &quot;00123&quot;</pre>
-<P>A. Some compilers can't merge templates that contain static data - this includes switch statements which implicitly generate static data as well as code. Principally this affects the egcs compiler - but note gcc 2.81 also suffers from this problem - the compiler will compile and link the code - but the code will not run because the code and the static data it uses have become separated. The default behaviour of regex++ is to try and fix this problem by declaring "problem" templates inside unnamed namespaces, so that the templates have internal linkage. Note that this can result in a great deal of code bloat. If the compiler doesn't support namespaces, or if code bloat becomes a problem, then follow the guidelines above for placing all the templates used in a single translation unit, and edit jm_opt.h so that BOOST_RE_NO_TEMPLATE_SWITCH_MERGE is no longer defined. </P>
+
-<FONT COLOR="#ff0000"><P>Q. I can't get regex++ to work with escape characters, what's going on?</FONT> </P>
+<p>If you think about it, had $1 only matched the &quot;123&quot;,
-<P>A. If you embed regular expressions in C++ code, then remember that escape characters are processed twice: once by the C++ compiler, and once by the regex++ expression compiler, so to pass the regular expression \d+ to regex++, you need to embed "\\d+" in your code. Likewise to match a literal backslash you will need to embed "\\\\" in your code. </P>
+this would be &quot;less good&quot; than the match &quot;00123&quot;
-<FONT COLOR="#ff0000"><P>Q. Why don't character ranges work properly?</FONT> <BR>
+which is both further to the left and longer. If you want $1 to
-A. The POSIX standard specifies that character range expressions are locale sensitive - so for example the expression [A-Z] will match any collating element that collates between 'A' and 'Z'. That means that for most locales other than "C" or "POSIX", [A-Z] would match the single character 't' for example, which is not what most people expect - or at least not what most people have come to expect from regular expression engines. For this reason, the default behaviour of regex++ is to turn locale sensitive collation off by setting the regbase::nocollate compile time flag (this is set by regbase::normal). However if you set a non-default compile time flag - for example regbase::extended or regbase::basic, then locale dependent collation will be enabled, this also applies to the POSIX API functions which use either regbase::extended or regbase::basic internally, in the latter case use REG_NOCOLLATE in combination with either REG_BASIC or REG_EXTENDED when invoking regcomp if you don't want locale sensitive collation. <I>[Note - when regbase::nocollate in effect, the library behaves "as if" the LC_COLLATE locale category were always "C", regardless of what its actually set to - end note</I>]. </P>
+match only the &quot;123&quot; part, then you need to use
-<FONT COLOR="#ff0000"><P>&nbsp;Q. Why can't I use the "convenience" versions of query_match/reg_search/reg_grep/reg_format/reg_merge?</FONT> </P>
+something like:</p>
-<P>A. These versions may or may not be available depending upon the capabilities of your compiler, the rules determining the format of these functions are quite complex - and only the versions visible to a standard compliant compiler are given in the help. To find out what your compiler supports, run &lt;boost/regex.hpp&gt; through your C++ pre-processor, and search the output file for the function that you are interested in. </P>
+
-<FONT COLOR="#ff0000"><P>Q. Why are there no throw specifications on any of the functions? What exceptions can the library throw?</FONT> </P>
+<pre>&quot;0*([1-9][0-9]*)&quot;</pre>
-<P>A. Not all compilers support (or honor) throw specifications, others support them but with reduced efficiency. Throw specifications may be added at a later date as compilers begin to handle this better. The library should throw only three types of exception: boost::bad_expression can be thrown by reg_expression when compiling a regular expression; boost::bad_pattern can be thrown by the class sub_match's conversion operators; finally std::bad_alloc can be thrown by just about any of the functions in this library. </P>
+
-<P><HR></P>
+<p>as the expression.</p>
-<I><P>Copyright </I><A HREF="mailto:John_Maddock@compuserve.com"><I>Dr John Maddock</I></A><I> 1998-2000 all rights reserved.</I> </P></BODY>
+
-</HTML>
+<p><font color="#FF0000">Q. Configure says that my compiler is
+unable to merge template instances, what does this mean?</font> </p>
+
+<p>A. When you compile template code, you can end up with the
+same template instances in multiple translation units - this will
+lead to link time errors unless your compiler/linker is smart
+enough to merge these template instances into a single record in
+the executable file. If you see this warning after running
+configure, then you can still link to libregex++.a if: </p>
+
+<ol>
+    <li>You use only the low-level template classes (reg_expression&lt;&gt;
+        match_results&lt;&gt; etc), from a single translation
+        unit, and use no other part of regex++.</li>
+    <li>You use only the POSIX API functions (regcomp regexec etc),
+        and no other part of regex++.</li>
+    <li>You use only the high level class RegEx, and no other
+        part of regex++. </li>
+</ol>
+
+<p>Another option is to create a master include file, which
+#include's all the regex++ source files, and all the source files
+in which you use regex++. You then compile and link this master
+file as a single translation unit. </p>
+
+<p><font color="#FF0000">Q. Configure says that my compiler is
+unable to merge template instances from archive files, what does
+this mean?</font> </p>
+
+<p>A. When you compile template code, you can end up with the
+same template instances in multiple translation units - this will
+lead to link time errors unless your compiler/linker is smart
+enough to merge these template instances into a single record in
+the executable file. Some compilers are able to do this for
+normal .cpp or .o files, but fail if the object file has been
+placed in a library archive. If you see this warning after
+running configure, then you can still link to libregex++.a if: </p>
+
+<ol>
+    <li>You use only the low-level template classes (reg_expression&lt;&gt;
+        match_results&lt;&gt; etc), and use no other part of
+        regex++.</li>
+    <li>You use only the POSIX API functions (regcomp regexec etc),
+        and no other part of regex++.</li>
+    <li>You use only the high level class RegEx, and no other
+        part of regex++. </li>
+</ol>
+
+<p>Another option is to add the regex++ source files directly to
+your project instead of linking to libregex++.a, generally you
+should do this only if you are getting link time errors with
+libregex++.a. </p>
+
+<p><font color="#FF0000">Q. Configure says that my compiler can't
+merge templates containing switch statements, what does this
+mean?</font> </p>
+
+<p>A. Some compilers can't merge templates that contain static
+data - this includes switch statements which implicitly generate
+static data as well as code. Principally this affects the egcs
+compiler - but note gcc 2.81 also suffers from this problem - the
+compiler will compile and link the code - but the code will not
+run because the code and the static data it uses have become
+separated. The default behaviour of regex++ is to try and fix
+this problem by declaring &quot;problem&quot; templates inside
+unnamed namespaces, so that the templates have internal linkage.
+Note that this can result in a great deal of code bloat. If the
+compiler doesn't support namespaces, or if code bloat becomes a
+problem, then follow the guidelines above for placing all the
+templates used in a single translation unit, and edit boost/regex/config.hpp
+so that BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE is no longer defined.
+</p>
+
+<p><font color="#FF0000">Q. I can't get regex++ to work with
+escape characters, what's going on?</font> </p>
+
+<p>A. If you embed regular expressions in C++ code, then remember
+that escape characters are processed twice: once by the C++
+compiler, and once by the regex++ expression compiler, so to pass
+the regular expression \d+ to regex++, you need to embed &quot;\\d+&quot;
+in your code. Likewise to match a literal backslash you will need
+to embed &quot;\\\\&quot; in your code. </p>
+
+<p><font color="#FF0000">Q. Why don't character ranges work
+properly?</font> <br>
+A. The POSIX standard specifies that character range expressions
+are locale sensitive - so for example the expression [A-Z] will
+match any collating element that collates between 'A' and 'Z'.
+That means that for most locales other than &quot;C&quot; or
+&quot;POSIX&quot;, [A-Z] would match the single character 't' for
+example, which is not what most people expect - or at least not
+what most people have come to expect from regular expression
+engines. For this reason, the default behaviour of regex++ is to
+turn locale sensitive collation off by setting the regbase::nocollate
+compile time flag (this is set by regbase::normal). However if
+you set a non-default compile time flag - for example regbase::extended
+or regbase::basic, then locale dependent collation will be
+enabled, this also applies to the POSIX API functions which use
+either regbase::extended or regbase::basic internally, in the
+latter case use REG_NOCOLLATE in combination with either
+REG_BASIC or REG_EXTENDED when invoking regcomp if you don't want
+locale sensitive collation. <i>[Note - when regbase::nocollate in
+effect, the library behaves &quot;as if&quot; the LC_COLLATE
+locale category were always &quot;C&quot;, regardless of what its
+actually set to - end note</i>]. </p>
+
+<p><font color="#FF0000">&nbsp;Q. Why can't I use the &quot;convenience&quot;
+versions of query_match/reg_search/reg_grep/reg_format/reg_merge?</font>
+</p>
+
+<p>A. These versions may or may not be available depending upon
+the capabilities of your compiler, the rules determining the
+format of these functions are quite complex - and only the
+versions visible to a standard compliant compiler are given in
+the help. To find out what your compiler supports, run &lt;boost/regex.hpp&gt;
+through your C++ pre-processor, and search the output file for
+the function that you are interested in. </p>
+
+<p><font color="#FF0000">Q. Why are there no throw specifications
+on any of the functions? What exceptions can the library throw?</font>
+</p>
+
+<p>A. Not all compilers support (or honor) throw specifications,
+others support them but with reduced efficiency. Throw
+specifications may be added at a later date as compilers begin to
+handle this better. The library should throw only three types of
+exception: boost::bad_expression can be thrown by reg_expression
+when compiling a regular expression; boost::bad_pattern can be
+thrown by the class sub_match's conversion operators; finally std::bad_alloc
+can be thrown by just about any of the functions in this library.
+</p>
+
+<hr>
+
+<p><i>Copyright </i><a href="mailto:John_Maddock@compuserve.com"><i>Dr
+John Maddock</i></a><i> 1998-2000 all rights reserved.</i> </p>
+</body>
+</html>

include/boost/cregex.hpp

@@ -24,7 +24,7 @@
 #ifndef BOOST_RE_CREGEX_HPP
 #define BOOST_RE_CREGEX_HPP
 
-#include <boost/regex/detail/regex_config.hpp>
+#include <boost/regex/config.hpp>
 
 #ifdef __BORLANDC__
    #pragma option push -a4 -b -Ve -pc
@@ -47,7 +47,7 @@ typedef struct
    unsigned int eflags;       /* none of your business :-) */
 } regex_tA;
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 typedef struct
 {
    unsigned int re_magic;
@@ -96,16 +96,16 @@ typedef enum{
    REG_STARTEND =  00004
 } reg_exec_flags;
 
-BOOST_RE_IX_DECL int BOOST_RE_CCALL regcompA(regex_tA*, const char*, int);
+BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompA(regex_tA*, const char*, int);
-BOOST_RE_IX_DECL unsigned int BOOST_RE_CCALL regerrorA(int, const regex_tA*, char*, unsigned int);
+BOOST_REGEX_DECL unsigned int BOOST_REGEX_CCALL regerrorA(int, const regex_tA*, char*, unsigned int);
-BOOST_RE_IX_DECL int BOOST_RE_CCALL regexecA(const regex_tA*, const char*, unsigned int, regmatch_t*, int);
+BOOST_REGEX_DECL int BOOST_REGEX_CCALL regexecA(const regex_tA*, const char*, unsigned int, regmatch_t*, int);
-BOOST_RE_IX_DECL void BOOST_RE_CCALL regfreeA(regex_tA*);
+BOOST_REGEX_DECL void BOOST_REGEX_CCALL regfreeA(regex_tA*);
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
-BOOST_RE_IX_DECL int BOOST_RE_CCALL regcompW(regex_tW*, const wchar_t*, int);
+BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompW(regex_tW*, const wchar_t*, int);
-BOOST_RE_IX_DECL unsigned int BOOST_RE_CCALL regerrorW(int, const regex_tW*, wchar_t*, unsigned int);
+BOOST_REGEX_DECL unsigned int BOOST_REGEX_CCALL regerrorW(int, const regex_tW*, wchar_t*, unsigned int);
-BOOST_RE_IX_DECL int BOOST_RE_CCALL regexecW(const regex_tW*, const wchar_t*, unsigned int, regmatch_t*, int);
+BOOST_REGEX_DECL int BOOST_REGEX_CCALL regexecW(const regex_tW*, const wchar_t*, unsigned int, regmatch_t*, int);
-BOOST_RE_IX_DECL void BOOST_RE_CCALL regfreeW(regex_tW*);
+BOOST_REGEX_DECL void BOOST_REGEX_CCALL regfreeW(regex_tW*);
 #endif
 
 #ifdef UNICODE
@@ -191,7 +191,7 @@ enum match_flags
 //
 // C++ high level wrapper goes here:
 //
-#if defined(__cplusplus) && !defined(BOOST_RE_NO_STRING_H)
+#if defined(__cplusplus)
 #include <string>
 #include <vector>
 namespace boost{
@@ -226,7 +226,7 @@ typedef bool (*GrepFileCallback)(const char* file, const RegEx& expression);
 typedef bool (*FindFilesCallback)(const char* file);
 #endif
 
-class BOOST_RE_IX_DECL RegEx
+class BOOST_REGEX_DECL RegEx
 {
 private:
    re_detail::RegExData* pdata;

include/boost/regex.h

@@ -65,7 +65,7 @@ using boost::regerrorA;
 using boost::regexecA;
 using boost::regfreeA;
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 using boost::regcompW;
 using boost::regerrorW;
 using boost::regexecW;

include/boost/regex.hpp

@@ -34,15 +34,12 @@
 
 // what follows is all C++ don't include in C builds!!
 
-#ifdef BOOST_RE_DEBUG
+#ifdef BOOST_REGEX_DEBUG
 # include <iosfwd>
 #endif
 
 #include <new>
-#include <boost/regex/detail/regex_config.hpp>
+#include <boost/regex/config.hpp>
-#if !defined(BOOST_RE_NO_TYPEINFO)
-#include <typeinfo>
-#endif
 #include <cstring>
 #include <boost/regex/detail/regex_stack.hpp>
 #include <boost/regex/detail/regex_raw_buffer.hpp>
@@ -81,13 +78,13 @@ public:
    typedef unsigned int size_type;
    typedef regex_traits<char> base_type;
 
-   char BOOST_RE_CALL translate(char c, bool)const
+   char BOOST_REGEX_CALL translate(char c, bool)const
    {
       return static_cast<const regex_traits<char>*>(this)->translate(c, true);
    }
 };
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 template<>
 class char_regex_traits_i<wchar_t> : public regex_traits<wchar_t>
 {
@@ -97,11 +94,11 @@ public:
    typedef unsigned int size_type;
    typedef regex_traits<wchar_t> base_type;
 
-   wchar_t BOOST_RE_CALL translate(wchar_t c, bool)const
+   wchar_t BOOST_REGEX_CALL translate(wchar_t c, bool)const
    {
       return static_cast<const regex_traits<wchar_t>*>(this)->translate(c, true);
    }
-   boost::uint_fast32_t BOOST_RE_CALL lookup_classname(const wchar_t* first, const wchar_t* last)const
+   boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const wchar_t* first, const wchar_t* last)const
    {
       boost::uint_fast32_t result = static_cast<const regex_traits<wchar_t>*>(this)->lookup_classname(first, last);
       if((result & base_type::char_class_upper) == base_type::char_class_upper)
@@ -193,7 +190,7 @@ enum syntax_element_type
    syntax_element_restart_continue = syntax_element_soft_buffer_end + 1
 };
 
-#ifdef BOOST_RE_DEBUG
+#ifdef BOOST_REGEX_DEBUG
 // dwa 09/26/00 - This is needed to suppress warnings about an ambiguous conversion
 std::ostream& operator<<(std::ostream&, syntax_element_type);
 #endif
@@ -290,7 +287,7 @@ enum re_jump_size_type
 // class basic_regex
 // handles error codes and flags
 
-class BOOST_RE_IX_DECL regbase
+class BOOST_REGEX_DECL regbase
 {
 public:
    enum flag_type_
@@ -335,7 +332,7 @@ public:
       restart_fixed_lit = 6
    };
 
-   flag_type BOOST_RE_CALL flags()const
+   flag_type BOOST_REGEX_CALL flags()const
    {
       return _flags;
    }
@@ -359,7 +356,7 @@ struct regex_iterator_traits
 {
   typedef typename T::iterator_category iterator_category;
   typedef typename T::value_type        value_type;
-#ifndef BOOST_MSVC
+#if !defined(BOOST_NO_STD_ITERATOR)
   typedef typename T::difference_type   difference_type;
   typedef typename T::pointer           pointer;
   typedef typename T::reference         reference;
@@ -403,7 +400,7 @@ template<>
 struct regex_iterator_traits<std::string::iterator> : pointer_iterator_traits<char>{};
 template<>
 struct regex_iterator_traits<std::string::const_iterator> : const_pointer_iterator_traits<char>{};
-#ifndef BOOST_NO_WSTRING
+#ifndef BOOST_NO_STD_WSTRING
 template<>
 struct regex_iterator_traits<std::wstring::iterator> : pointer_iterator_traits<wchar_t>{};
 template<>
@@ -437,7 +434,7 @@ struct def_alloc_param_traits<const wchar_t*>
 
 }
 
-template <class iterator, class Allocator BOOST_RE_DEF_ALLOC_PARAM(typename re_detail::def_alloc_param_traits<iterator>::type) >
+template <class iterator, class Allocator = BOOST_DEFAULT_ALLOCATOR(re_detail::def_alloc_param_traits<iterator>::type) >
 class match_results;
 
 //
@@ -446,7 +443,7 @@ class match_results;
 // regular expression:
 //
 
-#if defined(BOOST_RE_NO_TEMPLATE_SWITCH_MERGE) && !defined(BOOST_RE_NO_NAMESPACES)
+#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
 //
 // Ugly ugly hack, 
 // template don't merge if they contain switch statements so declare these
@@ -455,7 +452,7 @@ class match_results;
 namespace{
 #endif
 
-template <class charT, class traits BOOST_RE_TRICKY_DEFAULT_PARAM(regex_traits<charT>), class Allocator BOOST_RE_DEF_ALLOC_PARAM(charT) >
+template <class charT, class traits = regex_traits<charT>, class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) >
 class reg_expression : public regbase
 {
    typedef typename traits::size_type traits_size_type;
@@ -495,8 +492,8 @@ public:
    reg_expression(const charT* p, size_type len, flag_type f, const Allocator& a = Allocator());
    reg_expression(const reg_expression&);
    ~reg_expression();
-   reg_expression& BOOST_RE_CALL operator=(const reg_expression&);
+   reg_expression& BOOST_REGEX_CALL operator=(const reg_expression&);
-   reg_expression& BOOST_RE_CALL operator=(const charT* ptr)
+   reg_expression& BOOST_REGEX_CALL operator=(const charT* ptr)
    {
       set_expression(ptr, regbase::normal | regbase::use_except);
       return *this;
@@ -522,7 +519,7 @@ public:
 #ifndef BOOST_NO_MEMBER_TEMPLATES
 
    template <class ST, class SA>
-   unsigned int BOOST_RE_CALL set_expression(const std::basic_string<charT, ST, SA>& p, flag_type f = regbase::normal)
+   unsigned int BOOST_REGEX_CALL set_expression(const std::basic_string<charT, ST, SA>& p, flag_type f = regbase::normal)
    { return set_expression(p.data(), p.data() + p.size(), f); }
 
    template <class ST, class SA>
@@ -540,14 +537,14 @@ public:
    }
 
    template <class ST, class SA>
-   reg_expression& BOOST_RE_CALL operator=(const std::basic_string<charT, ST, SA>& p)
+   reg_expression& BOOST_REGEX_CALL operator=(const std::basic_string<charT, ST, SA>& p)
    {
       set_expression(p.c_str(), p.c_str() + p.size(), regbase::normal | regbase::use_except);
       return *this;
    }
 
    template <class string_traits, class A>
-   reg_expression& BOOST_RE_CALL assign(
+   reg_expression& BOOST_REGEX_CALL assign(
        const std::basic_string<charT, string_traits, A>& s,
        flag_type f = regbase::normal)
    {
@@ -556,7 +553,7 @@ public:
    }
 
    template <class fwd_iterator>
-   reg_expression& BOOST_RE_CALL assign(fwd_iterator first,
+   reg_expression& BOOST_REGEX_CALL assign(fwd_iterator first,
                           fwd_iterator last,
                           flag_type f = regbase::normal)
    {
@@ -566,20 +563,20 @@ public:
       set_expression(a.get(), a.get() + len, f | regbase::use_except);
       return *this;
    }
-#elif !defined(BOOST_RE_NO_STRING_DEF_ARGS)
+#else
-   unsigned int BOOST_RE_CALL set_expression(const std::basic_string<charT>& p, flag_type f = regbase::normal)
+   unsigned int BOOST_REGEX_CALL set_expression(const std::basic_string<charT>& p, flag_type f = regbase::normal)
    { return set_expression(p.data(), p.data() + p.size(), f | regbase::use_except); }
 
    reg_expression(const std::basic_string<charT>& p, flag_type f = regbase::normal, const Allocator& a = Allocator())
     : data(a), pkmp(0) { set_expression(p, f | regbase::use_except); }
 
-   reg_expression& BOOST_RE_CALL operator=(const std::basic_string<charT>& p)
+   reg_expression& BOOST_REGEX_CALL operator=(const std::basic_string<charT>& p)
    {
       set_expression(p.c_str(), p.c_str() + p.size(), regbase::normal | regbase::use_except);
       return *this;
    }
 
-   reg_expression& BOOST_RE_CALL assign(
+   reg_expression& BOOST_REGEX_CALL assign(
        const std::basic_string<charT>& s,
        flag_type f = regbase::normal)
    {
@@ -592,18 +589,18 @@ public:
 
    //
    // allocator access:
-   Allocator BOOST_RE_CALL get_allocator()const;
+   Allocator BOOST_REGEX_CALL get_allocator()const;
    //
    // locale:
-   locale_type BOOST_RE_CALL imbue(locale_type l){ return traits_inst.imbue(l); }
+   locale_type BOOST_REGEX_CALL imbue(locale_type l){ return traits_inst.imbue(l); }
-   locale_type BOOST_RE_CALL getloc()const{ return traits_inst.getloc(); }
+   locale_type BOOST_REGEX_CALL getloc()const{ return traits_inst.getloc(); }
    //
    // flags:
-   flag_type BOOST_RE_CALL getflags()const
+   flag_type BOOST_REGEX_CALL getflags()const
    { return flags(); }
    //
    // str:
-   std::basic_string<charT> BOOST_RE_CALL str()const
+   std::basic_string<charT> BOOST_REGEX_CALL str()const
    {
       std::basic_string<charT> result;
       if(this->error_code() == 0)
@@ -612,45 +609,46 @@ public:
    }
    //
    // begin, end:
-   const_iterator BOOST_RE_CALL begin()const
+   const_iterator BOOST_REGEX_CALL begin()const
    { return (this->error_code() ? 0 : _expression); }
-   const_iterator BOOST_RE_CALL end()const
+   const_iterator BOOST_REGEX_CALL end()const
    { return (this->error_code() ? 0 : _expression + _expression_len); }
    //
    // swap:
-   void BOOST_RE_CALL swap(reg_expression&)throw();
+   void BOOST_REGEX_CALL swap(reg_expression&)throw();
    //
    // size:
-   size_type BOOST_RE_CALL size()const
+   size_type BOOST_REGEX_CALL size()const
    { return (this->error_code() ? 0 : _expression_len); }
    //
    // max_size:
-   size_type BOOST_RE_CALL max_size()const
+   size_type BOOST_REGEX_CALL max_size()const
    { return UINT_MAX; }
    //
    // empty:
-   bool BOOST_RE_CALL empty()const
+   bool BOOST_REGEX_CALL empty()const
-   { return this->error_code(); }
+   { return 0 != this->error_code(); }
 
-   unsigned BOOST_RE_CALL mark_count()const { return (this->error_code() ? 0 : marks); }
+   unsigned BOOST_REGEX_CALL mark_count()const { return (this->error_code() ? 0 : marks); }
-   bool BOOST_RE_CALL operator==(const reg_expression&)const;
+   bool BOOST_REGEX_CALL operator==(const reg_expression&)const;
-   bool BOOST_RE_CALL operator<(const reg_expression&)const;
+   bool BOOST_REGEX_CALL operator<(const reg_expression&)const;
    //
    // The following are deprecated as public interfaces
    // but are available for compatibility with earlier versions.
-   allocator_type BOOST_RE_CALL allocator()const;
+   allocator_type BOOST_REGEX_CALL allocator()const;
-   const charT* BOOST_RE_CALL expression()const { return (this->error_code() ? 0 : _expression); }
+   const charT* BOOST_REGEX_CALL expression()const { return (this->error_code() ? 0 : _expression); }
-   unsigned int BOOST_RE_CALL set_expression(const charT* p, const charT* end, flag_type f = regbase::normal);
+   unsigned int BOOST_REGEX_CALL set_expression(const charT* p, const charT* end, flag_type f = regbase::normal);
-   unsigned int BOOST_RE_CALL set_expression(const charT* p, flag_type f = regbase::normal) { return set_expression(p, p + traits_type::length(p), f); }
+   unsigned int BOOST_REGEX_CALL set_expression(const charT* p, flag_type f = regbase::normal) { return set_expression(p, p + traits_type::length(p), f); }
    //
    // this should be private but template friends don't work:
    const traits_type& get_traits()const { return traits_inst; }
-   unsigned int BOOST_RE_CALL error_code()const
+   unsigned int BOOST_REGEX_CALL error_code()const
    {
       return error_code_;
    }
 
 private:
+   traits_type traits_inst;
    re_detail::raw_storage<Allocator> data;
    unsigned _restart_type;
    unsigned marks;
@@ -663,48 +661,47 @@ private:
    re_detail::kmp_info<charT>* pkmp;
    unsigned error_code_;
    charT* _expression;
-   traits_type traits_inst;
 
-   void BOOST_RE_CALL compile_maps();
+   void BOOST_REGEX_CALL compile_maps();
-   void BOOST_RE_CALL compile_map(re_detail::re_syntax_base* node, unsigned char* _map, unsigned int* pnull, unsigned char mask, re_detail::re_syntax_base* terminal = 0)const;
+   void BOOST_REGEX_CALL compile_map(re_detail::re_syntax_base* node, unsigned char* _map, unsigned int* pnull, unsigned char mask, re_detail::re_syntax_base* terminal = 0)const;
-   bool BOOST_RE_CALL probe_start(re_detail::re_syntax_base* node, charT c, re_detail::re_syntax_base* terminal)const;
+   bool BOOST_REGEX_CALL probe_start(re_detail::re_syntax_base* node, charT c, re_detail::re_syntax_base* terminal)const;
-   bool BOOST_RE_CALL probe_start_null(re_detail::re_syntax_base* node, re_detail::re_syntax_base* terminal)const;
+   bool BOOST_REGEX_CALL probe_start_null(re_detail::re_syntax_base* node, re_detail::re_syntax_base* terminal)const;
-   void BOOST_RE_CALL fixup_apply(re_detail::re_syntax_base* b, unsigned cbraces);
+   void BOOST_REGEX_CALL fixup_apply(re_detail::re_syntax_base* b, unsigned cbraces);
-   void BOOST_RE_CALL move_offsets(re_detail::re_syntax_base* j, unsigned size);
+   void BOOST_REGEX_CALL move_offsets(re_detail::re_syntax_base* j, unsigned size);
-   re_detail::re_syntax_base* BOOST_RE_CALL compile_set(const charT*& first, const charT* last);
+   re_detail::re_syntax_base* BOOST_REGEX_CALL compile_set(const charT*& first, const charT* last);
-   re_detail::re_syntax_base* BOOST_RE_CALL compile_set_aux(re_detail::jstack<traits_string_type, Allocator>& singles, re_detail::jstack<traits_string_type, Allocator>& ranges, re_detail::jstack<boost::uint_fast32_t, Allocator>& classes, re_detail::jstack<traits_string_type, Allocator>& equivalents, bool isnot, const re_detail::_narrow_type&);
+   re_detail::re_syntax_base* BOOST_REGEX_CALL compile_set_aux(re_detail::jstack<traits_string_type, Allocator>& singles, re_detail::jstack<traits_string_type, Allocator>& ranges, re_detail::jstack<boost::uint_fast32_t, Allocator>& classes, re_detail::jstack<traits_string_type, Allocator>& equivalents, bool isnot, const re_detail::_narrow_type&);
-   re_detail::re_syntax_base* BOOST_RE_CALL compile_set_aux(re_detail::jstack<traits_string_type, Allocator>& singles, re_detail::jstack<traits_string_type, Allocator>& ranges, re_detail::jstack<boost::uint_fast32_t, Allocator>& classes, re_detail::jstack<traits_string_type, Allocator>& equivalents, bool isnot, const re_detail::_wide_type&);
+   re_detail::re_syntax_base* BOOST_REGEX_CALL compile_set_aux(re_detail::jstack<traits_string_type, Allocator>& singles, re_detail::jstack<traits_string_type, Allocator>& ranges, re_detail::jstack<boost::uint_fast32_t, Allocator>& classes, re_detail::jstack<traits_string_type, Allocator>& equivalents, bool isnot, const re_detail::_wide_type&);
-   re_detail::re_syntax_base* BOOST_RE_CALL compile_set_simple(re_detail::re_syntax_base* dat, unsigned long cls, bool isnot = false);
+   re_detail::re_syntax_base* BOOST_REGEX_CALL compile_set_simple(re_detail::re_syntax_base* dat, unsigned long cls, bool isnot = false);
-   unsigned int BOOST_RE_CALL parse_inner_set(const charT*& first, const charT* last);
+   unsigned int BOOST_REGEX_CALL parse_inner_set(const charT*& first, const charT* last);
 
-   re_detail::re_syntax_base* BOOST_RE_CALL add_simple(re_detail::re_syntax_base* dat, re_detail::syntax_element_type type, unsigned int size = sizeof(re_detail::re_syntax_base));
+   re_detail::re_syntax_base* BOOST_REGEX_CALL add_simple(re_detail::re_syntax_base* dat, re_detail::syntax_element_type type, unsigned int size = sizeof(re_detail::re_syntax_base));
-   re_detail::re_syntax_base* BOOST_RE_CALL add_literal(re_detail::re_syntax_base* dat, charT c);
+   re_detail::re_syntax_base* BOOST_REGEX_CALL add_literal(re_detail::re_syntax_base* dat, charT c);
-   charT BOOST_RE_CALL parse_escape(const charT*& first, const charT* last);
+   charT BOOST_REGEX_CALL parse_escape(const charT*& first, const charT* last);
-   void BOOST_RE_CALL parse_range(const charT*& first, const charT* last, unsigned& min, unsigned& max);
+   void BOOST_REGEX_CALL parse_range(const charT*& first, const charT* last, unsigned& min, unsigned& max);
-   bool BOOST_RE_CALL skip_space(const charT*& first, const charT* last);
+   bool BOOST_REGEX_CALL skip_space(const charT*& first, const charT* last);
-   unsigned int BOOST_RE_CALL probe_restart(re_detail::re_syntax_base* dat);
+   unsigned int BOOST_REGEX_CALL probe_restart(re_detail::re_syntax_base* dat);
-   unsigned int BOOST_RE_CALL fixup_leading_rep(re_detail::re_syntax_base* dat, re_detail::re_syntax_base* end);
+   unsigned int BOOST_REGEX_CALL fixup_leading_rep(re_detail::re_syntax_base* dat, re_detail::re_syntax_base* end);
-   void BOOST_RE_CALL fail(unsigned int err);
+   void BOOST_REGEX_CALL fail(unsigned int err);
 
 protected:
-   static int BOOST_RE_CALL repeat_count(const reg_expression& e)
+   static int BOOST_REGEX_CALL repeat_count(const reg_expression& e)
    { return e.repeats; }
-   static unsigned int BOOST_RE_CALL restart_type(const reg_expression& e)
+   static unsigned int BOOST_REGEX_CALL restart_type(const reg_expression& e)
    { return e._restart_type; }
-   static const re_detail::re_syntax_base* BOOST_RE_CALL first(const reg_expression& e)
+   static const re_detail::re_syntax_base* BOOST_REGEX_CALL first(const reg_expression& e)
    { return (const re_detail::re_syntax_base*)e.data.data(); }
-   static const unsigned char* BOOST_RE_CALL get_map(const reg_expression& e)
+   static const unsigned char* BOOST_REGEX_CALL get_map(const reg_expression& e)
    { return e.startmap; }
-   static unsigned int BOOST_RE_CALL leading_length(const reg_expression& e)
+   static unsigned int BOOST_REGEX_CALL leading_length(const reg_expression& e)
    { return e._leading_len; }
    static const re_detail::kmp_info<charT>* get_kmp(const reg_expression& e)
    { return e.pkmp; }
-   static bool BOOST_RE_CALL can_start(charT c, const unsigned char* _map, unsigned char mask, const re_detail::_wide_type&);
+   static bool BOOST_REGEX_CALL can_start(charT c, const unsigned char* _map, unsigned char mask, const re_detail::_wide_type&);
-   static bool BOOST_RE_CALL can_start(charT c, const unsigned char* _map, unsigned char mask, const re_detail::_narrow_type&);
+   static bool BOOST_REGEX_CALL can_start(charT c, const unsigned char* _map, unsigned char mask, const re_detail::_narrow_type&);
 };
 
 template <class charT, class traits, class Allocator>
-void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::swap(reg_expression& that)throw()
+void BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::swap(reg_expression& that)throw()
 {
    // this is not as efficient as it should be,
    // however swapping traits classes is problematic
@@ -715,7 +712,7 @@ void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::swap(reg_expression
 }
 
 
-#if defined(BOOST_RE_NO_TEMPLATE_SWITCH_MERGE) && !defined(BOOST_RE_NO_NAMESPACES)
+#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
 } // namespace
 #endif
 
@@ -773,10 +770,10 @@ struct sub_match
    {
       return (first == that.first) && (second == that.second) && (matched == that.matched);
    }
-   bool BOOST_RE_CALL operator !=(const sub_match& that)const
+   bool BOOST_REGEX_CALL operator !=(const sub_match& that)const
    { return !(*this == that); }
 
-   difference_type BOOST_RE_CALL length()const
+   difference_type BOOST_REGEX_CALL length()const
    {
       difference_type n = boost::re_detail::distance((iterator)first, (iterator)second);
       return n;
@@ -840,12 +837,12 @@ sub_match<iterator>::operator unsigned int()const
 
 namespace re_detail{
 
-template <class iterator, class Allocator BOOST_RE_DEF_ALLOC_PARAM(typename def_alloc_param_traits<iterator>::type) >
+template <class iterator, class Allocator = BOOST_DEFAULT_ALLOCATOR(typename def_alloc_param_traits<iterator>::type) >
 class match_results_base
 {
 public:
    typedef Allocator                                                 alloc_type;
-   typedef typename boost::re_detail::rebind_allocator<iterator, Allocator>::type  iterator_alloc;
+   typedef typename boost::detail::rebind_allocator<iterator, Allocator>::type  iterator_alloc;
    typedef typename iterator_alloc::size_type                        size_type;
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_STD_ITERATOR_TRAITS)
    typedef typename std::iterator_traits<iterator>::difference_type  difference_type;
@@ -858,7 +855,7 @@ public:
    typedef iterator                                                  iterator_type;
 
 protected:
-   typedef typename boost::re_detail::rebind_allocator<char, Allocator>::type c_alloc;
+   typedef typename boost::detail::rebind_allocator<char, Allocator>::type c_alloc;
    
    struct c_reference : public c_alloc
    {
@@ -884,11 +881,11 @@ protected:
 
    c_reference* ref;
 
-   void BOOST_RE_CALL cow();
+   void BOOST_REGEX_CALL cow();
 
    // protected contructor for derived class...
    match_results_base(bool){}
-   void BOOST_RE_CALL free();
+   void BOOST_REGEX_CALL free();
 
 public:
 
@@ -900,29 +897,29 @@ public:
       ++(ref->count);
    }
 
-   match_results_base& BOOST_RE_CALL operator=(const match_results_base& m);
+   match_results_base& BOOST_REGEX_CALL operator=(const match_results_base& m);
 
    ~match_results_base()
    {
       free();
    }
 
-   size_type BOOST_RE_CALL size()const
+   size_type BOOST_REGEX_CALL size()const
    {
       //return (*this)[0].matched ? ref->cmatches : 0;
       return ref->cmatches;
    }
 
-   const sub_match<iterator>& BOOST_RE_CALL operator[](int n) const
+   const sub_match<iterator>& BOOST_REGEX_CALL operator[](int n) const
    {
       if((n >= 0) && ((unsigned int)n < ref->cmatches))
          return *(sub_match<iterator>*)((char*)ref + sizeof(c_reference) + sizeof(sub_match<iterator>)*n);
       return (n == -1) ? ref->head : (n == -2) ? ref->tail : ref->null;
    }
 
-   Allocator BOOST_RE_CALL allocator()const;
+   Allocator BOOST_REGEX_CALL allocator()const;
 
-   difference_type BOOST_RE_CALL length(unsigned int sub = 0)const
+   difference_type BOOST_REGEX_CALL length(unsigned int sub = 0)const
    {
       jm_assert(ref->cmatches);
       const sub_match<iterator>& m = (*this)[sub];
@@ -937,12 +934,12 @@ public:
       return static_cast<std::basic_string<char_type> >((*this)[i]);
    }
 
-   unsigned int BOOST_RE_CALL line()const
+   unsigned int BOOST_REGEX_CALL line()const
    {
       return ref->lines;
    }
 
-   difference_type BOOST_RE_CALL position(unsigned int sub = 0)const
+   difference_type BOOST_REGEX_CALL position(unsigned int sub = 0)const
    {
       jm_assert(ref->cmatches);
       const sub_match<iterator>& s = (*this)[sub];
@@ -952,7 +949,7 @@ public:
       return n;
    }
 
-   iterator BOOST_RE_CALL line_start()const
+   iterator BOOST_REGEX_CALL line_start()const
    {
       return ref->line_pos;
    }
@@ -970,15 +967,15 @@ public:
 
    friend class match_results<iterator, Allocator>;
 
-   void BOOST_RE_CALL set_size(size_type n);
+   void BOOST_REGEX_CALL set_size(size_type n);
-   void BOOST_RE_CALL set_size(size_type n, iterator i, iterator j);
+   void BOOST_REGEX_CALL set_size(size_type n, iterator i, iterator j);
-   void BOOST_RE_CALL maybe_assign(const match_results_base& m);
+   void BOOST_REGEX_CALL maybe_assign(const match_results_base& m);
-   void BOOST_RE_CALL init_fail(iterator i, iterator j);
+   void BOOST_REGEX_CALL init_fail(iterator i, iterator j);
 
-   void BOOST_RE_CALL set_first(iterator i);
+   void BOOST_REGEX_CALL set_first(iterator i);
-   void BOOST_RE_CALL set_first(iterator i, std::size_t pos);
+   void BOOST_REGEX_CALL set_first(iterator i, std::size_t pos);
 
-   void BOOST_RE_CALL set_second(iterator i)
+   void BOOST_REGEX_CALL set_second(iterator i)
    {
       cow();
       ((sub_match<iterator>*)(ref+1))->second = i;
@@ -987,7 +984,7 @@ public:
       ref->tail.matched = (ref->tail.first == ref->tail.second) ? false : true;
    }
 
-   void BOOST_RE_CALL set_second(iterator i, std::size_t pos, bool m = true)
+   void BOOST_REGEX_CALL set_second(iterator i, std::size_t pos, bool m = true)
    {
       cow();
       ((sub_match<iterator>*)((char*)ref + sizeof(c_reference) + sizeof(sub_match<iterator>) * pos))->second = i;
@@ -999,20 +996,20 @@ public:
       }
    }
 
-   void BOOST_RE_CALL set_line(unsigned int i, iterator pos)
+   void BOOST_REGEX_CALL set_line(unsigned int i, iterator pos)
    {
       ref->lines = i;
       ref->line_pos = pos;
    }
 
-   void BOOST_RE_CALL set_base(iterator pos)
+   void BOOST_REGEX_CALL set_base(iterator pos)
    {
       ref->base = pos;
    }
 };
 
 template <class iterator, class Allocator>
-void BOOST_RE_CALL match_results_base<iterator, Allocator>::set_first(iterator i)
+void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::set_first(iterator i)
 {
    cow();
    ref->head.second = i;
@@ -1032,7 +1029,7 @@ void BOOST_RE_CALL match_results_base<iterator, Allocator>::set_first(iterator i
 }
 
 template <class iterator, class Allocator>
-void BOOST_RE_CALL match_results_base<iterator, Allocator>::set_first(iterator i, std::size_t pos)
+void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::set_first(iterator i, std::size_t pos)
 {
    cow();
    ((sub_match<iterator>*)((char*)ref + sizeof(c_reference) + sizeof(sub_match<iterator>) * pos))->first = i;
@@ -1072,7 +1069,7 @@ match_results_base<iterator, Allocator>::match_results_base(const Allocator& a)
       }
       catch(...)
       { 
-         jm_destroy(ref); 
+         ::boost::re_detail::destroy(ref); 
          throw; 
       }
    }
@@ -1084,13 +1081,13 @@ match_results_base<iterator, Allocator>::match_results_base(const Allocator& a)
 }
 
 template <class iterator, class Allocator>
-Allocator BOOST_RE_CALL match_results_base<iterator, Allocator>::allocator()const
+Allocator BOOST_REGEX_CALL match_results_base<iterator, Allocator>::allocator()const
 {
   return *((c_alloc*)ref);
 }
 
 template <class iterator, class Allocator>
-inline match_results_base<iterator, Allocator>& BOOST_RE_CALL match_results_base<iterator, Allocator>::operator=(const match_results_base<iterator, Allocator>& m)
+inline match_results_base<iterator, Allocator>& BOOST_REGEX_CALL match_results_base<iterator, Allocator>::operator=(const match_results_base<iterator, Allocator>& m)
 {
    if(ref != m.ref)
    {
@@ -1103,7 +1100,7 @@ inline match_results_base<iterator, Allocator>& BOOST_RE_CALL match_results_base
 
 
 template <class iterator, class Allocator>
-void BOOST_RE_CALL match_results_base<iterator, Allocator>::free()
+void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::free()
 {
    if(--(ref->count) == 0)
    {
@@ -1113,10 +1110,10 @@ void BOOST_RE_CALL match_results_base<iterator, Allocator>::free()
       p2 = p1 + ref->cmatches;
       while(p1 != p2)
       {
-         jm_destroy(p1);
+         ::boost::re_detail::destroy(p1);
          ++p1;
       }
-      jm_destroy(ref);
+      ::boost::re_detail::destroy(ref);
       a.deallocate((char*)(void*)ref, sizeof(sub_match<iterator>) * ref->cmatches + sizeof(c_reference));
    }
 }
@@ -1140,7 +1137,7 @@ bool match_results_base<iterator, Allocator>::operator==(const match_results_bas
 }
 
 template <class iterator, class Allocator>
-void BOOST_RE_CALL match_results_base<iterator, Allocator>::set_size(size_type n)
+void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::set_size(size_type n)
 {
    if(ref->cmatches != n)
    {
@@ -1167,10 +1164,10 @@ void BOOST_RE_CALL match_results_base<iterator, Allocator>::set_size(size_type n
             p2 = (sub_match<iterator>*)(newref+1);
             while(p2 != p1)
             {
-               jm_destroy(p2);
+               ::boost::re_detail::destroy(p2);
                ++p2;
             }
-            jm_destroy(ref);
+            ::boost::re_detail::destroy(ref);
             throw; 
          }
          ref = newref;
@@ -1184,7 +1181,7 @@ void BOOST_RE_CALL match_results_base<iterator, Allocator>::set_size(size_type n
 }
 
 template <class iterator, class Allocator>
-void BOOST_RE_CALL match_results_base<iterator, Allocator>::set_size(size_type n, iterator i, iterator j)
+void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::set_size(size_type n, iterator i, iterator j)
 {
    if(ref->cmatches != n)
    {
@@ -1209,10 +1206,10 @@ void BOOST_RE_CALL match_results_base<iterator, Allocator>::set_size(size_type n
             p2 = (sub_match<iterator>*)(newref+1);
             while(p2 != p1)
             {
-               jm_destroy(p2);
+               ::boost::re_detail::destroy(p2);
                ++p2;
             }
-            jm_destroy(ref);
+            ::boost::re_detail::destroy(ref);
             throw; 
          }
          ref = newref;
@@ -1246,13 +1243,13 @@ void BOOST_RE_CALL match_results_base<iterator, Allocator>::set_size(size_type n
 }
 
 template <class iterator, class Allocator>
-inline void BOOST_RE_CALL match_results_base<iterator, Allocator>::init_fail(iterator i, iterator j)
+inline void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::init_fail(iterator i, iterator j)
 {
    set_size(ref->cmatches, i, j);
 }
 
 template <class iterator, class Allocator>
-void BOOST_RE_CALL match_results_base<iterator, Allocator>::maybe_assign(const match_results_base<iterator, Allocator>& m)
+void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::maybe_assign(const match_results_base<iterator, Allocator>& m)
 {
    sub_match<iterator>* p1, *p2;
    p1 = (sub_match<iterator>*)(ref+1);
@@ -1290,7 +1287,7 @@ void BOOST_RE_CALL match_results_base<iterator, Allocator>::maybe_assign(const m
 }
 
 template <class iterator, class Allocator>
-void BOOST_RE_CALL match_results_base<iterator, Allocator>::cow()
+void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::cow()
 {
    if(ref->count > 1)
    {
@@ -1314,10 +1311,10 @@ void BOOST_RE_CALL match_results_base<iterator, Allocator>::cow()
             p2 = (sub_match<iterator>*)(newref+1);
             while(p2 != p1)
             {
-               jm_destroy(p2);
+               ::boost::re_detail::destroy(p2);
                ++p2;
             }
-            jm_destroy(ref);
+            ::boost::re_detail::destroy(ref);
             throw; 
          }
       --(ref->count);
@@ -1434,10 +1431,10 @@ match_results<iterator, Allocator>::match_results(const match_results<iterator,
          p2 = (sub_match<iterator>*)(this->ref+1);
          while(p2 != p1)
          {
-            re_detail::jm_destroy(p2);
+            re_detail::destroy(p2);
             ++p2;
          }
-         re_detail::jm_destroy(this->ref);
+         re_detail::destroy(this->ref);
          throw; 
       }
    }
@@ -1458,7 +1455,7 @@ match_results<iterator, Allocator>& match_results<iterator, Allocator>::operator
 
 namespace re_detail{
 template <class iterator, class charT, class traits_type, class Allocator>
-iterator BOOST_RE_CALL re_is_set_member(iterator next, 
+iterator BOOST_REGEX_CALL re_is_set_member(iterator next, 
                           iterator last, 
                           re_set_long* set_, 
                           const reg_expression<charT, traits_type, Allocator>& e);
@@ -1474,14 +1471,16 @@ iterator BOOST_RE_CALL re_is_set_member(iterator next,
 
 namespace boost{
 
-typedef reg_expression<char, regex_traits<char>, BOOST_RE_DEF_ALLOC(char)> regex;
+typedef reg_expression<char, regex_traits<char>, BOOST_DEFAULT_ALLOCATOR(char)> regex;
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
-typedef reg_expression<wchar_t, regex_traits<wchar_t>, BOOST_RE_DEF_ALLOC(wchar_t)> wregex;
+typedef reg_expression<wchar_t, regex_traits<wchar_t>, BOOST_DEFAULT_ALLOCATOR(wchar_t)> wregex;
 #endif
 
 typedef match_results<const char*> cmatch;
-#ifndef BOOST_RE_NO_WCSTRING
+typedef match_results<std::string::const_iterator> smatch;
+#ifndef BOOST_NO_WREGEX
 typedef match_results<const wchar_t*> wcmatch;
+typedef match_results<std::wstring::const_iterator> wsmatch;
 #endif
 
 } // namespace boost

include/boost/regex/config.hpp

@@ -0,0 +1,505 @@
+
+#ifndef BOOST_REGEX_CONFIG_HPP
+#define BOOST_REGEX_CONFIG_HPP
+
+/*****************************************************************************
+ *
+ *  Include all the headers we need here:
+ *
+ ****************************************************************************/
+
+#ifdef __cplusplus
+
+#  ifndef BOOST_REGEX_USER_CONFIG
+#     define BOOST_REGEX_USER_CONFIG <boost/regex/user.hpp>
+#  endif
+
+#  include BOOST_REGEX_USER_CONFIG
+
+#  include <cstdlib>
+#  include <cstddef>
+#  include <cstring>
+#  include <cctype>
+#  include <cstdio>
+#  include <clocale>
+#  include <cassert>
+#  include <string>
+#  include <stdexcept>
+#  include <iterator>
+#  include <boost/config.hpp>
+#  include <boost/smart_ptr.hpp>
+#  include <boost/cstdint.hpp>
+#  include <boost/detail/allocator.hpp>
+#else
+   //
+   // C build,
+   // don't include <boost/config.hpp> because that may
+   // do C++ specific things in future...
+   //
+#  include <stdlib.h>
+#  ifdef _MSC_VER
+#     define BOOST_MSVC _MSC_VER
+#  endif
+#endif
+
+/*****************************************************************************
+ *
+ *  Boilerplate regex config options:
+ *
+ ****************************************************************************/
+
+/* Obsolete macro, use BOOST_VERSION instead: */
+#define BOOST_RE_VERSION 320
+
+// fix:
+#if defined(_UNICODE) && !defined(UNICODE)
+#define UNICODE
+#endif
+
+//
+// If there isn't good enough wide character support then there will
+// be no wide character regular expressions:
+//
+#if defined(BOOST_NO_CWCHAR) || defined(BOOST_NO_CWCTYPE) || defined(BOOST_NO_STD_WSTRING)
+#  define BOOST_NO_WREGEX
+#else
+#  if defined(__sgi) && defined(__SGI_STL_PORT)
+      // STLPort on IRIX is misconfigured: <cwctype> does not compile
+      // as a temporary fix include <wctype.h> instead and prevent inclusion
+      // of STLPort version of <cwctype>
+#     include <wctype.h>
+#     define __STLPORT_CWCTYPE
+#     define _STLP_CWCTYPE
+#  endif
+
+#ifdef __cplusplus
+#  include <cwchar>
+#  include <cwctype>
+#endif
+
+#endif
+
+// some versions of gcc can't merge template instances:
+#if defined(__CYGWIN__)
+#  define BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE
+#endif
+
+// fix problems with bool as a macro,
+// this probably doesn't affect any current compilers:
+#if defined(bool) || defined(true) || defined(false)
+#  define BOOST_REGEX_NO_BOOL
+#endif
+
+#ifdef __cplusplus
+#ifndef MB_CUR_MAX
+// yuk!
+// better make a conservative guess!
+#define MB_CUR_MAX 10
+#endif
+
+namespace boost{ namespace re_detail{
+#ifdef BOOST_NO_STD_DISTANCE
+template <class T>
+std::ptrdiff_t distance(const T& x, const T& y)
+{ return y - x; }
+#else
+using std::distance;
+#endif
+}}
+
+
+#ifdef BOOST_REGEX_NO_BOOL
+#  define BOOST_REGEX_MAKE_BOOL(x) static_cast<bool>((x) ? true : false)
+#else
+#  ifdef BOOST_MSVC
+      // warning suppression with VC6:
+#     pragma warning(disable: 4800)
+#  endif
+#  define BOOST_REGEX_MAKE_BOOL(x) static_cast<bool>(x)
+#endif
+#endif // __cplusplus
+
+// backwards compatibitity:
+#if defined(BOOST_RE_NO_LIB)
+#  define BOOST_REGEX_NO_LIB
+#endif
+
+#if defined(__GNUC__) && (defined(_WIN32) || defined(__CYGWIN__))
+// gcc on win32 has problems merging switch statements in templates:
+#  define BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE
+// gcc on win32 has problems if you include <windows.h>
+// (sporadically generates bad code).
+#  define BOOST_REGEX_USE_C_LOCALE
+#  define BOOST_REGEX_NO_W32
+#endif
+
+
+/*****************************************************************************
+ *
+ *  Set up dll import/export options:
+ *
+ ****************************************************************************/
+
+// backwards compatibility:
+#ifdef BOOST_RE_STATIC_LIB
+#  define BOOST_REGEX_STATIC_LINK
+#endif
+
+#if defined(BOOST_MSVC) && defined(_DLL)
+#  define BOOST_REGEX_HAS_DLL_RUNTIME
+#endif
+
+#if defined(__BORLANDC__) && defined(_RTLDLL)
+#  define BOOST_REGEX_HAS_DLL_RUNTIME
+#endif
+
+#if defined(__ICL) && defined(_DLL)
+#  define BOOST_REGEX_HAS_DLL_RUNTIME
+#endif
+
+#if defined(BOOST_REGEX_HAS_DLL_RUNTIME) && !defined(BOOST_REGEX_STATIC_LINK)
+#  if defined(BOOST_REGEX_SOURCE)
+#     define BOOST_REGEX_DECL __declspec(dllexport)
+#     define BOOST_REGEX_BUILD_DLL
+#  else
+#     define BOOST_REGEX_DECL __declspec(dllimport)
+#  endif
+#endif
+
+#ifndef BOOST_REGEX_DECL
+#  define BOOST_REGEX_DECL
+#endif
+
+#if (defined(BOOST_MSVC) || defined(__BORLANDC__)) && !defined(BOOST_REGEX_NO_LIB) && !defined(BOOST_REGEX_SOURCE)
+#  include <boost/regex/detail/regex_library_include.hpp>
+#endif
+
+// Borland C++ Fix/error check:
+#if defined(__BORLANDC__)
+#  if (__BORLANDC__ == 0x550) || (__BORLANDC__ == 0x551)
+      // problems with std::basic_string and dll RTL:
+#     if defined(_RTLDLL) && defined(_RWSTD_COMPILE_INSTANTIATE)
+#        ifdef BOOST_REGEX_BUILD_DLL
+#           error _RWSTD_COMPILE_INSTANTIATE must not be defined when building regex++ as a DLL
+#        else
+#           pragma warn defining _RWSTD_COMPILE_INSTANTIATE when linking to the DLL version of the RTL may produce memory corruption problems in std::basic_string, as a result of separate versions of basic_string's static data in the RTL and you're exe/dll: be warned!!
+#        endif
+#     endif
+#     ifndef _RTLDLL
+         // this is harmless for a staic link:
+#        define _RWSTD_COMPILE_INSTANTIATE
+#     endif
+#  endif
+   //
+   // VCL support:
+   // if we're building a console app then there can't be any VCL (can there?)
+#  if !defined(__CONSOLE__) && !defined(_NO_VCL)
+#     define BOOST_REGEX_USE_VCL
+#  endif
+#endif
+
+/*****************************************************************************
+ *
+ *  Set up function call type:
+ *
+ ****************************************************************************/
+
+#if defined(BOOST_MSVC) || defined(__ICL)
+#  if defined(_DEBUG)
+#     define BOOST_REGEX_CALL __cdecl
+#  else
+#     define BOOST_REGEX_CALL __fastcall
+#  endif
+#  define BOOST_REGEX_CCALL __stdcall
+#endif
+
+#if defined(__BORLANDC__)
+#  define BOOST_REGEX_CALL __fastcall
+#  define BOOST_REGEX_CCALL __stdcall
+#endif
+
+#ifndef BOOST_REGEX_CALL
+#  define BOOST_REGEX_CALL
+#endif
+#ifndef BOOST_REGEX_CCALL
+#define BOOST_REGEX_CCALL
+#endif
+
+/*****************************************************************************
+ *
+ *  Set up localisation model:
+ *
+ ****************************************************************************/
+
+// backwards compatibility:
+#ifdef BOOST_RE_LOCALE_C
+#  define BOOST_REGEX_USE_C_LOCALE
+#endif
+
+#ifdef BOOST_RE_LOCALE_CPP
+#  define BOOST_REGEX_USE_CPP_LOCALE
+#endif
+
+// Win32 defaults to native Win32 locale:
+#if defined(_WIN32) && !defined(BOOST_REGEX_USE_WIN32_LOCALE) && !defined(BOOST_REGEX_USE_C_LOCALE) && !defined(BOOST_REGEX_USE_CPP_LOCALE) && !defined(BOOST_REGEX_NO_W32)
+#  define BOOST_REGEX_USE_WIN32_LOCALE
+#endif
+// otherwise use C locale:
+#if !defined(BOOST_REGEX_USE_WIN32_LOCALE) && !defined(BOOST_REGEX_USE_C_LOCALE) && !defined(BOOST_REGEX_USE_CPP_LOCALE)
+#  define BOOST_REGEX_USE_C_LOCALE
+#endif
+
+#ifdef BOOST_REGEX_USE_WIN32_LOCALE
+#  include <windows.h>
+#endif
+
+/*****************************************************************************
+ *
+ *  Debugging / tracing support:
+ *
+ ****************************************************************************/
+
+#if defined(BOOST_REGEX_DEBUG) && defined(__cplusplus)
+
+#  include <iostream>
+using std::cout;
+using std::cin;
+using std::cerr;
+using std::endl;
+using std::hex;
+using std::dec;
+
+#  ifndef jm_assert
+#     define jm_assert(x) assert(x)
+#  endif
+#  ifndef jm_trace
+#     define jm_trace(x) cerr << x << endl;
+#  endif
+#  ifndef jm_instrument
+#     define jm_instrument jm_trace(__FILE__<<"#"<<__LINE__)
+#  endif
+
+namespace boost{
+   namespace re_detail{
+class debug_guard
+{
+public:
+   char g1[32];
+   const char* pc;
+   char* pnc;
+   const char* file;
+   int line;
+   char g2[32];
+   debug_guard(const char* f, int l, const char* p1 = 0, char* p2 = 0);
+   ~debug_guard();
+};
+
+#  define BOOST_RE_GUARD_STACK boost::re_detail::debug_guard sg(__FILE__, __LINE__);
+#  define BOOST_RE_GUARD_GLOBAL(x) const char g1##x[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, }; char g2##x[32]; boost::debug_guard g3##x(__FILE__, __LINE__, g1##x, g2##x);
+
+   } // namespace re_detail
+} // namespace boost
+
+#else
+
+#  define jm_assert(x)
+#  define jm_trace(x)
+#  define BOOST_RE_GUARD_STACK
+#  define BOOST_RE_GUARD_GLOBAL(x)
+#  ifndef jm_instrument
+#     define jm_instrument
+#  endif
+#endif
+
+/*****************************************************************************
+ *
+ *  Fix broken compilers that wrongly #define some symbols:
+ *
+ ****************************************************************************/
+
+// the following may be defined as macros; this is
+// incompatable with std::something syntax, we have
+// no choice but to undef them?
+
+#ifdef memcpy
+#undef memcpy
+#endif
+#ifdef memmove
+#undef memmove
+#endif
+#ifdef memset
+#undef memset
+#endif
+#ifdef sprintf
+#undef sprintf
+#endif
+#ifdef strcat
+#undef strcat
+#endif
+#ifdef strcmp
+#undef strcmp
+#endif
+#ifdef strcpy
+#undef strcpy
+#endif
+#ifdef strlen
+#undef strlen
+#endif
+#ifdef swprintf
+#undef swprintf
+#endif
+#ifdef wcslen
+#undef wcslen
+#endif
+#ifdef wcscpy
+#undef wcscpy
+#endif
+#ifdef wcscmp
+#undef wcscmp
+#endif
+#ifdef isalpha
+#undef isalpha
+#endif
+#ifdef iscntrl
+#undef iscntrl
+#endif
+#ifdef isdigit
+#undef isdigit
+#endif
+#ifdef islower
+#undef islower
+#endif
+#ifdef isupper
+#undef isupper
+#endif
+#ifdef ispunct
+#undef ispunct
+#endif
+#ifdef isspace
+#undef isspace
+#endif
+#ifdef isxdigit
+#undef isxdigit
+#endif
+
+#ifdef tolower
+#undef tolower
+#endif
+#ifdef iswalpha
+#undef iswalpha
+#endif
+#ifdef iswcntrl
+#undef iswcntrl
+#endif
+#ifdef iswdigit
+#undef iswdigit
+#endif
+#ifdef iswlower
+#undef iswlower
+#endif
+#ifdef iswpunct
+#undef iswpunct
+#endif
+#ifdef iswspace
+#undef iswspace
+#endif
+#ifdef iswupper
+#undef iswupper
+#endif
+#ifdef iswxdigit
+#undef iswxdigit
+#endif
+#ifdef towlower
+#undef towlower
+#endif
+#ifdef wcsxfrm
+#undef wcsxfrm
+#endif
+
+/*****************************************************************************
+ *
+ *  Fix broken broken namespace support:
+ *
+ ****************************************************************************/
+
+#if defined(BOOST_NO_STDC_NAMESPACE) && defined(__cplusplus)
+
+namespace std{
+   using ::ptrdiff_t;
+   using ::size_t;
+   using ::memcpy;
+   using ::memmove;
+   using ::memset;
+   using ::memcmp;
+   using ::sprintf;
+   using ::strcat;
+   using ::strcmp;
+   using ::strcpy;
+   using ::strlen;
+   using ::strxfrm;
+   using ::isalpha;
+   using ::iscntrl;
+   using ::isdigit;
+   using ::islower;
+   using ::isupper;
+   using ::ispunct;
+   using ::isspace;
+   using ::isxdigit;
+   using ::tolower;
+   using ::abs;
+   using ::setlocale;
+#  ifndef BOOST_NO_WREGEX
+#     ifndef BOOST_RE_NO_SWPRINTF
+   using ::swprintf;
+#     endif
+   using ::wcslen;
+   using ::wcscpy;
+   using ::wcscmp;
+   using ::iswalpha;
+   using ::iswcntrl;
+   using ::iswdigit;
+   using ::iswlower;
+   using ::iswpunct;
+   using ::iswspace;
+   using ::iswupper;
+   using ::iswxdigit;
+   using ::towlower;
+   using ::wcsxfrm;
+   using ::wcstombs;
+   using ::mbstowcs;
+#     if !defined(BOOST_NO_STD_LOCALE) && !defined (__STL_NO_NATIVE_MBSTATE_T) && !defined(_STLP_NO_NATIVE_MBSTATE_T)
+   using ::mbstate_t;
+#     endif
+#  endif // BOOST_NO_WREGEX
+   using ::fseek;
+   using ::fread;
+   using ::ftell;
+   using ::fopen;
+   using ::fclose;
+   using ::FILE;
+}
+
+#endif
+
+/*****************************************************************************
+ *
+ *  helper functions construct/destroy:
+ *
+ ****************************************************************************/
+
+#ifdef __cplusplus
+namespace boost{ namespace re_detail{
+
+template <class T>
+inline void destroy(T* p)
+{ p->~T(); }
+
+template <class T>
+inline void construct(T* p, const T& t)
+{ new (p) T(t); }
+
+}} // namespaces
+#endif
+
+#endif
+

include/boost/regex/detail/fileiter.hpp

@@ -25,25 +25,25 @@
 #ifndef BOOST_RE_FILEITER_HPP
 #define BOOST_RE_FILEITER_HPP
 
-#include <boost/regex/detail/regex_config.hpp>
+#include <boost/regex/config.hpp>
 
-#if (defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(BOOST_RE_NO_W32)
+#if (defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(BOOST_REGEX_NO_W32)
 #error "Sorry, can't mix <windows.h> with STL code and gcc compiler: if you ran configure, try again with configure --disable-ms-windows"
-#define FI_WIN32_MAP
+#define BOOST_REGEX_FI_WIN32_MAP
-#define FI_POSIX_DIR
+#define BOOST_REGEX_FI_POSIX_DIR
-#elif (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_RE_NO_W32)
+#elif (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32)
-#define FI_WIN32_MAP
+#define BOOST_REGEX_FI_WIN32_MAP
-#define FI_WIN32_DIR
+#define BOOST_REGEX_FI_WIN32_DIR
 #else
-#define FI_POSIX_MAP
+#define BOOST_REGEX_FI_POSIX_MAP
-#define FI_POSIX_DIR
+#define BOOST_REGEX_FI_POSIX_DIR
 #endif
 
-#if defined(FI_WIN32_MAP)||defined(FI_WIN32_DIR)
+#if defined(BOOST_REGEX_FI_WIN32_MAP)||defined(BOOST_REGEX_FI_WIN32_DIR)
 #include <windows.h>
 #endif
 
-#if defined(FI_WIN32_DIR)
+#if defined(BOOST_REGEX_FI_WIN32_DIR)
 
 namespace boost{
    namespace re_detail{
@@ -58,7 +58,7 @@ typedef HANDLE _fi_find_handle;
 #define _fi_invalid_handle INVALID_HANDLE_VALUE
 #define _fi_dir FILE_ATTRIBUTE_DIRECTORY
 
-#elif defined(FI_POSIX_DIR)
+#elif defined(BOOST_REGEX_FI_POSIX_DIR)
 
 #include <cstdio>
 #include <cctype>
@@ -134,9 +134,9 @@ namespace boost{
    #endif
 #endif
 
-#ifdef FI_WIN32_MAP // win32 mapfile
+#ifdef BOOST_REGEX_FI_WIN32_MAP // win32 mapfile
 
-class BOOST_RE_IX_DECL mapfile
+class BOOST_REGEX_DECL mapfile
 {
    HANDLE hfile;
    HANDLE hmap;
@@ -158,11 +158,11 @@ public:
 };
 
 
-#elif !defined(BOOST_RE_NO_STL)  // use C API to emulate the memory map:
+#else
 
-class BOOST_RE_IX_DECL mapfile_iterator;
+class BOOST_REGEX_DECL mapfile_iterator;
 
-class BOOST_RE_IX_DECL mapfile
+class BOOST_REGEX_DECL mapfile
 {
    typedef char* pointer;
    std::FILE* hfile;
@@ -192,7 +192,7 @@ public:
    friend class mapfile_iterator;
 };
 
-class BOOST_RE_IX_DECL mapfile_iterator
+class BOOST_REGEX_DECL mapfile_iterator
 {
    typedef mapfile::pointer internal_pointer;
    internal_pointer* node;
@@ -272,12 +272,12 @@ public:
    {
       return (i.file == j.file) && (i.node == j.node) && (i.offset == j.offset);
    }
-#ifndef BOOST_RE_NO_NOT_EQUAL
+
    friend inline bool operator!=(const mapfile_iterator& i, const mapfile_iterator& j)
    {
       return !(i == j);
    }
-#endif
+
    friend inline bool operator<(const mapfile_iterator& i, const mapfile_iterator& j)
    {
       return i.position() < j.position();
@@ -311,7 +311,7 @@ public:
 #endif
 
 // _fi_sep determines the directory separator, either '\\' or '/'
-BOOST_RE_IX_DECL extern const char* _fi_sep;
+BOOST_REGEX_DECL extern const char* _fi_sep;
 
 struct file_iterator_ref
 {
@@ -321,7 +321,7 @@ struct file_iterator_ref
 };
 
 
-class BOOST_RE_IX_DECL file_iterator 
+class BOOST_REGEX_DECL file_iterator 
 {
    char* _root;
    char* _path;
@@ -353,12 +353,12 @@ public:
    {
       return ((f1.ref->hf == _fi_invalid_handle) && (f2.ref->hf == _fi_invalid_handle));
    }
-#ifndef BOOST_RE_NO_NOT_EQUAL
+
    friend inline bool operator != (const file_iterator& f1, const file_iterator& f2)
    {
       return !(f1 == f2);
    }
-#endif
+
 };
 
 // dwa 9/13/00 - suppress unused parameter warning
@@ -368,7 +368,7 @@ inline bool operator < (const file_iterator&, const file_iterator&)
 }
 
 
-class BOOST_RE_IX_DECL directory_iterator
+class BOOST_REGEX_DECL directory_iterator
 {
    char* _root;
    char* _path;
@@ -404,13 +404,13 @@ public:
       return ((f1.ref->hf == _fi_invalid_handle) && (f2.ref->hf == _fi_invalid_handle));
    }
 
-#ifndef BOOST_RE_NO_NOT_EQUAL
+
    friend inline bool operator != (const directory_iterator& f1, const directory_iterator& f2)
    {
       return !(f1 == f2);
    }
-#endif
+
-};
+   };
 
 inline bool operator < (const directory_iterator&, const directory_iterator&)
 {

include/boost/regex/detail/regex_compile.hpp

@@ -46,7 +46,7 @@ struct kmp_translator
 
 
 template <class charT, class traits_type, class Allocator>
-bool BOOST_RE_CALL re_maybe_set_member(charT c,
+bool BOOST_REGEX_CALL re_maybe_set_member(charT c,
                                  re_set_long* set_,
                                  const reg_expression<charT, traits_type, Allocator>& e)
 {
@@ -66,7 +66,7 @@ bool BOOST_RE_CALL re_maybe_set_member(charT c,
 
 } // namespace re_detail
 
-#if defined(BOOST_RE_NO_TEMPLATE_SWITCH_MERGE) && !defined(BOOST_RE_NO_NAMESPACES)
+#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
 //
 // Ugly ugly hack,
 // templates don't merge if they contain switch statements so declare these
@@ -76,41 +76,41 @@ namespace{
 #endif
 
 template <class charT, class traits, class Allocator>
-inline bool BOOST_RE_CALL reg_expression<charT, traits, Allocator>::can_start(charT c, const unsigned char* _map, unsigned char mask, const re_detail::_wide_type&)
+inline bool BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::can_start(charT c, const unsigned char* _map, unsigned char mask, const re_detail::_wide_type&)
 {
    if((traits_size_type)(traits_uchar_type)c >= 256)
       return true;
-   return BOOST_RE_MAKE_BOOL(_map[(traits_uchar_type)c] & mask);
+   return BOOST_REGEX_MAKE_BOOL(_map[(traits_uchar_type)c] & mask);
 }
 
 template <class charT, class traits, class Allocator>
-inline bool BOOST_RE_CALL reg_expression<charT, traits, Allocator>::can_start(charT c, const unsigned char* _map, unsigned char mask, const re_detail::_narrow_type&)
+inline bool BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::can_start(charT c, const unsigned char* _map, unsigned char mask, const re_detail::_narrow_type&)
 {
-   return BOOST_RE_MAKE_BOOL(_map[(traits_uchar_type)c] & mask);
+   return BOOST_REGEX_MAKE_BOOL(_map[(traits_uchar_type)c] & mask);
 }
 
 template <class charT, class traits, class Allocator>
-CONSTRUCTOR_INLINE reg_expression<charT, traits, Allocator>::reg_expression(const Allocator& a)
+reg_expression<charT, traits, Allocator>::reg_expression(const Allocator& a)
     : regbase(), data(a), pkmp(0), error_code_(REG_EMPTY), _expression(0)
 {
 }
 
 template <class charT, class traits, class Allocator>
-CONSTRUCTOR_INLINE reg_expression<charT, traits, Allocator>::reg_expression(const charT* p, flag_type f, const Allocator& a)
+reg_expression<charT, traits, Allocator>::reg_expression(const charT* p, flag_type f, const Allocator& a)
     : data(a), pkmp(0), error_code_(REG_EMPTY), _expression(0)
 {
    set_expression(p, f | regbase::use_except);
 }
 
 template <class charT, class traits, class Allocator>
-CONSTRUCTOR_INLINE reg_expression<charT, traits, Allocator>::reg_expression(const charT* p1, const charT* p2, flag_type f, const Allocator& a)
+reg_expression<charT, traits, Allocator>::reg_expression(const charT* p1, const charT* p2, flag_type f, const Allocator& a)
     : data(a), pkmp(0), error_code_(REG_EMPTY), _expression(0)
 {
     set_expression(p1, p2, f | regbase::use_except);
 }
 
 template <class charT, class traits, class Allocator>
-CONSTRUCTOR_INLINE reg_expression<charT, traits, Allocator>::reg_expression(const charT* p, size_type len, flag_type f, const Allocator& a)
+reg_expression<charT, traits, Allocator>::reg_expression(const charT* p, size_type len, flag_type f, const Allocator& a)
     : data(a), pkmp(0), error_code_(REG_EMPTY), _expression(0)
 {
     set_expression(p, p + len, f | regbase::use_except);
@@ -143,7 +143,7 @@ reg_expression<charT, traits, Allocator>::~reg_expression()
 }
 
 template <class charT, class traits, class Allocator>
-reg_expression<charT, traits, Allocator>& BOOST_RE_CALL reg_expression<charT, traits, Allocator>::operator=(const reg_expression<charT, traits, Allocator>& e)
+reg_expression<charT, traits, Allocator>& BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::operator=(const reg_expression<charT, traits, Allocator>& e)
 {
    //
    // we do a deep copy only if e is a valid expression, otherwise fail.
@@ -157,7 +157,7 @@ reg_expression<charT, traits, Allocator>& BOOST_RE_CALL reg_expression<charT, tr
 }
 
 template <class charT, class traits, class Allocator>
-inline bool BOOST_RE_CALL reg_expression<charT, traits, Allocator>::operator==(const reg_expression<charT, traits, Allocator>& e)const
+inline bool BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::operator==(const reg_expression<charT, traits, Allocator>& e)const
 {
    return (_flags == e.flags())
            && (_expression_len == e._expression_len)
@@ -165,7 +165,7 @@ inline bool BOOST_RE_CALL reg_expression<charT, traits, Allocator>::operator==(c
 }
 
 template <class charT, class traits, class Allocator>
-bool BOOST_RE_CALL reg_expression<charT, traits, Allocator>::operator<(const reg_expression<charT, traits, Allocator>& e)const
+bool BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::operator<(const reg_expression<charT, traits, Allocator>& e)const
 {
    //
    // we can't offer a diffinitive ordering, but we can be consistant:
@@ -175,19 +175,19 @@ bool BOOST_RE_CALL reg_expression<charT, traits, Allocator>::operator<(const reg
 }
 
 template <class charT, class traits, class Allocator>
-Allocator BOOST_RE_CALL reg_expression<charT, traits, Allocator>::allocator()const
+Allocator BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::allocator()const
 {
     return data.allocator();
 }
 
 template <class charT, class traits, class Allocator>
-Allocator BOOST_RE_CALL reg_expression<charT, traits, Allocator>::get_allocator()const
+Allocator BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::get_allocator()const
 {
     return data.allocator();
 }
 
 template <class charT, class traits, class Allocator>
-unsigned int BOOST_RE_CALL reg_expression<charT, traits, Allocator>::parse_inner_set(const charT*& first, const charT* last)
+unsigned int BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::parse_inner_set(const charT*& first, const charT* last)
 {
    //
    // we have an inner [...] construct
@@ -214,7 +214,7 @@ unsigned int BOOST_RE_CALL reg_expression<charT, traits, Allocator>::parse_inner
 
 
 template <class charT, class traits, class Allocator>
-bool BOOST_RE_CALL reg_expression<charT, traits, Allocator>::skip_space(const charT*& first, const charT* last)
+bool BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::skip_space(const charT*& first, const charT* last)
 {
    //
    // returns true if we get to last:
@@ -227,7 +227,7 @@ bool BOOST_RE_CALL reg_expression<charT, traits, Allocator>::skip_space(const ch
 }
 
 template <class charT, class traits, class Allocator>
-void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::parse_range(const charT*& ptr, const charT* end, unsigned& min, unsigned& max)
+void BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::parse_range(const charT*& ptr, const charT* end, unsigned& min, unsigned& max)
 {
    //
    // we have {x} or {x,} or {x,y} NB no spaces inside braces
@@ -305,7 +305,7 @@ void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::parse_range(const c
 }
 
 template <class charT, class traits, class Allocator>
-charT BOOST_RE_CALL reg_expression<charT, traits, Allocator>::parse_escape(const charT*& first, const charT* last)
+charT BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::parse_escape(const charT*& first, const charT* last)
 {
    charT c(*first);
    traits_size_type c_unsigned = (traits_size_type)(traits_uchar_type)*first;
@@ -408,7 +408,7 @@ charT BOOST_RE_CALL reg_expression<charT, traits, Allocator>::parse_escape(const
 }
 
 template <class charT, class traits, class Allocator>
-void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::compile_maps()
+void BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::compile_maps()
 {
    re_detail::re_syntax_base* record = (re_detail::re_syntax_base*)data.data();
    // always compile the first _map:
@@ -436,7 +436,7 @@ void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::compile_maps()
 }
 
 template <class charT, class traits, class Allocator>
-bool BOOST_RE_CALL reg_expression<charT, traits, Allocator>::probe_start(
+bool BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::probe_start(
                         re_detail::re_syntax_base* node, charT cc, re_detail::re_syntax_base* terminal) const
 {
    unsigned int c;
@@ -541,7 +541,7 @@ bool BOOST_RE_CALL reg_expression<charT, traits, Allocator>::probe_start(
 }
 
 template <class charT, class traits, class Allocator>
-bool BOOST_RE_CALL reg_expression<charT, traits, Allocator>::probe_start_null(re_detail::re_syntax_base* node, re_detail::re_syntax_base* terminal)const
+bool BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::probe_start_null(re_detail::re_syntax_base* node, re_detail::re_syntax_base* terminal)const
 {
    switch(node->type)
    {
@@ -590,7 +590,7 @@ bool BOOST_RE_CALL reg_expression<charT, traits, Allocator>::probe_start_null(re
 }
 
 template <class charT, class traits, class Allocator>
-void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::compile_map(
+void BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::compile_map(
                         re_detail::re_syntax_base* node, unsigned char* _map,
                         unsigned int* pnull, unsigned char mask, re_detail::re_syntax_base* terminal)const
 {
@@ -607,7 +607,7 @@ void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::compile_map(
 }
   
 template <class charT, class traits, class Allocator>
-void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::move_offsets(re_detail::re_syntax_base* j, unsigned size)
+void BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::move_offsets(re_detail::re_syntax_base* j, unsigned size)
 {
    // move all offsets starting with j->link forward by size
    // called after an insert:
@@ -636,7 +636,7 @@ void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::move_offsets(re_det
 }
 
 template <class charT, class traits, class Allocator>
-re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator>::compile_set_simple(re_detail::re_syntax_base* dat, unsigned long cls, bool isnot)
+re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::compile_set_simple(re_detail::re_syntax_base* dat, unsigned long cls, bool isnot)
 {
    re_detail::jstack<traits_string_type, Allocator> singles(64, data.allocator());
    re_detail::jstack<traits_string_type, Allocator> ranges(64, data.allocator());
@@ -652,7 +652,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
 }
 
 template <class charT, class traits, class Allocator>
-re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator>::compile_set(const charT*& first, const charT* last)
+re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::compile_set(const charT*& first, const charT* last)
 {
    re_detail::jstack<traits_string_type, Allocator> singles(64, data.allocator());
    re_detail::jstack<traits_string_type, Allocator> ranges(64, data.allocator());
@@ -969,7 +969,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
 }
 
 template <class charT, class traits, class Allocator>
-re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator>::compile_set_aux(re_detail::jstack<traits_string_type, Allocator>& singles, re_detail::jstack<traits_string_type, Allocator>& ranges, re_detail::jstack<boost::uint_fast32_t, Allocator>& classes, re_detail::jstack<traits_string_type, Allocator>& equivalents, bool isnot, const re_detail::_wide_type&)
+re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::compile_set_aux(re_detail::jstack<traits_string_type, Allocator>& singles, re_detail::jstack<traits_string_type, Allocator>& ranges, re_detail::jstack<boost::uint_fast32_t, Allocator>& classes, re_detail::jstack<traits_string_type, Allocator>& equivalents, bool isnot, const re_detail::_wide_type&)
 {
    size_type base = data.size();
    data.extend(sizeof(re_detail::re_set_long));
@@ -1048,7 +1048,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
 }
 
 template <class charT, class traits, class Allocator>
-re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator>::compile_set_aux(re_detail::jstack<traits_string_type, Allocator>& singles, re_detail::jstack<traits_string_type, Allocator>& ranges, re_detail::jstack<boost::uint_fast32_t, Allocator>& classes, re_detail::jstack<traits_string_type, Allocator>& equivalents, bool isnot, const re_detail::_narrow_type&)
+re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::compile_set_aux(re_detail::jstack<traits_string_type, Allocator>& singles, re_detail::jstack<traits_string_type, Allocator>& ranges, re_detail::jstack<boost::uint_fast32_t, Allocator>& classes, re_detail::jstack<traits_string_type, Allocator>& equivalents, bool isnot, const re_detail::_narrow_type&)
 {
    re_detail::re_set* dat = (re_detail::re_set*)data.extend(sizeof(re_detail::re_set));
    std::memset(dat, 0, sizeof(re_detail::re_set));
@@ -1153,9 +1153,9 @@ inline
 
 
 template <class charT, class traits, class Allocator>
-void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::fixup_apply(re_detail::re_syntax_base* b, unsigned cbraces)
+void BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::fixup_apply(re_detail::re_syntax_base* b, unsigned cbraces)
 {
-   typedef typename boost::re_detail::rebind_allocator<bool, Allocator>::type b_alloc;
+   typedef typename boost::detail::rebind_allocator<bool, Allocator>::type b_alloc;
    
    register unsigned char* base = (unsigned char*)b;
    register re_detail::re_syntax_base* ptr = b;
@@ -1175,7 +1175,7 @@ void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::fixup_apply(re_deta
          {
          case re_detail::syntax_element_rep:
             ((re_detail::re_jump*)ptr)->alt.p = add_offset(base, ((re_detail::re_jump*)ptr)->alt.i);
-#ifdef BOOST_RE_DEBUG
+#ifdef BOOST_REGEX_DEBUG
             if((re_detail::padding_mask & (int)((re_detail::re_jump*)ptr)->alt.p) && (((re_detail::re_jump*)ptr)->alt.p != b))
             {
                jm_trace("padding mis-aligment in repeat jump to object type: " << ((re_detail::re_jump*)ptr)->alt.p->type)
@@ -1188,7 +1188,7 @@ void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::fixup_apply(re_deta
          case re_detail::syntax_element_jump:
          case re_detail::syntax_element_alt:
             ((re_detail::re_jump*)ptr)->alt.p = add_offset(base, ((re_detail::re_jump*)ptr)->alt.i);
-#ifdef BOOST_RE_DEBUG
+#ifdef BOOST_REGEX_DEBUG
             if((re_detail::padding_mask & (int)((re_detail::re_jump*)ptr)->alt.p) && (((re_detail::re_jump*)ptr)->alt.p != b))
             {
                jm_trace("padding mis-aligment in alternation jump to object type: " << ((re_detail::re_jump*)ptr)->alt.p->type)
@@ -1210,7 +1210,7 @@ void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::fixup_apply(re_deta
          default:
             rebase:
             ptr->next.p = add_offset(base, ptr->next.i);
-#ifdef BOOST_RE_DEBUG
+#ifdef BOOST_REGEX_DEBUG
             if((re_detail::padding_mask & (int)(ptr->next.p)) && (((re_detail::re_jump*)ptr)->alt.p != b))
             {
                jm_trace("padding mis-alignment in next record of type " << ptr->next.p->type)
@@ -1233,7 +1233,7 @@ void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::fixup_apply(re_deta
 
 
 template <class charT, class traits, class Allocator>
-unsigned int BOOST_RE_CALL reg_expression<charT, traits, Allocator>::set_expression(const charT* p, const charT* end, flag_type f)
+unsigned int BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::set_expression(const charT* p, const charT* end, flag_type f)
 {
    if(p == expression())
    {
@@ -1883,7 +1883,7 @@ unsigned int BOOST_RE_CALL reg_expression<charT, traits, Allocator>::set_express
 }
 
 template <class charT, class traits, class Allocator>
-re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator>::add_simple(re_detail::re_syntax_base* dat, re_detail::syntax_element_type type, unsigned int size)
+re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::add_simple(re_detail::re_syntax_base* dat, re_detail::syntax_element_type type, unsigned int size)
 {
    if(dat)
    {
@@ -1899,7 +1899,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
 }
 
 template <class charT, class traits, class Allocator>
-re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator>::add_literal(re_detail::re_syntax_base* dat, charT c)
+re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::add_literal(re_detail::re_syntax_base* dat, charT c)
 {
    if(dat && (dat->type == re_detail::syntax_element_literal))
    {
@@ -1920,7 +1920,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
 }
 
 template <class charT, class traits, class Allocator>
-unsigned int BOOST_RE_CALL reg_expression<charT, traits, Allocator>::probe_restart(re_detail::re_syntax_base* dat)
+unsigned int BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::probe_restart(re_detail::re_syntax_base* dat)
 {
    switch(dat->type)
    {
@@ -1941,7 +1941,7 @@ unsigned int BOOST_RE_CALL reg_expression<charT, traits, Allocator>::probe_resta
 }
 
 template <class charT, class traits, class Allocator>
-unsigned int BOOST_RE_CALL reg_expression<charT, traits, Allocator>::fixup_leading_rep(re_detail::re_syntax_base* dat, re_detail::re_syntax_base* end)
+unsigned int BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::fixup_leading_rep(re_detail::re_syntax_base* dat, re_detail::re_syntax_base* end)
 {
    unsigned int len = 0;
    bool leading_lit = end ? false : true;
@@ -2015,7 +2015,7 @@ unsigned int BOOST_RE_CALL reg_expression<charT, traits, Allocator>::fixup_leadi
 }
 
 template <class charT, class traits, class Allocator>
-void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::fail(unsigned int err)
+void BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::fail(unsigned int err)
 {
    error_code_  = err;
    if(err)
@@ -2031,7 +2031,7 @@ void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::fail(unsigned int e
 }
 
 
-#if defined(BOOST_RE_NO_TEMPLATE_SWITCH_MERGE) && !defined(BOOST_RE_NO_NAMESPACES)
+#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
 } // namespace
 #endif
 

include/boost/regex/detail/regex_cstring.hpp

@@ -26,7 +26,7 @@
 #define BOOST_REGEX_CSTRING_HPP
 
 #ifndef BOOST_REGEX_CONFIG_HPP
-#include <boost/regex/detail/regex_config.hpp>
+#include <boost/regex/config.hpp>
 #endif
 
 #include <cstring>
@@ -43,7 +43,7 @@ namespace boost{
 //
 
 template <class charT>
-std::size_t BOOST_RE_CALL re_strlen(const charT *s)
+std::size_t BOOST_REGEX_CALL re_strlen(const charT *s)
 {
    std::size_t len = 0;
    while(*s)
@@ -54,27 +54,27 @@ std::size_t BOOST_RE_CALL re_strlen(const charT *s)
    return len;
 }
 
-inline std::size_t BOOST_RE_CALL re_strlen(const char *s)
+inline std::size_t BOOST_REGEX_CALL re_strlen(const char *s)
 {
    return std::strlen(s);
 }
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 
-inline std::size_t BOOST_RE_CALL re_strlen(const wchar_t *s)
+inline std::size_t BOOST_REGEX_CALL re_strlen(const wchar_t *s)
 {
    return std::wcslen(s);
 }
 
 #endif
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
-BOOST_RE_IX_DECL void BOOST_RE_CALL re_transform(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in);
+BOOST_REGEX_DECL void BOOST_REGEX_CALL re_transform(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in);
 #endif
-BOOST_RE_IX_DECL void BOOST_RE_CALL re_transform(std::string& out, const std::string& in);
+BOOST_REGEX_DECL void BOOST_REGEX_CALL re_transform(std::string& out, const std::string& in);
 
 template <class charT>
-void BOOST_RE_CALL re_trunc_primary(std::basic_string<charT>& s)
+void BOOST_REGEX_CALL re_trunc_primary(std::basic_string<charT>& s)
 {
    for(unsigned int i = 0; i < s.size(); ++i)
    {
@@ -86,7 +86,7 @@ void BOOST_RE_CALL re_trunc_primary(std::basic_string<charT>& s)
    }
 }
 
-inline char* BOOST_RE_CALL re_strcpy(char *s1, const char *s2)
+inline char* BOOST_REGEX_CALL re_strcpy(char *s1, const char *s2)
 {
    #if defined(__BORLANDC__) && defined(strcpy)
    return ::strcpy(s1, s2);
@@ -95,9 +95,9 @@ inline char* BOOST_RE_CALL re_strcpy(char *s1, const char *s2)
    #endif
 }
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 
-inline wchar_t* BOOST_RE_CALL re_strcpy(wchar_t *s1, const wchar_t *s2)
+inline wchar_t* BOOST_REGEX_CALL re_strcpy(wchar_t *s1, const wchar_t *s2)
 {
    return std::wcscpy(s1, s2);
 }
@@ -106,7 +106,7 @@ inline wchar_t* BOOST_RE_CALL re_strcpy(wchar_t *s1, const wchar_t *s2)
 
 
 template <class charT>
-charT* BOOST_RE_CALL re_strdup(const charT* p)
+charT* BOOST_REGEX_CALL re_strdup(const charT* p)
 {
    charT* buf = new charT[re_strlen(p) + 1];
    re_strcpy(buf, p);
@@ -114,7 +114,7 @@ charT* BOOST_RE_CALL re_strdup(const charT* p)
 }
 
 template <class charT>
-inline void BOOST_RE_CALL re_strfree(charT* p)
+inline void BOOST_REGEX_CALL re_strfree(charT* p)
 {
    delete[] p;
 }

include/boost/regex/detail/regex_format.hpp

@@ -40,11 +40,11 @@ enum format_flags_t{
 namespace re_detail{
 
 #ifdef __BORLANDC__
-   #pragma option push -a4 -b -Ve -pc
+   #pragma option push -a4 -b -Ve -pc -w-8037
 #endif
 
 template <class O, class I>
-O BOOST_RE_CALL re_copy_out(O out, I first, I last)
+O BOOST_REGEX_CALL re_copy_out(O out, I first, I last)
 {
    while(first != last)
    {
@@ -56,7 +56,7 @@ O BOOST_RE_CALL re_copy_out(O out, I first, I last)
 }
 
 template <class charT, class traits_type>
-void BOOST_RE_CALL re_skip_format(const charT*& fmt, const traits_type& traits_inst)
+void BOOST_REGEX_CALL re_skip_format(const charT*& fmt, const traits_type& traits_inst)
 {
    // dwa 9/13/00 - suppress incorrect unused parameter warning for MSVC
    (void)traits_inst;
@@ -96,7 +96,7 @@ void BOOST_RE_CALL re_skip_format(const charT*& fmt, const traits_type& traits_i
    }
 }
 
-#ifdef BOOST_RE_NO_OI_ASSIGN
+#ifdef BOOST_NO_STD_OUTPUT_ITERATOR_ASSIGN
 
 //
 // ugly hack for buggy output iterators
@@ -104,8 +104,8 @@ void BOOST_RE_CALL re_skip_format(const charT*& fmt, const traits_type& traits_i
 template <class T>
 inline void oi_assign(T* p, T v)
 {
-   jm_destroy(p);
+   ::boost::re_detail::destroy(p);
-   jm_construct(p, v);
+   construct(p, v);
 }
 
 #else
@@ -116,15 +116,15 @@ inline void oi_assign(T* p, T v)
    //
    // if you get a compile time error in here then you either
    // need to rewrite your output iterator to make it assignable
-   // (as is required by the standard), or define BOOST_RE_NO_OI_ASSIGN
+   // (as is required by the standard), or define
-   // to use the ugly hack above
+   // BOOST_NO_STD_OUTPUT_ITERATOR_ASSIGN to use the ugly hack above
    *p = v;
 }
 
 #endif
 
 
-#if defined(BOOST_RE_NO_TEMPLATE_SWITCH_MERGE) && !defined(BOOST_RE_NO_NAMESPACES)
+#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
 //
 // Ugly ugly hack,
 // template don't merge if they contain switch statements so declare these
@@ -141,7 +141,7 @@ namespace{
 // _reg_format_aux does the actual work:
 //
 template <class OutputIterator, class iterator, class Allocator, class charT, class traits_type>
-OutputIterator BOOST_RE_CALL _reg_format_aux(OutputIterator out, 
+OutputIterator BOOST_REGEX_CALL _reg_format_aux(OutputIterator out, 
                           const match_results<iterator, Allocator>& m, 
                           const charT*& fmt,
                           unsigned flags, const traits_type& traits_inst)
@@ -428,7 +428,7 @@ default_opt:
    return out;
 }
 
-#if defined(BOOST_RE_NO_TEMPLATE_SWITCH_MERGE) && !defined(BOOST_RE_NO_NAMESPACES)
+#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
 } // namespace
 #endif
 
@@ -462,7 +462,7 @@ public:
       : out(&o), last(&pi), fmt(f), flags(format_flags), pt(&p){}
 
    ~merge_out_predicate() {}
-   bool BOOST_RE_CALL operator()(const boost::match_results<iterator, Allocator>& m)
+   bool BOOST_REGEX_CALL operator()(const boost::match_results<iterator, Allocator>& m)
    {
       const charT* f = fmt;
       if(0 == (flags & format_no_copy))

include/boost/regex/detail/regex_kmp.hpp

@@ -26,7 +26,7 @@
 #define BOOST_REGEX_KMP_HPP
 
 #ifdef BOOST_REGEX_CONFIG_HPP
-#include <boost/regex/detail/regex_config.hpp>
+#include <boost/regex/config.hpp>
 #endif
 
 
@@ -49,14 +49,14 @@ struct kmp_info
 template <class charT, class Allocator>
 void kmp_free(kmp_info<charT>* pinfo, const Allocator& a)
 {
-   typedef typename boost::re_detail::rebind_allocator<char, Allocator>::type atype;
+   typedef typename boost::detail::rebind_allocator<char, Allocator>::type atype;
    atype(a).deallocate((char*)pinfo, pinfo->size);
 }
 
 template <class iterator, class charT, class Trans, class Allocator>
 kmp_info<charT>* kmp_compile(iterator first, iterator last, charT, Trans translate, const Allocator& a) 
 {    
-   typedef typename boost::re_detail::rebind_allocator<char, Allocator>::type atype;
+   typedef typename boost::detail::rebind_allocator<char, Allocator>::type atype;
    int i, j, m;
    i = 0;
    m = boost::re_detail::distance(first, last);

include/boost/regex/detail/regex_library_include.hpp

@@ -25,9 +25,9 @@
 
 #ifndef BOOST_REGEX_LIBRARY_INCLUDE_HPP
 #define BOOST_REGEX_LIBRARY_INCLUDE_HPP
-#ifndef BOOST_RE_NO_LIB
+#ifndef BOOST_REGEX_NO_LIB
 
-#if defined(BOOST_MSVC) && !defined(BOOST_RE_BUILD_DLL)
+#if defined(BOOST_MSVC) && !defined(BOOST_REGEX_BUILD_DLL)
 #ifdef __SGI_STL_PORT
    #ifdef _DLL
       // All these are multithreaded:
@@ -35,7 +35,7 @@
          #pragma comment(lib, "vc6-stlport-re300ddl.lib")
       #elif defined(_DEBUG)
          #pragma comment(lib, "vc6-stlport-re300dl.lib")
-      #elif defined(BOOST_RE_STATIC_LIB)
+      #elif defined(BOOST_REGEX_STATIC_LINK)
          // static regex lib, dll runtime
          #pragma comment(lib, "vc6-stlport-re300ls.lib")
       #else // DEBUG
@@ -55,12 +55,12 @@
          #error STLPort does not support single threaded builds
       #endif //_MT
    #endif //_DLL
-#else
+#elif _MSC_VER < 1300
    #ifdef _DLL
       // All these are multithreaded:
       #ifdef _DEBUG
          #pragma comment(lib, "vc6-re300dl.lib")
-      #elif defined(BOOST_RE_STATIC_LIB)
+      #elif defined(BOOST_REGEX_STATIC_LINK)
          // static regex lib, dll runtime
          #pragma comment(lib, "vc6-re300ls.lib")
       #else // DEBUG
@@ -81,15 +81,41 @@
          #endif //_DEBUG
       #endif //_MT
    #endif //_DLL
+#else
+   #ifdef _DLL
+      // All these are multithreaded:
+      #ifdef _DEBUG
+         #pragma comment(lib, "vc7-re300dl.lib")
+      #elif defined(BOOST_REGEX_STATIC_LINK)
+         // static regex lib, dll runtime
+         #pragma comment(lib, "vc7-re300ls.lib")
+      #else // DEBUG
+         #pragma comment(lib, "vc7-re300l.lib")
+      #endif // _DEBUG
+   #else // _DLL
+      #ifdef _MT
+         #ifdef _DEBUG
+            #pragma comment(lib, "vc7-re300dm.lib")
+         #else //_DEBUG
+            #pragma comment(lib, "vc7-re300m.lib")
+         #endif //_DEBUG
+      #else //_MT
+         #ifdef _DEBUG
+            #pragma comment(lib, "vc7-re300d.lib")
+         #else //_DEBUG
+            #pragma comment(lib, "vc7-re300.lib")
+         #endif //_DEBUG
+      #endif //_MT
+   #endif //_DLL
 #endif // __SGI_STL_PORT
 #endif //BOOST_MSVC
 
 
-#if defined(__BORLANDC__) && !defined(BOOST_RE_BUILD_DLL)
+#if defined(__BORLANDC__) && !defined(BOOST_REGEX_BUILD_DLL)
    
    #if __BORLANDC__ < 0x550
    
-   #ifdef BOOST_RE_USE_VCL
+   #ifdef BOOST_REGEX_USE_VCL
    
       #ifdef _RTLDLL
          #pragma comment(lib, "bcb4re300lv.lib")
@@ -117,7 +143,7 @@
    
    #else // C++ Builder 5:
 
-   #ifdef BOOST_RE_USE_VCL
+   #ifdef BOOST_REGEX_USE_VCL
    
       #ifdef _RTLDLL
          #pragma comment(lib, "bcb5re300lv.lib")
@@ -147,7 +173,7 @@
    
 #endif //__BORLANDC__
 
-#endif //BOOST_RE_NO_LIB
+#endif //BOOST_REGEX_NO_LIB
 
 #endif // BOOST_REGEX_LIBRARY_INCLUDE_HPP
 

include/boost/regex/detail/regex_match.hpp

@@ -31,15 +31,19 @@ namespace boost{
    namespace re_detail{
 
 #ifdef __BORLANDC__
-   #pragma option push -a4 -b -Ve -pc
+   #pragma option push -a4 -b -Ve -pc -w-8026
 #endif
 
 template <class iterator, class charT, class traits_type, class Allocator>
-iterator BOOST_RE_CALL re_is_set_member(iterator next, 
+iterator BOOST_REGEX_CALL re_is_set_member(iterator next, 
                           iterator last, 
                           re_set_long* set_, 
                           const reg_expression<charT, traits_type, Allocator>& e)
 {   
+#ifdef BOOST_MSVC
+#  pragma warning(push)
+#  pragma warning(disable: 4800)
+#endif
    const charT* p = (const charT*)(set_+1);
    iterator ptr;
    unsigned int i;
@@ -140,14 +144,17 @@ iterator BOOST_RE_CALL re_is_set_member(iterator next,
    if(traits_inst.is_class(col, set_->cclasses) == true)
       return set_->isnot ? next : ++next;
    return set_->isnot ? ++next : next;
+#ifdef BOOST_MSVC
+#  pragma warning(pop)
+#endif
 }
 
 template <class iterator, class Allocator>
 class _priv_match_data
 {
 public:
-   typedef typename boost::re_detail::rebind_allocator<int, Allocator>::type i_alloc;
+   typedef typename boost::detail::rebind_allocator<int, Allocator>::type i_alloc;
-   typedef typename boost::re_detail::rebind_allocator<iterator, Allocator>::type it_alloc;
+   typedef typename boost::detail::rebind_allocator<iterator, Allocator>::type it_alloc;
 
    match_results_base<iterator, Allocator> temp_match;
    // failure stacks:
@@ -208,7 +215,7 @@ void _priv_match_data<iterator, Allocator>::free()
       i_alloc temp1(temp_match.allocator());
       temp1.deallocate(accumulators, caccumulators);
       for(unsigned i = 0; i < caccumulators; ++i)
-         jm_destroy(loop_starts + i);
+         ::boost::re_detail::destroy(loop_starts + i);
       it_alloc temp2(temp_match.allocator());
       temp2.deallocate(loop_starts, caccumulators);
    }
@@ -242,7 +249,7 @@ struct access_t : public reg_expression<charT, traits, Allocator>
 };
 
 
-#if defined(BOOST_RE_NO_TEMPLATE_SWITCH_MERGE) && !defined(BOOST_RE_NO_NAMESPACES)
+#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
 //
 // Ugly ugly hack,
 // template don't merge if they contain switch statements so declare these
@@ -260,6 +267,10 @@ bool query_match_aux(iterator first,
                      _priv_match_data<iterator, Allocator>& pd,
                      iterator* restart)
 {
+#ifdef BOOST_MSVC
+#  pragma warning(push)
+#  pragma warning(disable: 4800)
+#endif
    typedef access_t<charT, traits, Allocator2> access;
 
    if(e.flags() & regbase::failbit)
@@ -944,8 +955,11 @@ bool query_match_aux(iterator first,
    // if we get to here then everything has failed
    // and no match was found:
    return false;
+#ifdef BOOST_MSVC
+#  pragma warning(pop)
+#endif
 }
-#if defined(BOOST_RE_NO_TEMPLATE_SWITCH_MERGE) && !defined(BOOST_RE_NO_NAMESPACES)
+#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
 } // namespace
 #endif
 
@@ -1019,7 +1033,7 @@ struct grep_search_predicate
    }
 };
 
-#if !defined(BOOST_RE_NO_TEMPLATE_RETURNS) && !defined(BOOST_RE_NO_PARTIAL_FUNC_SPEC)
+#if !defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) && !defined(BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING)
 
 template <class iterator, class Allocator>
 inline const match_results_base<iterator, Allocator>& grep_out_type(const grep_search_predicate<iterator, Allocator>& o, const Allocator&)
@@ -1035,7 +1049,7 @@ inline const Allocator& grep_out_type(const T&, const Allocator& a)
    return a;
 }
 
-#if defined(BOOST_RE_NO_TEMPLATE_SWITCH_MERGE) && !defined(BOOST_RE_NO_NAMESPACES)
+#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
 //
 // Ugly ugly hack,
 // template don't merge if they contain switch statements so declare these
@@ -1051,6 +1065,10 @@ namespace{
 template <class Predicate, class I, class charT, class traits, class A, class A2>
 unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<charT, traits, A>& e, unsigned flags, A2 a)
 {
+#ifdef BOOST_MSVC
+#  pragma warning(push)
+#  pragma warning(disable: 4800)
+#endif
    typedef access_t<charT, traits, A> access;
 
    if(e.flags() & regbase::failbit)
@@ -1527,8 +1545,11 @@ unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<char
    }
 
    return cmatches;
+#ifdef BOOST_MSVC
+#  pragma warning(pop)
+#endif
 }
-#if defined(BOOST_RE_NO_TEMPLATE_SWITCH_MERGE) && !defined(BOOST_RE_NO_NAMESPACES)
+#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
 } // namespace {anon}
 #endif
 
@@ -1565,7 +1586,7 @@ bool regex_match(iterator first, iterator last, const reg_expression<charT, trai
 }
 //
 // query_match convenience interfaces:
-#ifndef BOOST_RE_NO_PARTIAL_FUNC_SPEC
+#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
 //
 // this isn't really a partial specialisation, but template function
 // overloading - if the compiler doesn't support partial specialisation
@@ -1620,7 +1641,7 @@ inline bool regex_match(const char* str,
    match_results<const char*> m;
    return regex_match(str, str + regex::traits_type::length(str), m, e, flags);
 }
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 inline bool regex_match(const wchar_t* str, 
                         wcmatch& m, 
                         const wregex& e, 
@@ -1650,7 +1671,7 @@ inline bool regex_match(const std::string& s,
    match_results<std::string::const_iterator, regex::allocator_type> m;
    return regex_match(s.begin(), s.end(), m, e, flags);
 }
-#if !defined(BOOST_RE_NO_WCSTRING)
+#if !defined(BOOST_NO_WREGEX)
 inline bool regex_match(const std::basic_string<wchar_t>& s, 
                         match_results<std::basic_string<wchar_t>::const_iterator, wregex::allocator_type>& m,
                         const wregex& e, 
@@ -1672,6 +1693,10 @@ inline bool regex_match(const std::basic_string<wchar_t>& s,
 template <class iterator, class Allocator, class charT, class traits, class Allocator2>
 bool regex_search(iterator first, iterator last, match_results<iterator, Allocator>& m, const reg_expression<charT, traits, Allocator2>& e, unsigned flags = match_default)
 {
+#ifdef BOOST_MSVC
+#  pragma warning(push)
+#  pragma warning(disable: 4800)
+#endif
    if(e.flags() & regbase::failbit)
       return false;
 
@@ -1679,11 +1704,14 @@ bool regex_search(iterator first, iterator last, match_results<iterator, Allocat
    typedef typename traits::uchar_type traits_uchar_type;
 
    return re_detail::reg_grep2(re_detail::grep_search_predicate<iterator, Allocator>(&m), first, last, e, flags, m.allocator());
+#ifdef BOOST_MSVC
+#  pragma warning(pop)
+#endif
 }
 
 //
 // regex_search convenience interfaces:
-#ifndef BOOST_RE_NO_PARTIAL_FUNC_SPEC
+#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
 //
 // this isn't really a partial specialisation, but template function
 // overloading - if the compiler doesn't support partial specialisation
@@ -1713,7 +1741,7 @@ inline bool regex_search(const char* str,
 {
    return regex_search(str, str + regex::traits_type::length(str), m, e, flags);
 }
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 inline bool regex_search(const wchar_t* str, 
                         wcmatch& m, 
                         const wregex& e, 
@@ -1729,7 +1757,7 @@ inline bool regex_search(const std::string& s,
 {
    return regex_search(s.begin(), s.end(), m, e, flags);
 }
-#if !defined(BOOST_RE_NO_WCSTRING)
+#if !defined(BOOST_NO_WREGEX)
 inline bool regex_search(const std::basic_string<wchar_t>& s, 
                         match_results<std::basic_string<wchar_t>::const_iterator, wregex::allocator_type>& m,
                         const wregex& e, 
@@ -1754,7 +1782,7 @@ inline unsigned int regex_grep(Predicate foo, iterator first, iterator last, con
 
 //
 // regex_grep convenience interfaces:
-#ifndef BOOST_RE_NO_PARTIAL_FUNC_SPEC
+#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
 //
 // this isn't really a partial specialisation, but template function
 // overloading - if the compiler doesn't support partial specialisation
@@ -1781,7 +1809,7 @@ inline unsigned int regex_grep(bool (*foo)(const cmatch&), const char* str,
 {
    return regex_grep(foo, str, str + regex::traits_type::length(str), e, flags);
 }
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 inline unsigned int regex_grep(bool (*foo)(const wcmatch&), const wchar_t* str, 
                         const wregex& e, 
                         unsigned flags = match_default)
@@ -1795,7 +1823,7 @@ inline unsigned int regex_grep(bool (*foo)(const match_results<std::string::cons
 {
    return regex_grep(foo, s.begin(), s.end(), e, flags);
 }
-#if !defined(BOOST_RE_NO_WCSTRING)
+#if !defined(BOOST_NO_WREGEX)
 inline unsigned int regex_grep(bool (*foo)(const match_results<std::basic_string<wchar_t>::const_iterator, wregex::allocator_type>&), 
                      const std::basic_string<wchar_t>& s, 
                         const wregex& e, 

include/boost/regex/detail/regex_options.hpp

@@ -1,146 +0,0 @@
-
-#ifndef BOOST_RE_OPT_H
-#define BOOST_RE_OPT_H
-
-/* #define BOOST_RE_AUTO_CONFIGURE */
-#ifdef BOOST_RE_AUTO_CONFIGURE
-
-/* Compiler options: */
-
-/* BOOST_NO_STDC_NAMESPACE         C library not in namespace std */
-/* #define BOOST_NO_STDC_NAMESPACE */
-
-/* BOOST_RE_PLATFORM_W32           Platform is MS Win32 */
-/* #define BOOST_RE_PLATFORM_W32 */
-
-/* BOOST_RE_NO_W32               Disable Win32 support even when present */
-/* #define BOOST_RE_NO_W32 */
-
-/* BOOST_RE_NO_BOOL                If bool is not a distict type. */
-/* #define BOOST_RE_NO_BOOL */
-
-/* BOOST_RE_NO_WCHAR_H             If there is no <wchar.h> */
-/* #define BOOST_RE_NO_WCHAR_H */
-
-/* BOOST_RE_NO_WCTYPE_H            If there is no <wctype.h> */
-/* #define BOOST_RE_NO_WCTYPE_H */
-
-/* BOOST_RE_NO_WCSTRING            If there are no wcslen and wcsncmp functions available. */
-/* #define BOOST_RE_NO_WCSTRING */
-
-/* BOOST_RE_NO_SWPRINTF            If there is no swprintf available. */
-/* #define BOOST_RE_NO_SWPRINTF */
-
-/* BOOST_RE_NO_WSPRINTF            If there is no wsprintf available. */
-/* #define BOOST_RE_NO_WSPRINTF */
-
-/* BOOST_NO_MEMBER_TEMPLATES    If member function templates or nested template classes are not allowed. */
-/* #define BOOST_NO_MEMBER_TEMPLATES */
-
-/* BOOST_RE_NO_TEMPLATE_RETURNS    If template functions based on return type are not supported. */
-/* #define BOOST_RE_NO_TEMPLATE_RETURNS */
-
-/* BOOST_RE_NO_PARTIAL_FUNC_SPEC   If partial template function specialisation is not supported */
-/* #define BOOST_RE_NO_PARTIAL_FUNC_SPEC */
-
-/* BOOST_RE_NO_CAT                 Define if the compiler does not support POSIX style
-                             message categories (catopen catgets catclose). */
-/* #define BOOST_RE_NO_CAT */
-
-/* BOOST_RE_THREADS                Define if the compiler supports multiple threads in
-                             the current translation mode. */
-/* #define BOOST_RE_THREADS */
-
-/* BOOST_RE_NO_TEMPLATE_MERGE      If template in separate translation units don't merge at link time */
-/* #define BOOST_RE_NO_TEMPLATE_MERGE */
-
-/* BOOST_RE_NO_TEMPLATE_MERGE_A    If template merging from library archives is not supported */
-/* #define BOOST_RE_NO_TEMPLATE_MERGE_A */
-
-/* BOOST_RE_NO_TEMPLATE_SWITCH_MERGE If merging of templates containing switch statements is not supported */
-/* #define BOOST_RE_NO_TEMPLATE_SWITCH_MERGE */
-
-/* BOOST_RE_CALL                   Optionally define a calling convention for C++ functions */
-/* #define BOOST_RE_CALL */
-
-/* BOOST_RE_CCALL                  Optionally define a calling convention for C functions */
-/* #define BOOST_RE_CCALL */
-
-/* BOOST_RE_SIZEOF_SHORT           sizeof(short) */
-/* #define BOOST_RE_SIZEOF_SHORT */
-
-/* BOOST_RE_SIZEOF_INT             sizeof(int) */
-/* #define BOOST_RE_SIZEOF_INT */
-
-/* BOOST_RE_SIZEOF_LONG            sizeof(long) */
-/* #define BOOST_RE_SIZEOF_LONG */
-
-/* BOOST_RE_SIZEOF_WCHAR_T         sizeof(wchar_t) */
-/* #define BOOST_RE_SIZEOF_WCHAR_T */
-
-
-/* STL options: */
-
-/* BOOST_RE_NO_ITERATOR_H          Define if you do not have a version of <iterator>. */
-/* #define BOOST_RE_NO_ITERATOR_H */
-
-/* BOOST_NO_STD_ALLOCATOR    Define if <memory> does not fully comply with the
-                             latest standard, and is not auto-recognised,
-                             that means nested template classes
-                             which hardly any compilers support at present. */
-/* #define BOOST_NO_STD_ALLOCATOR */
-
-/* BOOST_RE_NO_LOCALE_H            Define if there is no verion of the standard
-                             <locale> header available. */
-/* #define BOOST_RE_NO_LOCALE_H */
-
-/* BOOST_RE_NO_STL                 Disables the use of any supporting STL code. */
-/* #define BOOST_RE_NO_STL */
-
-/* BOOST_RE_NO_NOT_EQUAL           Disables the generation of operator!= if this
-                             clashes with the STL version. */
-
-/* BOOST_RE_NO_STRING_DEF_ARGS     Define if std::basic_string<charT> not allowed - in
-                             other words if the template is missing its required
-                      default arguments. */
-/* #define BOOST_RE_NO_STRING_DEF_ARGS */
-
-/* BOOST_RE_USE_ALGO               If <algo.h> not <algorithm> is present */
-/* #define BOOST_RE_USE_ALGO */
-
-/* BOOST_RE_OLD_IOSTREAM           If the new iostreamm classes are not available */
-/* #define BOOST_RE_OLD_IOSTREAM */
-
-/* BOOST_NO_STD_DISTANCE             If there is no std::distance. */
-/* #define BOOST_NO_STD_DISTANCE */
-
-/* BOOST_RE_NO_OI_ASSIGN           If output iterators ostream_iterator<>, back_insert_iterator<> and 
-                             front_insert_iterator<> do not have assignment operators */
-/* #define BOOST_RE_NO_OI_ASSIGN */
-
-#include <stdexcept>
-
-#ifndef BOOST_RE_NO_ITERATOR_H
-#include <iterator>
-#ifdef BOOST_RE_USE_ALGO
-#include <algo.h>
-#else
-#include <algorithm>
-#endif
-#endif
-
-#endif // BOOST_RE_AUTO_CONFIGURE
-
-
-#endif /* BOOST_RE_OPT_H */
-
-
-
-
-
-
-
-
-
-
-

include/boost/regex/detail/regex_raw_buffer.hpp

@@ -26,7 +26,7 @@
 #define BOOST_REGEX_RAW_BUFFER_HPP
 
 #ifndef BOOST_REGEX_CONFIG_HPP
-#include <boost/regex/detail/regex_config.hpp>
+#include <boost/regex/config.hpp>
 #endif
 
 namespace boost{
@@ -105,7 +105,7 @@ class raw_storage
 {
 public:
    typedef Allocator allocator_type;
-   typedef typename boost::re_detail::rebind_allocator<unsigned char, allocator_type>::type alloc_inst_type;
+   typedef typename boost::detail::rebind_allocator<unsigned char, allocator_type>::type alloc_inst_type;
    typedef typename alloc_inst_type::size_type                                size_type;
    typedef typename alloc_inst_type::pointer                                  pointer;
 private:
@@ -127,9 +127,9 @@ public:
       alloc_inst.deallocate(start, (alloc_inst.last - start));
    }
 
-   void BOOST_RE_CALL resize(size_type n);
+   void BOOST_REGEX_CALL resize(size_type n);
    
-   void* BOOST_RE_CALL extend(size_type n)
+   void* BOOST_REGEX_CALL extend(size_type n)
    {
       if(size_type(alloc_inst.last - end) < n)
          resize(n + (end - start));
@@ -138,44 +138,44 @@ public:
       return result;
    }
 
-   void* BOOST_RE_CALL insert(size_type pos, size_type n);
+   void* BOOST_REGEX_CALL insert(size_type pos, size_type n);
 
-   size_type BOOST_RE_CALL size()
+   size_type BOOST_REGEX_CALL size()
    {
       return end - start;
    }
 
-   size_type BOOST_RE_CALL capacity()
+   size_type BOOST_REGEX_CALL capacity()
    {
       return alloc_inst.last - start;
    }
 
-   void* BOOST_RE_CALL data()const
+   void* BOOST_REGEX_CALL data()const
    {
       return start;
    }
 
-   size_type BOOST_RE_CALL index(void* ptr)
+   size_type BOOST_REGEX_CALL index(void* ptr)
    {
       return (unsigned char*)ptr - (unsigned char*)data();
    }
 
-   void BOOST_RE_CALL clear()
+   void BOOST_REGEX_CALL clear()
    {
       end = start;
    }
 
-   void BOOST_RE_CALL align()
+   void BOOST_REGEX_CALL align()
    {
       // move end up to a boundary:
       end = (unsigned char*)start + ((((unsigned char*)end - (unsigned char*)start) + padding_mask) & ~padding_mask);
    }
 
-   Allocator BOOST_RE_CALL allocator()const;
+   Allocator BOOST_REGEX_CALL allocator()const;
 };
 
 template <class Allocator>
-CONSTRUCTOR_INLINE raw_storage<Allocator>::raw_storage(const Allocator& a)
+raw_storage<Allocator>::raw_storage(const Allocator& a)
   : alloc_inst(a)
 {
   start = end = alloc_inst.allocate(1024);
@@ -183,7 +183,7 @@ CONSTRUCTOR_INLINE raw_storage<Allocator>::raw_storage(const Allocator& a)
 }
 
 template <class Allocator>
-CONSTRUCTOR_INLINE raw_storage<Allocator>::raw_storage(size_type n, const Allocator& a)
+raw_storage<Allocator>::raw_storage(size_type n, const Allocator& a)
   : alloc_inst(a)
 {
   start = end = alloc_inst.allocate(n);
@@ -191,13 +191,13 @@ CONSTRUCTOR_INLINE raw_storage<Allocator>::raw_storage(size_type n, const Alloca
 }
 
 template <class Allocator>
-Allocator BOOST_RE_CALL raw_storage<Allocator>::allocator()const
+Allocator BOOST_REGEX_CALL raw_storage<Allocator>::allocator()const
 {
   return alloc_inst;
 }
 
 template <class Allocator>
-void BOOST_RE_CALL raw_storage<Allocator>::resize(size_type n)
+void BOOST_REGEX_CALL raw_storage<Allocator>::resize(size_type n)
 {
    register size_type newsize = (alloc_inst.last - start) * 2;
    register size_type datasize = end - start;
@@ -220,7 +220,7 @@ void BOOST_RE_CALL raw_storage<Allocator>::resize(size_type n)
 }
 
 template <class Allocator>
-void* BOOST_RE_CALL raw_storage<Allocator>::insert(size_type pos, size_type n)
+void* BOOST_REGEX_CALL raw_storage<Allocator>::insert(size_type pos, size_type n)
 {
    jm_assert(pos <= size_type(end - start));
    if(size_type(alloc_inst.last - end) < n)

include/boost/regex/detail/regex_split.hpp

@@ -61,6 +61,10 @@ template <class OutputIterator, class charT, class Traits1, class Alloc1, class
 bool split_pred<OutputIterator, charT, Traits1, Alloc1, Alloc2>::operator()
    (const match_results<iterator_type, Alloc2>& what)
 {
+#ifdef BOOST_MSVC
+#  pragma warning(push)
+#  pragma warning(disable: 4800)
+#endif
    *p_last = what[0].second;
    if(what.size() > 1)
    {
@@ -86,6 +90,9 @@ bool split_pred<OutputIterator, charT, Traits1, Alloc1, Alloc2>::operator()
    //
    // initial null, do nothing:
    return true;
+#ifdef BOOST_MSVC
+#  pragma warning(pop)
+#endif
 }
 
 } // namespace re_detail

include/boost/regex/detail/regex_stack.hpp

@@ -26,7 +26,7 @@
 #define BOOST_REGEX_STACK_HPP
 
 #ifndef BOOST_REGEX_CONFIG_HPP
-#include <boost/regex/detail/regex_config.hpp>
+#include <boost/regex/config.hpp>
 #endif
 #ifndef BOOST_REGEX_RAW_BUFFER_HPP
 #include <boost/regex/detail/regex_raw_buffer.hpp>
@@ -44,12 +44,12 @@ namespace boost{
 // simplified stack optimised for push/peek/pop
 // operations, we could use std::stack<std::vector<T>> instead...
 //
-template <class T, class Allocator BOOST_RE_DEF_ALLOC_PARAM(T) >
+template <class T, class Allocator = BOOST_DEFAULT_ALLOCATOR(T) >
 class jstack
 {
 private:
-   typedef typename boost::re_detail::rebind_allocator<unsigned char, Allocator>::type allocator_type;
+   typedef typename boost::detail::rebind_allocator<unsigned char, Allocator>::type allocator_type;
-   typedef typename boost::re_detail::rebind_allocator<T, Allocator>::type             T_alloc_type;
+   typedef typename boost::detail::rebind_allocator<T, Allocator>::type             T_alloc_type;
    typedef typename T_alloc_type::size_type                              size_type;
    typedef T value_type;
    struct node
@@ -74,15 +74,15 @@ private:
    node base;
    size_type block_size;
 
-   void BOOST_RE_CALL pop_aux()const;
+   void BOOST_REGEX_CALL pop_aux()const;
-   void BOOST_RE_CALL push_aux();
+   void BOOST_REGEX_CALL push_aux();
 
 public:
    jstack(size_type n = 64, const Allocator& a = Allocator());
 
    ~jstack();
 
-   node* BOOST_RE_CALL get_node()
+   node* BOOST_REGEX_CALL get_node()
    {
       node* new_stack = (node*)alloc_inst.allocate(sizeof(node) + sizeof(T) * block_size);
       new_stack->last = (T*)(new_stack+1);
@@ -91,53 +91,53 @@ public:
       return new_stack;
    }
 
-   bool BOOST_RE_CALL empty()
+   bool BOOST_REGEX_CALL empty()
    {
       return (m_stack->start == m_stack->end) && (m_stack->next == 0);
    }
 
-   bool BOOST_RE_CALL good()
+   bool BOOST_REGEX_CALL good()
    {
       return (m_stack->start != m_stack->end) || (m_stack->next != 0);
    }
 
-   T& BOOST_RE_CALL peek()
+   T& BOOST_REGEX_CALL peek()
    {
       if(m_stack->start == m_stack->end)
          pop_aux();
       return *m_stack->end;
    }
 
-   const T& BOOST_RE_CALL peek()const
+   const T& BOOST_REGEX_CALL peek()const
    {
       if(m_stack->start == m_stack->end)
          pop_aux();
       return *m_stack->end;
    }
 
-   void BOOST_RE_CALL pop()
+   void BOOST_REGEX_CALL pop()
    {
       if(m_stack->start == m_stack->end)
          pop_aux();
-      jm_destroy(m_stack->end);
+      ::boost::re_detail::destroy(m_stack->end);
       ++(m_stack->end);
    }
 
-   void BOOST_RE_CALL pop(T& t)
+   void BOOST_REGEX_CALL pop(T& t)
    {
       if(m_stack->start == m_stack->end)
          pop_aux();
       t = *m_stack->end;
-      jm_destroy(m_stack->end);
+      ::boost::re_detail::destroy(m_stack->end);
       ++(m_stack->end);
    }
 
-   void BOOST_RE_CALL push(const T& t)
+   void BOOST_REGEX_CALL push(const T& t)
    {
       if(m_stack->end == m_stack->last)
          push_aux();
       --(m_stack->end);
-      jm_construct(m_stack->end, t);
+      construct(m_stack->end, t);
    }
 
 };
@@ -155,7 +155,7 @@ jstack<T, Allocator>::jstack(size_type n, const Allocator& a)
 }
 
 template <class T, class Allocator>
-void BOOST_RE_CALL jstack<T, Allocator>::push_aux()
+void BOOST_REGEX_CALL jstack<T, Allocator>::push_aux()
 {
    // make sure we have spare space on TOS:
    register node* new_node;
@@ -175,7 +175,7 @@ void BOOST_RE_CALL jstack<T, Allocator>::push_aux()
 }
 
 template <class T, class Allocator>
-void BOOST_RE_CALL jstack<T, Allocator>::pop_aux()const
+void BOOST_REGEX_CALL jstack<T, Allocator>::pop_aux()const
 {
    // make sure that we have a valid item
    // on TOS:

include/boost/regex/detail/regex_synch.hpp

@@ -26,20 +26,20 @@
 #define BOOST_REGEX_SYNCH_HPP
 
 #ifndef BOOST_REGEX_CONFIG_HPP
-#include <boost/regex/detail/regex_config.hpp>
+#include <boost/regex/config.hpp>
 #endif
 
-#if defined(BOOST_RE_PLATFORM_W32) && defined(BOOST_RE_THREADS)
+#if defined(BOOST_HAS_THREADS)
-#include <windows.h>
+#  if defined(BOOST_HAS_WINTHREADS)
-#endif
+#     include <windows.h>
-
+#  elif defined(BOOST_HAS_BETHREADS)
-#if !defined(BOOST_RE_PLATFORM_W32) && defined(BOOST_RE_THREADS) 
+#     include <OS.h>
-#if defined(__BEOS__)
+#     include <cassert>
-#include <OS.h>
+#  elif defined(BOOST_HAS_PTHREADS)
-#include <cassert>
+#     include <pthread.h>
-#else
+#  else
-#include <pthread.h>
+#     error "Unknown threading API"
-#endif
+#  endif
 #endif
 
 
@@ -50,65 +50,66 @@ namespace boost{
    #pragma option push -a4 -b -Ve -pc
 #endif
 
-void BOOST_RE_CALL re_init_threads();
+void BOOST_REGEX_CALL re_init_threads();
-void BOOST_RE_CALL re_free_threads();
+void BOOST_REGEX_CALL re_free_threads();
 
-#ifdef BOOST_RE_THREADS
+#ifdef BOOST_HAS_THREADS
 
-#ifndef BOOST_RE_PLATFORM_W32
+#  ifdef BOOST_HAS_BETHREADS
-#ifdef __BEOS__
 
 typedef sem_id CRITICAL_SECTION;
 
-inline void BOOST_RE_CALL InitializeCriticalSection(CRITICAL_SECTION* ps)
+inline void BOOST_REGEX_CALL InitializeCriticalSection(CRITICAL_SECTION* ps)
 {
     *ps = create_sem(1, "regex++");
     assert(*ps > 0);
 }
 
-inline void BOOST_RE_CALL DeleteCriticalSection(CRITICAL_SECTION* ps)
+inline void BOOST_REGEX_CALL DeleteCriticalSection(CRITICAL_SECTION* ps)
 {
     int t = delete_sem(*ps);
     assert(t == B_NO_ERROR);
 }
 
-inline void BOOST_RE_CALL EnterCriticalSection(CRITICAL_SECTION* ps)
+inline void BOOST_REGEX_CALL EnterCriticalSection(CRITICAL_SECTION* ps)
 {
    status_t t = acquire_sem(*ps);
    assert(t == B_NO_ERROR);
 }
 
-inline void BOOST_RE_CALL LeaveCriticalSection(CRITICAL_SECTION* ps)
+inline void BOOST_REGEX_CALL LeaveCriticalSection(CRITICAL_SECTION* ps)
 {
     status_t t = release_sem(*ps);
     assert(t == B_NO_ERROR);
 }
 
-#else // __BEOS__
+#  elif defined(BOOST_HAS_PTHREADS)
 
 typedef pthread_mutex_t CRITICAL_SECTION;
 
-inline void BOOST_RE_CALL InitializeCriticalSection(CRITICAL_SECTION* ps)
+inline void BOOST_REGEX_CALL InitializeCriticalSection(CRITICAL_SECTION* ps)
 {
    pthread_mutex_init(ps, 0);
 }
 
-inline void BOOST_RE_CALL DeleteCriticalSection(CRITICAL_SECTION* ps)
+inline void BOOST_REGEX_CALL DeleteCriticalSection(CRITICAL_SECTION* ps)
 {
    pthread_mutex_destroy(ps);
 }
 
-inline void BOOST_RE_CALL EnterCriticalSection(CRITICAL_SECTION* ps)
+inline void BOOST_REGEX_CALL EnterCriticalSection(CRITICAL_SECTION* ps)
 {
    pthread_mutex_lock(ps);
 }
 
-inline void BOOST_RE_CALL LeaveCriticalSection(CRITICAL_SECTION* ps)
+inline void BOOST_REGEX_CALL LeaveCriticalSection(CRITICAL_SECTION* ps)
 {
    pthread_mutex_unlock(ps);
 }
-#endif // __BEOS__
+
-#endif
+#  elif !defined(BOOST_HAS_WINTHREADS)
+#    error "Unknown threading API"
+#  endif
 
 template <class Lock>
 class lock_guard
@@ -121,7 +122,7 @@ public:
    ~lock_guard()
    { acquire(false); }
 
-   void BOOST_RE_CALL acquire(bool aq = true)
+   void BOOST_REGEX_CALL acquire(bool aq = true)
    {
       if(aq && !owned)
       {
@@ -151,7 +152,7 @@ public:
    critical_section(const critical_section&)
    { InitializeCriticalSection(&hmutex);}
 
-   const critical_section& BOOST_RE_CALL operator=(const critical_section&)
+   const critical_section& BOOST_REGEX_CALL operator=(const critical_section&)
    {return *this;}
 
    ~critical_section()
@@ -159,7 +160,7 @@ public:
 
 private:
 
-   void BOOST_RE_CALL acquire(bool aq)
+   void BOOST_REGEX_CALL acquire(bool aq)
    { if(aq) EnterCriticalSection(&hmutex);
       else LeaveCriticalSection(&hmutex);
    }
@@ -173,20 +174,20 @@ public:
    friend class lock_guard<critical_section>;
 };
 
-inline bool BOOST_RE_CALL operator==(const critical_section&, const critical_section&)
+inline bool BOOST_REGEX_CALL operator==(const critical_section&, const critical_section&)
 {
    return false;
 }
 
-inline bool BOOST_RE_CALL operator<(const critical_section&, const critical_section&)
+inline bool BOOST_REGEX_CALL operator<(const critical_section&, const critical_section&)
 {
    return true;
 }
 
 typedef lock_guard<critical_section> cs_guard;
 
-BOOST_RE_IX_DECL extern critical_section* p_re_lock;
+BOOST_REGEX_DECL extern critical_section* p_re_lock;
-BOOST_RE_IX_DECL extern unsigned int re_lock_count;
+BOOST_REGEX_DECL extern unsigned int re_lock_count;
 
 #define BOOST_RE_GUARD(inst) boost::re_detail::critical_section::rw_guard g(inst);
 

include/boost/regex/pattern_except.hpp

@@ -23,7 +23,7 @@
 #ifndef BOOST_RE_PAT_EXCEPT_HPP
 #define BOOST_RE_PAT_EXCEPT_HPP
 
-#include <boost/regex/detail/regex_config.hpp>
+#include <boost/regex/config.hpp>
 
 namespace boost{
 
@@ -31,14 +31,14 @@ namespace boost{
    #pragma option push -a4 -b -Ve -pc
 #endif
 
-class BOOST_RE_IX_DECL bad_pattern : public std::runtime_error
+class BOOST_REGEX_DECL bad_pattern : public std::runtime_error
 {
 public:
    explicit bad_pattern(const std::string& s) : std::runtime_error(s){};
    ~bad_pattern() throw();
 };
 
-class BOOST_RE_IX_DECL bad_expression : public bad_pattern
+class BOOST_REGEX_DECL bad_expression : public bad_pattern
 {
 public:
    explicit bad_expression(const std::string& s) : bad_pattern(s) {}

include/boost/regex/regex_traits.hpp

@@ -43,20 +43,20 @@ struct mss
    const char* what;
 };
 
-BOOST_RE_IX_DECL bool BOOST_RE_CALL re_lookup_def_collate_name(std::string& buf, const char* name);
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL re_lookup_def_collate_name(std::string& buf, const char* name);
-BOOST_RE_IX_DECL unsigned int BOOST_RE_CALL re_get_default_message(char* buf, unsigned int len, unsigned int id);
+BOOST_REGEX_DECL unsigned int BOOST_REGEX_CALL re_get_default_message(char* buf, unsigned int len, unsigned int id);
-extern BOOST_RE_IX_DECL const char *re_default_error_messages[];
+extern BOOST_REGEX_DECL const char *re_default_error_messages[];
-BOOST_RE_IX_DECL bool BOOST_RE_CALL re_lookup_def_collate_name(std::string& buf, const char* name);
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL re_lookup_def_collate_name(std::string& buf, const char* name);
-BOOST_RE_IX_DECL bool BOOST_RE_CALL is_combining(wchar_t c);
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL is_combining(wchar_t c);
-//extern BOOST_RE_IX_DECL const wchar_t combining_ranges[];
+//extern BOOST_REGEX_DECL const wchar_t combining_ranges[];
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
-extern BOOST_RE_IX_DECL wchar_t wide_lower_case_map[];
+extern BOOST_REGEX_DECL wchar_t wide_lower_case_map[];
-extern BOOST_RE_IX_DECL unsigned short wide_unicode_classes[];
+extern BOOST_REGEX_DECL unsigned short wide_unicode_classes[];
 #endif
 
 
-struct BOOST_RE_IX_DECL regex_traits_base
+struct BOOST_REGEX_DECL regex_traits_base
 {
    enum char_syntax_type
    {
@@ -121,7 +121,7 @@ struct BOOST_RE_IX_DECL regex_traits_base
    };
 };
 
-struct BOOST_RE_IX_DECL c_traits_base : public regex_traits_base
+struct BOOST_REGEX_DECL c_traits_base : public regex_traits_base
 {
 public:
    enum{
@@ -143,7 +143,7 @@ public:
       char_class_print = char_class_alpha | char_class_digit | char_class_punct | char_class_underscore | char_class_blank,
       char_class_word = char_class_alpha | char_class_digit | char_class_underscore
    };
-   static std::string BOOST_RE_CALL set_message_catalogue(const std::string& s);
+   static std::string BOOST_REGEX_CALL set_message_catalogue(const std::string& s);
 protected:
 #if defined(__MWERKS__) && __MWERKS__ <= 0x6000
    friend class c_regex_traits<char>;
@@ -160,20 +160,20 @@ protected:
    static unsigned short class_map[map_size];
    static char lower_case_map[map_size];
 
-   static boost::uint_fast32_t BOOST_RE_CALL do_lookup_class(const char* p);
+   static boost::uint_fast32_t BOOST_REGEX_CALL do_lookup_class(const char* p);
-   static bool BOOST_RE_CALL do_lookup_collate(std::string& buf, const char* p);
+   static bool BOOST_REGEX_CALL do_lookup_collate(std::string& buf, const char* p);
-   static void BOOST_RE_CALL do_update_ctype();
+   static void BOOST_REGEX_CALL do_update_ctype();
-   static void BOOST_RE_CALL do_update_collate();
+   static void BOOST_REGEX_CALL do_update_collate();
 public:
-   static std::string BOOST_RE_CALL error_string(unsigned id);
+   static std::string BOOST_REGEX_CALL error_string(unsigned id);
-   static char* BOOST_RE_CALL get_catalogue() { return regex_message_catalogue; }
+   static char* BOOST_REGEX_CALL get_catalogue() { return regex_message_catalogue; }
 };
 
 } // namespace re_detail
 
 
 template<>
-class BOOST_RE_IX_DECL c_regex_traits<char> : public re_detail::c_traits_base
+class BOOST_REGEX_DECL c_regex_traits<char> : public re_detail::c_traits_base
 {
    typedef re_detail::c_traits_base base_type;
 public:
@@ -183,54 +183,54 @@ public:
    typedef std::string string_type;
    typedef int locale_type;
 
-   static std::size_t BOOST_RE_CALL length(const char_type* p)
+   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
    {
       return std::strlen(p);
    }
-   static unsigned int BOOST_RE_CALL syntax_type(size_type c)
+   static unsigned int BOOST_REGEX_CALL syntax_type(size_type c)
    {
       return syntax_map[c];
    }
-   static char BOOST_RE_CALL translate(char c, bool icase)
+   static char BOOST_REGEX_CALL translate(char c, bool icase)
    {
       return icase ? lower_case_map[(size_type)(uchar_type)c] : c;
    }
-   static void BOOST_RE_CALL transform(std::string& out, const std::string& in);
+   static void BOOST_REGEX_CALL transform(std::string& out, const std::string& in);
 
-   static void BOOST_RE_CALL transform_primary(std::string& out, const std::string& in);
+   static void BOOST_REGEX_CALL transform_primary(std::string& out, const std::string& in);
 
-   static bool BOOST_RE_CALL is_separator(char c)
+   static bool BOOST_REGEX_CALL is_separator(char c)
    {
-      return BOOST_RE_MAKE_BOOL((c == '\n') || (c == '\r'));
+      return BOOST_REGEX_MAKE_BOOL((c == '\n') || (c == '\r'));
    }
 
-   static bool BOOST_RE_CALL is_combining(char)
+   static bool BOOST_REGEX_CALL is_combining(char)
    {
       return false;
    }
    
-   static bool BOOST_RE_CALL is_class(char c, boost::uint_fast32_t f)
+   static bool BOOST_REGEX_CALL is_class(char c, boost::uint_fast32_t f)
    {
-      return BOOST_RE_MAKE_BOOL(class_map[(size_type)(uchar_type)c] & f);
+      return BOOST_REGEX_MAKE_BOOL(class_map[(size_type)(uchar_type)c] & f);
    }
 
-   static int BOOST_RE_CALL toi(char c);
+   static int BOOST_REGEX_CALL toi(char c);
-   static int BOOST_RE_CALL toi(const char*& first, const char* last, int radix);
+   static int BOOST_REGEX_CALL toi(const char*& first, const char* last, int radix);
 
-   static boost::uint_fast32_t BOOST_RE_CALL lookup_classname(const char* first, const char* last)
+   static boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const char* first, const char* last)
    {
       std::string s(first, last);
       return do_lookup_class(s.c_str());
    }
 
-   static bool BOOST_RE_CALL lookup_collatename(std::string& buf, const char* first, const char* last)
+   static bool BOOST_REGEX_CALL lookup_collatename(std::string& buf, const char* first, const char* last)
    {
       std::string s(first, last);
       return do_lookup_collate(buf, s.c_str());
    }
 
-   static locale_type BOOST_RE_CALL imbue(locale_type l){ return l; }
+   static locale_type BOOST_REGEX_CALL imbue(locale_type l){ return l; }
-   locale_type BOOST_RE_CALL getloc()const{ return locale_type(); }
+   locale_type BOOST_REGEX_CALL getloc()const{ return locale_type(); }
 
    c_regex_traits()
    {
@@ -246,19 +246,19 @@ public:
       { c_regex_traits<char>::update(); }
       operator void*() { return this; }
    };
-   static void BOOST_RE_CALL update();
+   static void BOOST_REGEX_CALL update();
 private:
-   static void BOOST_RE_CALL init();
+   static void BOOST_REGEX_CALL init();
-   static void BOOST_RE_CALL free();
+   static void BOOST_REGEX_CALL free();
    static c_regex_traits<char> i;
 
    static unsigned sort_type;
    static char sort_delim;
 };
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 template<>
-class BOOST_RE_IX_DECL c_regex_traits<wchar_t> : public re_detail::c_traits_base
+class BOOST_REGEX_DECL c_regex_traits<wchar_t> : public re_detail::c_traits_base
 {
    typedef re_detail::c_traits_base base_type;
 public:
@@ -267,42 +267,42 @@ public:
    typedef unsigned int size_type;
    typedef std::basic_string<wchar_t> string_type;
    typedef int locale_type; 
-   static std::size_t BOOST_RE_CALL length(const char_type* p)
+   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
    {
       return std::wcslen(p);
    }
-   static unsigned int BOOST_RE_CALL syntax_type(size_type c);
+   static unsigned int BOOST_REGEX_CALL syntax_type(size_type c);
-   static wchar_t BOOST_RE_CALL translate(wchar_t c, bool icase)
+   static wchar_t BOOST_REGEX_CALL translate(wchar_t c, bool icase)
    {
       return icase ? ((c < 256) ? re_detail::wide_lower_case_map[(uchar_type)c] : std::towlower(c)) : c;
    }
 
-   static void BOOST_RE_CALL transform(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in);
+   static void BOOST_REGEX_CALL transform(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in);
 
-   static void BOOST_RE_CALL transform_primary(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in);
+   static void BOOST_REGEX_CALL transform_primary(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in);
 
-   static bool BOOST_RE_CALL is_separator(wchar_t c)
+   static bool BOOST_REGEX_CALL is_separator(wchar_t c)
    {
-      return BOOST_RE_MAKE_BOOL((c == L'\n') || (c == L'\r') || (c == (wchar_t)0x2028) || (c == (wchar_t)0x2029));
+      return BOOST_REGEX_MAKE_BOOL((c == L'\n') || (c == L'\r') || (c == (wchar_t)0x2028) || (c == (wchar_t)0x2029));
    }
 
-   static bool BOOST_RE_CALL is_combining(wchar_t c)
+   static bool BOOST_REGEX_CALL is_combining(wchar_t c)
    { return re_detail::is_combining(c); }
    
-   static bool BOOST_RE_CALL is_class(wchar_t c, boost::uint_fast32_t f)
+   static bool BOOST_REGEX_CALL is_class(wchar_t c, boost::uint_fast32_t f)
    {
-      return BOOST_RE_MAKE_BOOL(((uchar_type)c < 256) ? (re_detail::wide_unicode_classes[(size_type)(uchar_type)c] & f) : do_iswclass(c, f));
+      return BOOST_REGEX_MAKE_BOOL(((uchar_type)c < 256) ? (re_detail::wide_unicode_classes[(size_type)(uchar_type)c] & f) : do_iswclass(c, f));
    }
 
-   static int BOOST_RE_CALL toi(wchar_t c);
+   static int BOOST_REGEX_CALL toi(wchar_t c);
-   static int BOOST_RE_CALL toi(const wchar_t*& first, const wchar_t* last, int radix);
+   static int BOOST_REGEX_CALL toi(const wchar_t*& first, const wchar_t* last, int radix);
 
-   static boost::uint_fast32_t BOOST_RE_CALL lookup_classname(const wchar_t* first, const wchar_t* last);
+   static boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const wchar_t* first, const wchar_t* last);
 
-   static bool BOOST_RE_CALL lookup_collatename(std::basic_string<wchar_t>& s, const wchar_t* first, const wchar_t* last);
+   static bool BOOST_REGEX_CALL lookup_collatename(std::basic_string<wchar_t>& s, const wchar_t* first, const wchar_t* last);
 
-   static locale_type BOOST_RE_CALL imbue(locale_type l){ return l; }
+   static locale_type BOOST_REGEX_CALL imbue(locale_type l){ return l; }
-   locale_type BOOST_RE_CALL getloc()const{ return locale_type(); }
+   locale_type BOOST_REGEX_CALL getloc()const{ return locale_type(); }
    c_regex_traits<wchar_t>()
    { init(); }
    ~c_regex_traits<wchar_t>()
@@ -313,14 +313,14 @@ public:
       { c_regex_traits<wchar_t>::update(); }
       operator void*() { return this; }
    };
-   static void BOOST_RE_CALL update();
+   static void BOOST_REGEX_CALL update();
-   static unsigned int BOOST_RE_CALL strnarrow(char *s1, unsigned int len, const wchar_t *s2);
+   static unsigned int BOOST_REGEX_CALL strnarrow(char *s1, unsigned int len, const wchar_t *s2);
-   static unsigned int BOOST_RE_CALL strwiden(wchar_t *s1, unsigned int len, const char *s2);
+   static unsigned int BOOST_REGEX_CALL strwiden(wchar_t *s1, unsigned int len, const char *s2);
 private:
-   static bool BOOST_RE_CALL do_iswclass(wchar_t c, boost::uint_fast32_t f);
+   static bool BOOST_REGEX_CALL do_iswclass(wchar_t c, boost::uint_fast32_t f);
-   static void BOOST_RE_CALL free();
+   static void BOOST_REGEX_CALL free();
-   static void BOOST_RE_CALL init();
+   static void BOOST_REGEX_CALL init();
-   static bool BOOST_RE_CALL do_lookup_collate(std::basic_string<wchar_t>& out, const wchar_t* first, const wchar_t* last);
+   static bool BOOST_REGEX_CALL do_lookup_collate(std::basic_string<wchar_t>& out, const wchar_t* first, const wchar_t* last);
    static c_regex_traits<wchar_t> init_;
 
    static unsigned sort_type;
@@ -328,11 +328,11 @@ private:
 };
 #endif
 
-#if defined(_WIN32) && !defined(BOOST_RE_NO_W32)
+#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
 
 namespace re_detail{
 
-struct BOOST_RE_IX_DECL w32_traits_base : public regex_traits_base
+struct BOOST_REGEX_DECL w32_traits_base : public regex_traits_base
 {
    enum{
    char_class_none = 0,
@@ -354,7 +354,7 @@ struct BOOST_RE_IX_DECL w32_traits_base : public regex_traits_base
    char_class_win = C1_ALPHA | C1_CNTRL | C1_UPPER | C1_LOWER | C1_DIGIT | C1_PUNCT | C1_BLANK | C1_SPACE | C1_XDIGIT | C1_BLANK
    };
 public:
-   static std::string BOOST_RE_CALL set_message_catalogue(const std::string& s);
+   static std::string BOOST_REGEX_CALL set_message_catalogue(const std::string& s);
 protected:
    static char regex_message_catalogue[200];
    enum syntax_map_size
@@ -366,13 +366,13 @@ protected:
    static unsigned short class_map[map_size];
    static char lower_case_map[map_size];
 
-   static boost::uint_fast32_t BOOST_RE_CALL do_lookup_class(const char* p);
+   static boost::uint_fast32_t BOOST_REGEX_CALL do_lookup_class(const char* p);
-   static bool BOOST_RE_CALL do_lookup_collate(std::string& buf, const char* p);
+   static bool BOOST_REGEX_CALL do_lookup_collate(std::string& buf, const char* p);
-   static void BOOST_RE_CALL do_free();
+   static void BOOST_REGEX_CALL do_free();
-   static void BOOST_RE_CALL do_init();
+   static void BOOST_REGEX_CALL do_init();
 public:
-   static std::string BOOST_RE_CALL error_string(unsigned id);
+   static std::string BOOST_REGEX_CALL error_string(unsigned id);
-   static char* BOOST_RE_CALL get_catalogue() { return regex_message_catalogue; }
+   static char* BOOST_REGEX_CALL get_catalogue() { return regex_message_catalogue; }
 };
 
 } // namespace re_detail
@@ -381,7 +381,7 @@ template<class charT>
 class w32_regex_traits;
 
 template<>
-class BOOST_RE_IX_DECL w32_regex_traits<char> : public re_detail::w32_traits_base
+class BOOST_REGEX_DECL w32_regex_traits<char> : public re_detail::w32_traits_base
 {
    typedef re_detail::w32_traits_base base_type;
 public:
@@ -391,54 +391,54 @@ public:
    typedef std::string string_type;
    typedef int locale_type;
 
-   static std::size_t BOOST_RE_CALL length(const char_type* p)
+   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
    {
       return std::strlen(p);
    }
-   static unsigned int BOOST_RE_CALL syntax_type(size_type c)
+   static unsigned int BOOST_REGEX_CALL syntax_type(size_type c)
    {
       return syntax_map[c];
    }
-   static char BOOST_RE_CALL translate(char c, bool icase)
+   static char BOOST_REGEX_CALL translate(char c, bool icase)
    {
       return icase ? lower_case_map[(size_type)(uchar_type)c] : c;
    }
-   static void BOOST_RE_CALL transform(std::string& out, const std::string& in);
+   static void BOOST_REGEX_CALL transform(std::string& out, const std::string& in);
 
-   static void BOOST_RE_CALL transform_primary(std::string& out, const std::string& in);
+   static void BOOST_REGEX_CALL transform_primary(std::string& out, const std::string& in);
 
-   static bool BOOST_RE_CALL is_separator(char c)
+   static bool BOOST_REGEX_CALL is_separator(char c)
    {
-      return BOOST_RE_MAKE_BOOL((c == '\n') || (c == '\r'));
+      return BOOST_REGEX_MAKE_BOOL((c == '\n') || (c == '\r'));
    }
 
-   static bool BOOST_RE_CALL is_combining(char)
+   static bool BOOST_REGEX_CALL is_combining(char)
    {
       return false;
    }
    
-   static bool BOOST_RE_CALL is_class(char c, boost::uint_fast32_t f)
+   static bool BOOST_REGEX_CALL is_class(char c, boost::uint_fast32_t f)
    {
-      return BOOST_RE_MAKE_BOOL(class_map[(size_type)(uchar_type)c] & f);
+      return BOOST_REGEX_MAKE_BOOL(class_map[(size_type)(uchar_type)c] & f);
    }
 
-   static int BOOST_RE_CALL toi(char c);
+   static int BOOST_REGEX_CALL toi(char c);
-   static int BOOST_RE_CALL toi(const char*& first, const char* last, int radix);
+   static int BOOST_REGEX_CALL toi(const char*& first, const char* last, int radix);
 
-   static boost::uint_fast32_t BOOST_RE_CALL lookup_classname(const char* first, const char* last)
+   static boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const char* first, const char* last)
    {
       std::string s(first, last);
       return do_lookup_class(s.c_str());
    }
 
-   static bool BOOST_RE_CALL lookup_collatename(std::string& buf, const char* first, const char* last)
+   static bool BOOST_REGEX_CALL lookup_collatename(std::string& buf, const char* first, const char* last)
    {
       std::string s(first, last);
       return do_lookup_collate(buf, s.c_str());
    }
 
-   static locale_type BOOST_RE_CALL imbue(locale_type l){ return l; }
+   static locale_type BOOST_REGEX_CALL imbue(locale_type l){ return l; }
-   locale_type BOOST_RE_CALL getloc()const{ return locale_type(); }
+   locale_type BOOST_REGEX_CALL getloc()const{ return locale_type(); }
 
    struct sentry
    {
@@ -447,16 +447,16 @@ public:
       ~sentry(){}
       operator void*() { return this; }
    };
-   static void BOOST_RE_CALL update();
+   static void BOOST_REGEX_CALL update();
    w32_regex_traits();
    ~w32_regex_traits();
 private:
    static w32_regex_traits<char> i;
 };
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 template<>
-class BOOST_RE_IX_DECL w32_regex_traits<wchar_t> : public re_detail::w32_traits_base
+class BOOST_REGEX_DECL w32_regex_traits<wchar_t> : public re_detail::w32_traits_base
 {
    typedef re_detail::w32_traits_base base_type;
 public:
@@ -465,42 +465,42 @@ public:
    typedef unsigned int size_type;
    typedef std::basic_string<wchar_t> string_type;
    typedef int locale_type; 
-   static std::size_t BOOST_RE_CALL length(const char_type* p)
+   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
    {
       return std::wcslen(p);
    }
-   static unsigned int BOOST_RE_CALL syntax_type(size_type c);
+   static unsigned int BOOST_REGEX_CALL syntax_type(size_type c);
-   static wchar_t BOOST_RE_CALL translate(wchar_t c, bool icase)
+   static wchar_t BOOST_REGEX_CALL translate(wchar_t c, bool icase)
    {
       return icase ? ((c < 256) ? re_detail::wide_lower_case_map[(uchar_type)c] : wtolower(c)) : c;
    }
 
-   static void BOOST_RE_CALL transform(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in);
+   static void BOOST_REGEX_CALL transform(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in);
 
-   static void BOOST_RE_CALL transform_primary(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in);
+   static void BOOST_REGEX_CALL transform_primary(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in);
 
-   static bool BOOST_RE_CALL is_separator(wchar_t c)
+   static bool BOOST_REGEX_CALL is_separator(wchar_t c)
    {
-      return BOOST_RE_MAKE_BOOL((c == L'\n') || (c == L'\r') || (c == (wchar_t)0x2028) || (c == (wchar_t)0x2029));
+      return BOOST_REGEX_MAKE_BOOL((c == L'\n') || (c == L'\r') || (c == (wchar_t)0x2028) || (c == (wchar_t)0x2029));
    }
 
-   static bool BOOST_RE_CALL is_combining(wchar_t c)
+   static bool BOOST_REGEX_CALL is_combining(wchar_t c)
    { return re_detail::is_combining(c); }
    
-   static bool BOOST_RE_CALL is_class(wchar_t c, boost::uint_fast32_t f)
+   static bool BOOST_REGEX_CALL is_class(wchar_t c, boost::uint_fast32_t f)
    {
-      return BOOST_RE_MAKE_BOOL(((uchar_type)c < 256) ? (wide_unicode_classes[(size_type)(uchar_type)c] & f) : do_iswclass(c, f));
+      return BOOST_REGEX_MAKE_BOOL(((uchar_type)c < 256) ? (wide_unicode_classes[(size_type)(uchar_type)c] & f) : do_iswclass(c, f));
    }
 
-   static int BOOST_RE_CALL toi(wchar_t c);
+   static int BOOST_REGEX_CALL toi(wchar_t c);
-   static int BOOST_RE_CALL toi(const wchar_t*& first, const wchar_t* last, int radix);
+   static int BOOST_REGEX_CALL toi(const wchar_t*& first, const wchar_t* last, int radix);
 
-   static boost::uint_fast32_t BOOST_RE_CALL lookup_classname(const wchar_t* first, const wchar_t* last);
+   static boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const wchar_t* first, const wchar_t* last);
 
-   static bool BOOST_RE_CALL lookup_collatename(std::basic_string<wchar_t>& s, const wchar_t* first, const wchar_t* last);
+   static bool BOOST_REGEX_CALL lookup_collatename(std::basic_string<wchar_t>& s, const wchar_t* first, const wchar_t* last);
 
-   static locale_type BOOST_RE_CALL imbue(locale_type l){ return l; }
+   static locale_type BOOST_REGEX_CALL imbue(locale_type l){ return l; }
-   locale_type BOOST_RE_CALL getloc()const{ return locale_type(); }
+   locale_type BOOST_REGEX_CALL getloc()const{ return locale_type(); }
 
    struct sentry
    {
@@ -509,23 +509,23 @@ public:
       ~sentry(){}
       operator void*() { return this; }
    };
-   static void BOOST_RE_CALL update();
+   static void BOOST_REGEX_CALL update();
    w32_regex_traits();
    ~w32_regex_traits();
-   static unsigned int BOOST_RE_CALL strnarrow(char *s1, unsigned int len, const wchar_t *s2);
+   static unsigned int BOOST_REGEX_CALL strnarrow(char *s1, unsigned int len, const wchar_t *s2);
-   static unsigned int BOOST_RE_CALL strwiden(wchar_t *s1, unsigned int len, const char *s2);
+   static unsigned int BOOST_REGEX_CALL strwiden(wchar_t *s1, unsigned int len, const char *s2);
 
 private:
-   static bool BOOST_RE_CALL do_iswclass(wchar_t c, boost::uint_fast32_t f);
+   static bool BOOST_REGEX_CALL do_iswclass(wchar_t c, boost::uint_fast32_t f);
-   static bool BOOST_RE_CALL do_lookup_collate(std::basic_string<wchar_t>& out, const wchar_t* first, const wchar_t* last);
+   static bool BOOST_REGEX_CALL do_lookup_collate(std::basic_string<wchar_t>& out, const wchar_t* first, const wchar_t* last);
    static w32_regex_traits<wchar_t> init_;
-   static wchar_t BOOST_RE_CALL wtolower(wchar_t c);
+   static wchar_t BOOST_REGEX_CALL wtolower(wchar_t c);
    static unsigned short wide_unicode_classes[];
 };
 #endif // Wide strings
 #endif // Win32
 
-#ifndef BOOST_RE_NO_LOCALE_H
+#ifndef BOOST_NO_STD_LOCALE
 
 } // namspace boost
 
@@ -545,7 +545,7 @@ struct message_data<char>;
 template <>
 struct message_data<wchar_t>;
 
-struct BOOST_RE_IX_DECL cpp_regex_traits_base : public regex_traits_base
+struct BOOST_REGEX_DECL cpp_regex_traits_base : public regex_traits_base
 {
    enum char_class_type
    {
@@ -571,7 +571,7 @@ struct BOOST_RE_IX_DECL cpp_regex_traits_base : public regex_traits_base
                          | char_class_upper | char_class_xdigit
    };
 
-   static std::string BOOST_RE_CALL set_message_catalogue(const std::string& s);
+   static std::string BOOST_REGEX_CALL set_message_catalogue(const std::string& s);
 protected:
    static char regex_message_cat[200];
 };
@@ -582,7 +582,7 @@ template <class charT>
 class cpp_regex_traits;
 
 template<>
-class BOOST_RE_IX_DECL cpp_regex_traits<char> : public re_detail::cpp_regex_traits_base
+class BOOST_REGEX_DECL cpp_regex_traits<char> : public re_detail::cpp_regex_traits_base
 {
    typedef re_detail::cpp_regex_traits_base base_type;
 private:
@@ -608,36 +608,36 @@ public:
    cpp_regex_traits();
    ~cpp_regex_traits();
 
-   static std::size_t BOOST_RE_CALL length(const char_type* p)
+   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
    {
       return std::strlen(p);
    }
-   unsigned int BOOST_RE_CALL syntax_type(size_type c)const
+   unsigned int BOOST_REGEX_CALL syntax_type(size_type c)const
    {
       return psyntax[c];
    }
-   char BOOST_RE_CALL translate(char c, bool icase)const
+   char BOOST_REGEX_CALL translate(char c, bool icase)const
    {
       return icase ? lower_map[(size_type)(uchar_type)c] : c;
    }
-   void BOOST_RE_CALL transform(std::string& out, const std::string& in)const
+   void BOOST_REGEX_CALL transform(std::string& out, const std::string& in)const
    {
       out = pcollate->transform(in.c_str(), in.c_str() + in.size()).c_str();
    }
 
-   void BOOST_RE_CALL transform_primary(std::string& out, const std::string& in)const;
+   void BOOST_REGEX_CALL transform_primary(std::string& out, const std::string& in)const;
 
-   static bool BOOST_RE_CALL is_separator(char c)
+   static bool BOOST_REGEX_CALL is_separator(char c)
    {
-      return BOOST_RE_MAKE_BOOL((c == '\n') || (c == '\r'));
+      return BOOST_REGEX_MAKE_BOOL((c == '\n') || (c == '\r'));
    }
 
-   static bool BOOST_RE_CALL is_combining(char)
+   static bool BOOST_REGEX_CALL is_combining(char)
    {
       return false;
    }
    
-   bool BOOST_RE_CALL is_class(char c, boost::uint_fast32_t f)const
+   bool BOOST_REGEX_CALL is_class(char c, boost::uint_fast32_t f)const
    {
       if(pctype->is((std::ctype<char>::mask)(f & char_class_all_base), c))
          return true;
@@ -648,15 +648,15 @@ public:
       return false;
    }
 
-   int BOOST_RE_CALL toi(char c)const;
+   int BOOST_REGEX_CALL toi(char c)const;
-   int BOOST_RE_CALL toi(const char*& first, const char* last, int radix)const;
+   int BOOST_REGEX_CALL toi(const char*& first, const char* last, int radix)const;
 
-   boost::uint_fast32_t BOOST_RE_CALL lookup_classname(const char* first, const char* last)const;
+   boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const char* first, const char* last)const;
-   bool BOOST_RE_CALL lookup_collatename(std::string& s, const char* first, const char* last)const;
+   bool BOOST_REGEX_CALL lookup_collatename(std::string& s, const char* first, const char* last)const;
 
-   std::string BOOST_RE_CALL error_string(unsigned id)const;
+   std::string BOOST_REGEX_CALL error_string(unsigned id)const;
-   locale_type BOOST_RE_CALL imbue(locale_type l);
+   locale_type BOOST_REGEX_CALL imbue(locale_type l);
-   locale_type BOOST_RE_CALL BOOST_RE_CALL getloc()const{ return locale_inst; }
+   locale_type BOOST_REGEX_CALL getloc()const{ return locale_inst; }
 
    struct sentry
    {
@@ -665,9 +665,9 @@ public:
    };
 };
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 template<>
-class BOOST_RE_IX_DECL cpp_regex_traits<wchar_t> : public re_detail::cpp_regex_traits_base
+class BOOST_REGEX_DECL cpp_regex_traits<wchar_t> : public re_detail::cpp_regex_traits_base
 {
    typedef re_detail::cpp_regex_traits_base base_type;
 public:
@@ -685,7 +685,7 @@ private:
    const std::collate<wchar_t>* pcollate;
    const std::codecvt<wchar_t, char, std::mbstate_t>* pcdv;
    std::locale locale_inst;
-   unsigned int BOOST_RE_CALL do_syntax_type(size_type c)const;
+   unsigned int BOOST_REGEX_CALL do_syntax_type(size_type c)const;
    unsigned sort_type;
    wchar_t sort_delim;
 
@@ -694,34 +694,34 @@ private:
 
 public:
 
-   static std::size_t BOOST_RE_CALL length(const char_type* p)
+   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
    {
       return std::wcslen(p);
    }
-   unsigned int BOOST_RE_CALL syntax_type(size_type c)const
+   unsigned int BOOST_REGEX_CALL syntax_type(size_type c)const
    {
       return (c < UCHAR_MAX) ? psyntax[c] : do_syntax_type(c);
    }
-   wchar_t BOOST_RE_CALL translate(wchar_t c, bool icase)const
+   wchar_t BOOST_REGEX_CALL translate(wchar_t c, bool icase)const
    {
       return icase ? (((uchar_type)c) <= UCHAR_MAX) ? lower_map[c] : pctype->tolower(c) : c;
    }
-   void BOOST_RE_CALL transform(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in)const
+   void BOOST_REGEX_CALL transform(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in)const
    {
       out = pcollate->transform(in.c_str(), in.c_str() + in.size());
    }
 
-   void BOOST_RE_CALL transform_primary(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in)const;
+   void BOOST_REGEX_CALL transform_primary(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in)const;
 
-   static bool BOOST_RE_CALL is_separator(wchar_t c)
+   static bool BOOST_REGEX_CALL is_separator(wchar_t c)
    {
-      return BOOST_RE_MAKE_BOOL((c == L'\n') || (c == L'\r') || (c == (wchar_t)0x2028) || (c == (wchar_t)0x2029));
+      return BOOST_REGEX_MAKE_BOOL((c == L'\n') || (c == L'\r') || (c == (wchar_t)0x2028) || (c == (wchar_t)0x2029));
    }
 
-   static bool BOOST_RE_CALL is_combining(wchar_t c)
+   static bool BOOST_REGEX_CALL is_combining(wchar_t c)
    { return re_detail::is_combining(c); }
    
-   bool BOOST_RE_CALL is_class(wchar_t c, boost::uint_fast32_t f)const
+   bool BOOST_REGEX_CALL is_class(wchar_t c, boost::uint_fast32_t f)const
    {
       if(pctype->is((std::ctype<wchar_t>::mask)(f & char_class_all_base), c))
          return true;
@@ -734,18 +734,18 @@ public:
       return false;
    }
 
-   int BOOST_RE_CALL toi(wchar_t c)const;
+   int BOOST_REGEX_CALL toi(wchar_t c)const;
-   int BOOST_RE_CALL toi(const wchar_t*& first, const wchar_t* last, int radix)const;
+   int BOOST_REGEX_CALL toi(const wchar_t*& first, const wchar_t* last, int radix)const;
 
-   boost::uint_fast32_t BOOST_RE_CALL lookup_classname(const wchar_t* first, const wchar_t* last)const;
+   boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const wchar_t* first, const wchar_t* last)const;
-   bool BOOST_RE_CALL lookup_collatename(std::basic_string<wchar_t>& s, const wchar_t* first, const wchar_t* last)const;
+   bool BOOST_REGEX_CALL lookup_collatename(std::basic_string<wchar_t>& s, const wchar_t* first, const wchar_t* last)const;
 
-   std::string BOOST_RE_CALL error_string(unsigned id)const;
+   std::string BOOST_REGEX_CALL error_string(unsigned id)const;
    cpp_regex_traits();
    ~cpp_regex_traits();
-   locale_type BOOST_RE_CALL imbue(locale_type l);
+   locale_type BOOST_REGEX_CALL imbue(locale_type l);
-   locale_type BOOST_RE_CALL getloc()const{ return locale_inst; }
+   locale_type BOOST_REGEX_CALL getloc()const{ return locale_inst; }
-   unsigned int BOOST_RE_CALL strwiden(wchar_t *s1, unsigned int len, const char *s2)const;
+   unsigned int BOOST_REGEX_CALL strwiden(wchar_t *s1, unsigned int len, const char *s2)const;
 
    struct sentry
    {
@@ -753,25 +753,25 @@ public:
       operator void*() { return this; }
    };
 };
-#endif // BOOST_RE_NO_WCSTRING
+#endif // BOOST_NO_WREGEX
 
-#endif // BOOST_RE_NO_LOCALE_H
+#endif // BOOST_NO_STD_LOCALE
 
-#ifdef BOOST_RE_LOCALE_W32
+#ifdef BOOST_REGEX_USE_WIN32_LOCALE
 
 template <class charT>
 class regex_traits : public w32_regex_traits<charT>
 {
 };
 
-#elif defined(BOOST_RE_LOCALE_C)
+#elif defined(BOOST_REGEX_USE_C_LOCALE)
 
 template <class charT>
 class regex_traits : public c_regex_traits<charT>
 {
 };
 
-#elif defined(BOOST_RE_LOCALE_CPP)
+#elif defined(BOOST_REGEX_USE_CPP_LOCALE)
 
 template <class charT>
 class regex_traits : public cpp_regex_traits<charT>

include/boost/regex/src.cpp

@@ -20,20 +20,20 @@
   *   DESCRIPTION: Includes all the regex source files, include this
   *                file only if you need to build the regex library
   *                as a single file.  Before including this file you
-  *                must define BOOST_RE_NO_LIB, or include this file
+  *                must define BOOST_REGEX_NO_LIB, or include this file
   *                before any other regex header.
   */
 
-#if !defined(BOOST_RE_NO_LIB) && defined(BOOST_REGEX_CONFIG_HPP)
+#if !defined(BOOST_REGEX_NO_LIB) && defined(BOOST_REGEX_CONFIG_HPP)
-#error too late you have already included a regex header - try defining BOOST_RE_NO_LIB when you build
+#error too late you have already included a regex header - try defining BOOST_REGEX_NO_LIB when you build
 #endif
 
 //
 // include library source files:
 //
-#ifdef BOOST_RE_LOCALE_W32
+#ifdef BOOST_REGEX_USE_WIN32_LOCALE
 #include "libs/regex/src/w32_regex_traits.cpp"
-#elif defined(BOOST_RE_LOCALE_C)
+#elif defined(BOOST_REGEX_USE_C_LOCALE)
 #include "libs/regex/src/c_regex_traits.cpp"
 #else
 #include "libs/regex/src/cpp_regex_traits.cpp"

include/boost/regex/user.hpp

@@ -0,0 +1,28 @@
+
+// define if you want the regex library to use the C locale
+// even on Win32:
+// #define BOOST_REGEX_USE_C_LOCALE
+
+// define this is you want the regex library to use the C++
+// locale:
+// #define BOOST_REGEX_USE_CPP_LOCALE
+
+
+// define this if you want to statically link to regex,
+// even when the runtime is a dll (Probably Win32 specific):
+// #define BOOST_REGEX_STATIC_LINK
+
+// define this if you don't want the lib to automatically
+// select its link libraries:
+// #define BOOST_REGEX_NO_LIB
+
+// define this if templates with switch statements cause problems:
+// #define BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE
+ 
+// define this to disable Win32 support when available:
+// #define BOOST_REGEX_NO_W32
+
+// define this if bool is not a real type:
+// #define BOOST_REGEX_NO_BOOL
+
+

introduction.htm

@@ -339,7 +339,7 @@ and tell the linker to include it. </p>
 when using the dynamic C++ runtime, define BOOST_RE_STATIC_LIB
 when building your project (this only has an effect for release
 builds). If you want to add the source directly to your project
-then define BOOST_RE_NO_LIB to disable automatic library
+then define BOOST_REGEX_NO_LIB to disable automatic library
 selection.</p>
 
 <p><strong><i>Important</i></strong><em>: there have been some

jm_opt.in

@@ -1,146 +0,0 @@
-
-#ifndef BOOST_RE_OPT_H
-#define BOOST_RE_OPT_H
-
-#undef BOOST_RE_AUTO_CONFIGURE
-#ifdef BOOST_RE_AUTO_CONFIGURE
-
-/* Compiler options: */
-
-/* BOOST_NO_STDC_NAMESPACE         C library not in namespace std */
-#undef BOOST_NO_STDC_NAMESPACE
-
-/* BOOST_RE_PLATFORM_W32           Platform is MS Win32 */
-#undef BOOST_RE_PLATFORM_W32
-
-/* BOOST_RE_NO_W32               Disable Win32 support even when present */
-#undef BOOST_RE_NO_W32
-
-/* BOOST_RE_NO_BOOL                If bool is not a distict type. */
-#undef BOOST_RE_NO_BOOL
-
-/* BOOST_RE_NO_WCHAR_H             If there is no <wchar.h> */
-#undef BOOST_RE_NO_WCHAR_H
-
-/* BOOST_RE_NO_WCTYPE_H            If there is no <wctype.h> */
-#undef BOOST_RE_NO_WCTYPE_H
-
-/* BOOST_RE_NO_WCSTRING            If there are no wcslen and wcsncmp functions available. */
-#undef BOOST_RE_NO_WCSTRING
-
-/* BOOST_RE_NO_SWPRINTF            If there is no swprintf available. */
-#undef BOOST_RE_NO_SWPRINTF
-
-/* BOOST_RE_NO_WSPRINTF            If there is no wsprintf available. */
-#undef BOOST_RE_NO_WSPRINTF
-
-/* BOOST_NO_MEMBER_TEMPLATES    If member function templates or nested template classes are not allowed. */
-#undef BOOST_NO_MEMBER_TEMPLATES
-
-/* BOOST_RE_NO_TEMPLATE_RETURNS    If template functions based on return type are not supported. */
-#undef BOOST_RE_NO_TEMPLATE_RETURNS
-
-/* BOOST_RE_NO_PARTIAL_FUNC_SPEC   If partial template function specialisation is not supported */
-#undef BOOST_RE_NO_PARTIAL_FUNC_SPEC
-
-/* BOOST_RE_NO_CAT                 Define if the compiler does not support POSIX style
-                             message categories (catopen catgets catclose). */
-#undef BOOST_RE_NO_CAT
-
-/* BOOST_RE_THREADS                Define if the compiler supports multiple threads in
-                             the current translation mode. */
-#undef BOOST_RE_THREADS
-
-/* BOOST_RE_NO_TEMPLATE_MERGE      If template in separate translation units don't merge at link time */
-#undef BOOST_RE_NO_TEMPLATE_MERGE
-
-/* BOOST_RE_NO_TEMPLATE_MERGE_A    If template merging from library archives is not supported */
-#undef BOOST_RE_NO_TEMPLATE_MERGE_A
-
-/* BOOST_RE_NO_TEMPLATE_SWITCH_MERGE If merging of templates containing switch statements is not supported */
-#undef BOOST_RE_NO_TEMPLATE_SWITCH_MERGE
-
-/* BOOST_RE_CALL                   Optionally define a calling convention for C++ functions */
-#undef BOOST_RE_CALL
-
-/* BOOST_RE_CCALL                  Optionally define a calling convention for C functions */
-#undef BOOST_RE_CCALL
-
-/* BOOST_RE_SIZEOF_SHORT           sizeof(short) */
-#undef BOOST_RE_SIZEOF_SHORT
-
-/* BOOST_RE_SIZEOF_INT             sizeof(int) */
-#undef BOOST_RE_SIZEOF_INT
-
-/* BOOST_RE_SIZEOF_LONG            sizeof(long) */
-#undef BOOST_RE_SIZEOF_LONG
-
-/* BOOST_RE_SIZEOF_WCHAR_T         sizeof(wchar_t) */
-#undef BOOST_RE_SIZEOF_WCHAR_T
-
-
-/* STL options: */
-
-/* BOOST_RE_NO_ITERATOR_H          Define if you do not have a version of <iterator>. */
-#undef BOOST_RE_NO_ITERATOR_H
-
-/* BOOST_NO_STD_ALLOCATOR    Define if <memory> does not fully comply with the
-                             latest standard, and is not auto-recognised,
-                             that means nested template classes
-                             which hardly any compilers support at present. */
-#undef BOOST_NO_STD_ALLOCATOR
-
-/* BOOST_RE_NO_LOCALE_H            Define if there is no verion of the standard
-                             <locale> header available. */
-#undef BOOST_RE_NO_LOCALE_H
-
-/* BOOST_RE_NO_STL                 Disables the use of any supporting STL code. */
-#undef BOOST_RE_NO_STL
-
-/* BOOST_RE_NO_NOT_EQUAL           Disables the generation of operator!= if this
-                             clashes with the STL version. */
-
-/* BOOST_RE_NO_STRING_DEF_ARGS     Define if std::basic_string<charT> not allowed - in
-                             other words if the template is missing its required
-                      default arguments. */
-#undef BOOST_RE_NO_STRING_DEF_ARGS
-
-/* BOOST_RE_USE_ALGO               If <algo.h> not <algorithm> is present */
-#undef BOOST_RE_USE_ALGO
-
-/* BOOST_RE_OLD_IOSTREAM           If the new iostreamm classes are not available */
-#undef BOOST_RE_OLD_IOSTREAM
-
-/* BOOST_NO_STD_DISTANCE             If there is no std::distance. */
-#undef BOOST_NO_STD_DISTANCE
-
-/* BOOST_RE_NO_OI_ASSIGN           If output iterators ostream_iterator<>, back_insert_iterator<> and 
-                             front_insert_iterator<> do not have assignment operators */
-#undef BOOST_RE_NO_OI_ASSIGN
-
-#include <stdexcept>
-
-#ifndef BOOST_RE_NO_ITERATOR_H
-#include <iterator>
-#ifdef BOOST_RE_USE_ALGO
-#include <algo.h>
-#else
-#include <algorithm>
-#endif
-#endif
-
-#endif // BOOST_RE_AUTO_CONFIGURE
-
-
-#endif /* BOOST_RE_OPT_H */
-
-
-
-
-
-
-
-
-
-
-

makefile.in

@@ -1,29 +0,0 @@
-
-ALL_DEP=@ac_all_dep@
-
-base: ./build/libboost_regex.a
-
-./build/libboost_regex.a: $(ALL_DEP)
-	sh dmi.sh build
-
-
-jgrep : base
-	sh dmi.sh example/jgrep
-
-
-test : base
-	sh dmi.sh test/regress
-
-regress : test
-
-timer : base
-	sh dmi.sh example/timer
-
-install : base
-	echo no install option available
-	
-all : base jgrep test timer
-
-
-
-

makefile_gen

@@ -116,9 +116,7 @@ EOF
 #
 #	 now for the main target for this library:
 	echo ./$subdir/$libname.lib : $all_obj >> $tout
-	echo "	link @<<" >> $tout
+	echo "	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:\"$subdir/$libname.pdb\" /debug /machine:I386 /out:\"$subdir/$libname.dll\" /implib:\"$subdir/$libname.lib\" \$(XLFLAGS) $all_obj" >> $tout
-	echo "	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:\"$subdir/$libname.pdb\" /debug /machine:I386 /out:\"$subdir/$libname.dll\" /implib:\"$subdir/$libname.lib\" /pdbtype:sept \$(XLFLAGS) $all_obj" >> $tout
-	echo "<<" >> $tout
 	echo "" >> $tout
 }
 
@@ -137,17 +135,17 @@ function vc6_gen()
 	if test "$is_stlport" == yes; then
 	prefix='vc6-stlport-'
 	else
-	prefix='vc6-'
+	prefix="$subdir-"
 	fi
 
 	if test "$no_single" != "yes"; then
 	libname="$prefix""re300"
-	opts="/c /nologo /ML /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD"
+	opts="/c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD"
 	vc6_gen_lib
 	fi
 	
 	libname="$prefix""re300m"
-	opts="/nologo /MT /W3 /GX /Oityb1 /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c"
+	opts="/nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /YX /FD /c"
 	vc6_gen_lib
 	
 	if test "$no_single" != "yes"; then
@@ -162,23 +160,23 @@ function vc6_gen()
 	vc6_gen_lib
 	
 	libname="$prefix""re300dl"
-	opts="/nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c"
+	opts="/nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /YX /FD /GZ  /c"
 	vc6_gen_dll
 	
 	debug="no"
-	opts="/nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /c"
+	opts="/nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c"
 	libname="$prefix""re300l"
 	vc6_gen_dll
 	
 	debug="no"
-	opts="/nologo /MD /W3 /GX /Oityb1 /GF /Gy /I../../../ /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /DBOOST_RE_STATIC_LIB /YX /FD /c"
+	opts="/nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /YX /FD /c"
 	libname="$prefix""re300ls"
 	vc6_gen_lib
 	
 	if test "$is_stlport" == yes; then
 #  debug STLPort mode:
 	debug="yes"
-	opts="/nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /DBOOST_RE_DLL_EXPORTS /DBOOST_RE_BUILD_DLL /YX /FD /GZ  /c"
+	opts="/nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D__STL_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GZ  /c"
 	libname="$prefix""re300ddl"
 	vc6_gen_dll
 	libname="$prefix""re300ddm"
@@ -575,17 +573,17 @@ function bcb_gen()
 	bcb_gen_lib
 
 	libname="$subdir""re300lv"
-	opts="-DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I\$(BCROOT)\include;../../../ -L\$(BCROOT)\lib;\$(BCROOT)\lib\release;"
+	opts="-tWD -tWM -tWR -tWV -DJM_USE_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I\$(BCROOT)\include;../../../ -L\$(BCROOT)\lib;\$(BCROOT)\lib\release;"
 	bcb_gen_dll
 	
 	fi
 
 	libname="$subdir""re300lm"
-	opts="-DBOOST_RE_BUILD_DLL -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I\$(BCROOT)\include;../../../ -L\$(BCROOT)\lib;\$(BCROOT)\lib\release;"
+	opts="-tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I\$(BCROOT)\include;../../../ -L\$(BCROOT)\lib;\$(BCROOT)\lib\release;"
 	bcb_gen_dll
 
 	libname="$subdir""re300l"
-	opts="-DBOOST_RE_BUILD_DLL -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I\$(BCROOT)\include;../../../ -L\$(BCROOT)\lib;\$(BCROOT)\lib\release;"
+	opts="-tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I\$(BCROOT)\include;../../../ -L\$(BCROOT)\lib;\$(BCROOT)\lib\release;"
 	bcb_gen_dll
 	
 	
@@ -936,7 +934,14 @@ EOF
 
 #
 # locate all the header dependencies:
-header="../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp"
+for file in ../../boost/regex/*.hpp
+do
+
+if test $file != '../../boost/regex/*.hpp'; then
+	header="$header ../$file"
+fi
+
+done
 
 for file in ../../boost/regex/detail/*.hpp
 do
@@ -980,6 +985,13 @@ no_single="yes"
 subdir="vc6-stlport"
 vc6_gen
 #
+# generate vc7 makefile:
+is_stlport="no"
+out="build/vc7.mak"
+no_single="no"
+subdir="vc7"
+vc6_gen
+#
 # generate gcc makefile:
 gcc_gen
 gcc_shared="yes"
@@ -1035,6 +1047,14 @@ rm -f $tout $iout
 
 
 
+
+
+
+
+
+
+
+
 
 
 

old_include/cregex.h

@@ -48,7 +48,7 @@ using boost::regerrorA;
 using boost::regexecA;
 using boost::regfreeA;
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 using boost::regex_tW;
 using boost::regcompW;
 using boost::regerrorW;

old_include/regex.h

@@ -32,7 +32,7 @@ namespace deprecated{
 // class reg_match:
 // old name for match_results, this ones just a thin wrapper:
 //
-template <class iterator, class Allocator  BOOST_RE_DEF_ALLOC_PARAM(typename boost::re_detail::def_alloc_param_traits<iterator>::type)>
+template <class iterator, class Allocator  = BOOST_DEFAULT_ALLOCATOR(typename boost::re_detail::def_alloc_param_traits<iterator>::type)>
 class reg_match : public boost::match_results<iterator, Allocator>
 {
    typedef boost::match_results<iterator, Allocator> base_type;
@@ -82,7 +82,7 @@ bool query_match(iterator first, iterator last, boost::match_results<iterator, A
 
 //
 // query_match convenience interfaces:
-#ifndef BOOST_RE_NO_PARTIAL_FUNC_SPEC
+#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
 //
 // this isn't really a partial specialisation, but template function
 // overloading - if the compiler doesn't support partial specialisation
@@ -112,7 +112,7 @@ inline bool query_match(const char* str,
 {
    return query_match(str, str + regex::traits_type::length(str), m, e, flags);
 }
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 inline bool query_match(const wchar_t* str, 
                         wcmatch& m, 
                         const wregex& e, 
@@ -128,7 +128,7 @@ inline bool query_match(const std::string& s,
 {
    return query_match(s.begin(), s.end(), m, e, flags);
 }
-#if !defined(BOOST_RE_NO_WCSTRING)
+#if !defined(BOOST_NO_WREGEX)
 inline bool query_match(const std::basic_string<wchar_t>& s, 
                         boost::match_results<std::basic_string<wchar_t>::const_iterator, wregex::allocator_type>& m,
                         const wregex& e, 
@@ -155,7 +155,7 @@ bool reg_search(iterator first, iterator last, boost::match_results<iterator, Al
 
 //
 // reg_search convenience interfaces:
-#ifndef BOOST_RE_NO_PARTIAL_FUNC_SPEC
+#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
 //
 // this isn't really a partial specialisation, but template function
 // overloading - if the compiler doesn't support partial specialisation
@@ -187,7 +187,7 @@ inline bool reg_search(const char* str,
 {
    return reg_search(str, str + regex::traits_type::length(str), m, e, flags);
 }
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 inline bool reg_search(const wchar_t* str, 
                         wcmatch& m, 
                         const wregex& e, 
@@ -204,7 +204,7 @@ inline bool reg_search(const std::string& s,
 {
    return reg_search(s.begin(), s.end(), m, e, flags);
 }
-#if !defined(BOOST_RE_NO_STRING_DEF_ARGS) && !defined(BOOST_RE_NO_WCSTRING)
+#if !defined(BOOST_NO_WREGEX)
 inline bool reg_search(const std::basic_string<wchar_t>& s, 
                         boost::match_results<std::basic_string<wchar_t>::const_iterator, wregex::allocator_type>& m,
                         const wregex& e, 
@@ -231,7 +231,7 @@ inline unsigned int reg_grep(Predicate foo, iterator first, iterator last, const
 
 //
 // reg_grep convenience interfaces:
-#ifndef BOOST_RE_NO_PARTIAL_FUNC_SPEC
+#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
 //
 // this isn't really a partial specialisation, but template function
 // overloading - if the compiler doesn't support partial specialisation
@@ -260,7 +260,7 @@ inline unsigned int reg_grep(bool (*foo)(const cmatch&), const char* str,
 {
    return reg_grep(foo, str, str + regex::traits_type::length(str), e, flags);
 }
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 inline unsigned int reg_grep(bool (*foo)(const wcmatch&), const wchar_t* str, 
                         const wregex& e, 
                         unsigned flags = match_default)
@@ -275,8 +275,8 @@ inline unsigned int reg_grep(bool (*foo)(const boost::match_results<std::string:
 {
    return reg_grep(foo, s.begin(), s.end(), e, flags);
 }
-#if !defined(BOOST_RE_NO_STRING_DEF_ARGS) && !defined(BOOST_RE_NO_WCSTRING)
+#if !defined(BOOST_NO_WREGEX)
-inline unsigned int reg_grep(bool (*foo)(const boost::match_results<std::basic_string<wchar_t>::const_iterator, wregex::allocator_type>&), 
+inline unsigned int reg_grep(bool (*foo)(const boost::match_results<std::basic_string<wchar_t>::const_iterator, wregex::allocator_type>&),
                      const std::basic_string<wchar_t>& s, 
                         const wregex& e, 
                         unsigned flags = match_default)
@@ -349,7 +349,7 @@ inline unsigned int reg_grep_old(Out oi, iterator first, iterator last, const re
 }
 
 template <class OutputIterator, class iterator, class Allocator, class charT>
-OutputIterator BOOST_RE_CALL reg_format(OutputIterator out,
+OutputIterator BOOST_REGEX_CALL reg_format(OutputIterator out,
                           const boost::match_results<iterator, Allocator>& m,
                           const charT* fmt)
 {
@@ -359,28 +359,17 @@ OutputIterator BOOST_RE_CALL reg_format(OutputIterator out,
    return boost::re_detail::_reg_format_aux(out, m, fmt, 0);
 }
 
-#ifndef BOOST_RE_NO_STRING_DEF_ARGS
 template <class iterator, class Allocator, class charT>
-std::basic_string<charT> BOOST_RE_CALL reg_format(const boost::match_results<iterator, Allocator>& m, const charT* fmt)
+std::basic_string<charT> BOOST_REGEX_CALL reg_format(const boost::match_results<iterator, Allocator>& m, const charT* fmt)
 {
    std::basic_string<charT> result;
    boost::re_detail::string_out_iterator<std::basic_string<charT> > i(result);
    reg_format(i, m, fmt);
    return result;
 }
-#elif !defined(BOOST_RE_NO_STRING_H)
-template <class iterator, class Allocator>
-std::string BOOST_RE_CALL reg_format(const boost::match_results<iterator, Allocator>& m, const char* fmt)
-{
-   std::string result;
-   boost::re_detail::string_out_iterator<std::string> i(result);
-   reg_format(i, m, fmt);
-   return result;
-}
-#endif
 
 template <class OutputIterator, class iterator, class traits, class Allocator, class charT>
-OutputIterator BOOST_RE_CALL reg_merge(OutputIterator out, 
+OutputIterator BOOST_REGEX_CALL reg_merge(OutputIterator out, 
                          iterator first,
                          iterator last,
                          const reg_expression<charT, traits, Allocator>& e, 
@@ -398,10 +387,9 @@ OutputIterator BOOST_RE_CALL reg_merge(OutputIterator out,
    return copy ? boost::re_detail::re_copy_out(out, l, last) : out;
 }
 
-#ifndef BOOST_RE_NO_STRING_DEF_ARGS
 template <class traits, class Allocator, class charT>
-std::basic_string<charT> BOOST_RE_CALL reg_merge(const std::basic_string<charT>& s,
+std::basic_string<charT> BOOST_REGEX_CALL reg_merge(const std::basic_string<charT>& s,
-                         const reg_expression<charT, traits, Allocator>& e, 
+                         const reg_expression<charT, traits, Allocator>& e,
                          const charT* fmt, 
                          bool copy = true, 
                          unsigned int flags = match_default)
@@ -411,21 +399,6 @@ std::basic_string<charT> BOOST_RE_CALL reg_merge(const std::basic_string<charT>&
    reg_merge(i, s.begin(), s.end(), e, fmt, copy, flags);
    return result;
 }
-#elif !defined(BOOST_RE_NO_STRING_H)
-template <class traits, class Allocator>
-std::string BOOST_RE_CALL reg_merge(const std::string& s,
-                         const reg_expression<char, traits, Allocator>& e, 
-                         const char* fmt, 
-                         bool copy = true, 
-                         unsigned int flags = match_default)
-{
-   std::string result;
-   boost::re_detail::string_out_iterator<std::string> i(result);
-   reg_merge(i, s.begin(), s.end(), e, fmt, copy, flags);
-   return result;
-}
-#endif
-
 
 } // namespace deprecated
 
@@ -457,7 +430,7 @@ using boost::deprecated::reg_match;
 using boost::sub_match;
 using boost::regex;
 using boost::cmatch;
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 using boost::wregex;
 using boost::wcmatch;
 #endif

src/c_regex_traits.cpp

@@ -20,6 +20,8 @@
   *   DESCRIPTION: Implements the c_regex_traits<charT> traits class
   */
 
+#define BOOST_REGEX_SOURCE
+
 #include <clocale>
 #include <cstdio>
 #include <list>
@@ -33,7 +35,7 @@
 #include "primary_transform.hpp"
 
 
-#ifndef BOOST_RE_NO_CAT
+#if defined(BOOST_HAS_NL_TYPES_H)
 #include <nl_types.h>
 #endif
 
@@ -103,14 +105,14 @@ unsigned int collate_count = 0;
 #define BOOST_RE_MESSAGE_BASE 0
 #endif
 
-#if !defined(BOOST_RE_NO_CAT)
+#if defined(BOOST_HAS_NL_TYPES_H)
 nl_catd message_cat = (nl_catd)-1;
 #endif
 
 unsigned int message_count = 0;
 std::string* mess_locale;
 
-BOOST_RE_IX_DECL char* re_custom_error_messages[] = {
+BOOST_REGEX_DECL char* re_custom_error_messages[] = {
    0,
    0,
    0,
@@ -152,10 +154,10 @@ enum syntax_map_size
    map_size = UCHAR_MAX + 1
 };
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 
-BOOST_RE_IX_DECL wchar_t re_zero_w;
+BOOST_REGEX_DECL wchar_t re_zero_w;
-BOOST_RE_IX_DECL wchar_t re_ten_w;
+BOOST_REGEX_DECL wchar_t re_ten_w;
 
 unsigned int nlsw_count = 0;
 std::string* wlocale_name = 0;
@@ -171,10 +173,10 @@ std::list<syntax_map_t>* syntax;
 #endif
 
 
-unsigned int BOOST_RE_CALL _re_get_message(char* buf, unsigned int len, unsigned int id);
+unsigned int BOOST_REGEX_CALL _re_get_message(char* buf, unsigned int len, unsigned int id);
 
 template <class charT>
-unsigned int BOOST_RE_CALL re_get_message(charT* buf, unsigned int len, unsigned int id)
+unsigned int BOOST_REGEX_CALL re_get_message(charT* buf, unsigned int len, unsigned int id)
 {
    unsigned int size = _re_get_message((char*)0, 0, id);
    if(len < size)
@@ -185,12 +187,12 @@ unsigned int BOOST_RE_CALL re_get_message(charT* buf, unsigned int len, unsigned
    return size;
 }
 
-inline unsigned int BOOST_RE_CALL re_get_message(char* buf, unsigned int len, unsigned int id)
+inline unsigned int BOOST_REGEX_CALL re_get_message(char* buf, unsigned int len, unsigned int id)
 {
    return _re_get_message(buf, len, id);
 }
 
-void BOOST_RE_CALL re_init_classes()
+void BOOST_REGEX_CALL re_init_classes()
 {
    BOOST_RE_GUARD_STACK
    if(classes_count == 0)
@@ -208,7 +210,7 @@ void BOOST_RE_CALL re_init_classes()
    ++classes_count;
 }
 
-void BOOST_RE_CALL re_free_classes()
+void BOOST_REGEX_CALL re_free_classes()
 {
    BOOST_RE_GUARD_STACK
    if(--classes_count == 0)
@@ -218,7 +220,7 @@ void BOOST_RE_CALL re_free_classes()
    }
 }
 
-void BOOST_RE_CALL re_update_classes()
+void BOOST_REGEX_CALL re_update_classes()
 {
    BOOST_RE_GUARD_STACK
    if(*re_cls_name != std::setlocale(LC_CTYPE, 0))
@@ -234,7 +236,7 @@ void BOOST_RE_CALL re_update_classes()
    }
 }
 
-void BOOST_RE_CALL re_init_collate()
+void BOOST_REGEX_CALL re_init_collate()
 {
    BOOST_RE_GUARD_STACK
    if(collate_count == 0)
@@ -252,7 +254,7 @@ void BOOST_RE_CALL re_init_collate()
    ++collate_count;
 }
 
-void BOOST_RE_CALL re_free_collate()
+void BOOST_REGEX_CALL re_free_collate()
 {
    BOOST_RE_GUARD_STACK
    if(--collate_count == 0)
@@ -262,7 +264,7 @@ void BOOST_RE_CALL re_free_collate()
    }
 }
 
-void BOOST_RE_CALL re_update_collate()
+void BOOST_REGEX_CALL re_update_collate()
 {
    BOOST_RE_GUARD_STACK
    if(*re_coll_name != std::setlocale(LC_COLLATE, 0))
@@ -289,11 +291,11 @@ void BOOST_RE_CALL re_update_collate()
    }
 }
 
-unsigned int BOOST_RE_CALL _re_get_message(char* buf, unsigned int len, unsigned int id)
+unsigned int BOOST_REGEX_CALL _re_get_message(char* buf, unsigned int len, unsigned int id)
 {
    BOOST_RE_GUARD_STACK
    // get the customised message if any:
-   #if !defined(BOOST_RE_NO_CAT)
+   #if defined(BOOST_HAS_NL_TYPES_H)
    if(message_cat != (nl_catd)-1)
    {
       const char* m = catgets(message_cat, 0, id, 0);
@@ -313,7 +315,7 @@ unsigned int BOOST_RE_CALL _re_get_message(char* buf, unsigned int len, unsigned
    return boost::re_detail::re_get_default_message(buf, len, id);
 }
 
-void BOOST_RE_CALL re_message_init()
+void BOOST_REGEX_CALL re_message_init()
 {
    BOOST_RE_GUARD_STACK
    if(message_count == 0)
@@ -323,7 +325,7 @@ void BOOST_RE_CALL re_message_init()
    ++message_count;
 }
 
-void BOOST_RE_CALL re_message_update()
+void BOOST_REGEX_CALL re_message_update()
 {
    BOOST_RE_GUARD_STACK
    //
@@ -333,7 +335,7 @@ void BOOST_RE_CALL re_message_update()
    if(*mess_locale != l)
    {
       *mess_locale = l;
-#if !defined(BOOST_RE_NO_CAT)
+#if defined(BOOST_HAS_NL_TYPES_H)
       if(message_cat != (nl_catd)-1)
       {
          catclose(message_cat);
@@ -353,13 +355,13 @@ void BOOST_RE_CALL re_message_update()
    }
 }
 
-void BOOST_RE_CALL re_message_free()
+void BOOST_REGEX_CALL re_message_free()
 {
    BOOST_RE_GUARD_STACK
    --message_count;
    if(message_count == 0)
    {
-#if !defined(BOOST_RE_NO_CAT)
+#if defined(BOOST_HAS_NL_TYPES_H)
       if(message_cat != (nl_catd)-1)
          catclose(message_cat);
 #endif
@@ -376,7 +378,7 @@ void BOOST_RE_CALL re_message_free()
 }
 
 
-const char* BOOST_RE_CALL re_get_error_str(unsigned int id)
+const char* BOOST_REGEX_CALL re_get_error_str(unsigned int id)
 {
    BOOST_RE_GUARD_STACK
 #ifdef BOOST_RE_THREADS
@@ -403,12 +405,12 @@ namespace re_detail{
 
 char c_traits_base::regex_message_catalogue[200] = {0};
 
-std::string BOOST_RE_CALL c_traits_base::error_string(unsigned id)
+std::string BOOST_REGEX_CALL c_traits_base::error_string(unsigned id)
 {
    return re_get_error_str(id);
 }
 
-void BOOST_RE_CALL c_traits_base::do_update_collate()
+void BOOST_REGEX_CALL c_traits_base::do_update_collate()
 {
    BOOST_RE_GUARD_STACK
    re_update_collate();
@@ -432,7 +434,7 @@ void BOOST_RE_CALL c_traits_base::do_update_collate()
       re_ten = 'a';
 }
 
-void BOOST_RE_CALL c_traits_base::do_update_ctype()
+void BOOST_REGEX_CALL c_traits_base::do_update_ctype()
 {
    BOOST_RE_GUARD_STACK
    // start by updating the syntax map:
@@ -481,7 +483,7 @@ void BOOST_RE_CALL c_traits_base::do_update_ctype()
    re_update_classes();
 }
 
-boost::uint_fast32_t BOOST_RE_CALL c_traits_base::do_lookup_class(const char* p)
+boost::uint_fast32_t BOOST_REGEX_CALL c_traits_base::do_lookup_class(const char* p)
 {
    BOOST_RE_GUARD_STACK
    unsigned int i;
@@ -502,7 +504,7 @@ boost::uint_fast32_t BOOST_RE_CALL c_traits_base::do_lookup_class(const char* p)
    return 0;
 }
 
-bool BOOST_RE_CALL c_traits_base::do_lookup_collate(std::string& buf, const char* p)
+bool BOOST_REGEX_CALL c_traits_base::do_lookup_collate(std::string& buf, const char* p)
 {
    BOOST_RE_GUARD_STACK
    std::list<collate_name_t>::iterator first, last;
@@ -527,7 +529,7 @@ bool BOOST_RE_CALL c_traits_base::do_lookup_collate(std::string& buf, const char
    return result;
 }
 
-std::string BOOST_RE_CALL c_traits_base::set_message_catalogue(const std::string& l)
+std::string BOOST_REGEX_CALL c_traits_base::set_message_catalogue(const std::string& l)
 {
    if(sizeof(regex_message_catalogue) <= l.size())
       return l;
@@ -542,8 +544,8 @@ char c_traits_base::lower_case_map[map_size];
 
 } // namespace re_detail
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
-bool BOOST_RE_CALL c_regex_traits<wchar_t>::lookup_collatename(std::basic_string<wchar_t>& out, const wchar_t* first, const wchar_t* last)
+bool BOOST_REGEX_CALL c_regex_traits<wchar_t>::lookup_collatename(std::basic_string<wchar_t>& out, const wchar_t* first, const wchar_t* last)
 {
    BOOST_RE_GUARD_STACK
    std::basic_string<wchar_t> s(first, last);
@@ -571,7 +573,7 @@ bool BOOST_RE_CALL c_regex_traits<wchar_t>::lookup_collatename(std::basic_string
 
 c_regex_traits<char> c_regex_traits<char>::i;
 
-void BOOST_RE_CALL c_regex_traits<char>::init()
+void BOOST_REGEX_CALL c_regex_traits<char>::init()
 {
    BOOST_RE_GUARD_STACK
 #ifdef BOOST_RE_THREADS
@@ -597,7 +599,7 @@ void BOOST_RE_CALL c_regex_traits<char>::init()
    ++entry_count;
 }
 
-void BOOST_RE_CALL c_regex_traits<char>::update()
+void BOOST_REGEX_CALL c_regex_traits<char>::update()
 {
    BOOST_RE_GUARD_STACK
    #ifdef BOOST_RE_THREADS
@@ -617,7 +619,7 @@ void BOOST_RE_CALL c_regex_traits<char>::update()
    sort_type = re_detail::find_sort_syntax(&i, &sort_delim);
 }
 
-void BOOST_RE_CALL c_regex_traits<char>::free()
+void BOOST_REGEX_CALL c_regex_traits<char>::free()
 {
    BOOST_RE_GUARD_STACK
    #ifdef BOOST_RE_THREADS
@@ -638,7 +640,7 @@ void BOOST_RE_CALL c_regex_traits<char>::free()
 #endif
 }
 
-void BOOST_RE_CALL c_regex_traits<char>::transform(std::string& out, const std::string& in)
+void BOOST_REGEX_CALL c_regex_traits<char>::transform(std::string& out, const std::string& in)
 {
    BOOST_RE_GUARD_STACK
    std::size_t n = std::strxfrm(0, in.c_str(), 0);
@@ -657,7 +659,7 @@ void BOOST_RE_CALL c_regex_traits<char>::transform(std::string& out, const std::
    out = buf.get();
 }
 
-void BOOST_RE_CALL c_regex_traits<char>::transform_primary(std::string& out, const std::string& in)
+void BOOST_REGEX_CALL c_regex_traits<char>::transform_primary(std::string& out, const std::string& in)
 {
    transform(out, in);
    switch(sort_type)
@@ -684,7 +686,7 @@ unsigned c_regex_traits<char>::sort_type;
 char c_regex_traits<char>::sort_delim;
 
 
-int BOOST_RE_CALL c_regex_traits<char>::toi(char c)
+int BOOST_REGEX_CALL c_regex_traits<char>::toi(char c)
 {
    if(is_class(c, char_class_digit))
       return c - re_zero;
@@ -693,7 +695,7 @@ int BOOST_RE_CALL c_regex_traits<char>::toi(char c)
    return -1; // error!!
 }
 
-int BOOST_RE_CALL c_regex_traits<char>::toi(const char*& first, const char* last, int radix)
+int BOOST_REGEX_CALL c_regex_traits<char>::toi(const char*& first, const char* last, int radix)
 {
    unsigned int maxval;
    if(radix < 0)
@@ -723,9 +725,9 @@ int BOOST_RE_CALL c_regex_traits<char>::toi(const char*& first, const char* last
    return result;
 }
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 
-unsigned int BOOST_RE_CALL c_regex_traits<wchar_t>::syntax_type(size_type c)
+unsigned int BOOST_REGEX_CALL c_regex_traits<wchar_t>::syntax_type(size_type c)
 {
    BOOST_RE_GUARD_STACK
    std::list<syntax_map_t>::const_iterator first, last;
@@ -740,7 +742,7 @@ unsigned int BOOST_RE_CALL c_regex_traits<wchar_t>::syntax_type(size_type c)
    return 0;
 }
 
-void BOOST_RE_CALL c_regex_traits<wchar_t>::init()
+void BOOST_REGEX_CALL c_regex_traits<wchar_t>::init()
 {
    BOOST_RE_GUARD_STACK
    re_detail::re_init_threads();
@@ -765,7 +767,7 @@ void BOOST_RE_CALL c_regex_traits<wchar_t>::init()
    ++nlsw_count;
 }
 
-bool BOOST_RE_CALL c_regex_traits<wchar_t>::do_lookup_collate(std::basic_string<wchar_t>& out, const wchar_t* first, const wchar_t* last)
+bool BOOST_REGEX_CALL c_regex_traits<wchar_t>::do_lookup_collate(std::basic_string<wchar_t>& out, const wchar_t* first, const wchar_t* last)
 {
    BOOST_RE_GUARD_STACK
    std::basic_string<wchar_t> s(first, last);
@@ -785,7 +787,7 @@ bool BOOST_RE_CALL c_regex_traits<wchar_t>::do_lookup_collate(std::basic_string<
 }
 
 
-void BOOST_RE_CALL c_regex_traits<wchar_t>::update()
+void BOOST_REGEX_CALL c_regex_traits<wchar_t>::update()
 {
    BOOST_RE_GUARD_STACK
 #ifdef BOOST_RE_THREADS
@@ -836,7 +838,7 @@ void BOOST_RE_CALL c_regex_traits<wchar_t>::update()
    }
 }
 
-void BOOST_RE_CALL c_regex_traits<wchar_t>::free()
+void BOOST_REGEX_CALL c_regex_traits<wchar_t>::free()
 {
    BOOST_RE_GUARD_STACK
 #ifdef BOOST_RE_THREADS
@@ -858,11 +860,11 @@ void BOOST_RE_CALL c_regex_traits<wchar_t>::free()
 #endif
 }
 
-bool BOOST_RE_CALL c_regex_traits<wchar_t>::do_iswclass(wchar_t c, boost::uint_fast32_t f)
+bool BOOST_REGEX_CALL c_regex_traits<wchar_t>::do_iswclass(wchar_t c, boost::uint_fast32_t f)
 {
    BOOST_RE_GUARD_STACK
    if((c & ~0xFF) == 0)
-      return BOOST_RE_MAKE_BOOL(re_detail::wide_unicode_classes[(uchar_type)c] & f);
+      return BOOST_REGEX_MAKE_BOOL(re_detail::wide_unicode_classes[(uchar_type)c] & f);
    if((f & char_class_alpha) && std::iswalpha(c))
       return true;
    if((f & char_class_cntrl) && std::iswcntrl(c))
@@ -884,7 +886,7 @@ bool BOOST_RE_CALL c_regex_traits<wchar_t>::do_iswclass(wchar_t c, boost::uint_f
    return false;
 }
 
-void BOOST_RE_CALL c_regex_traits<wchar_t>::transform(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in)
+void BOOST_REGEX_CALL c_regex_traits<wchar_t>::transform(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in)
 {
    BOOST_RE_GUARD_STACK
 #ifndef BOOST_MSVC
@@ -909,7 +911,7 @@ void BOOST_RE_CALL c_regex_traits<wchar_t>::transform(std::basic_string<wchar_t>
    out = buf.get();
 }
 
-void BOOST_RE_CALL c_regex_traits<wchar_t>::transform_primary(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in)
+void BOOST_REGEX_CALL c_regex_traits<wchar_t>::transform_primary(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in)
 {
    transform(out, in);
    switch(sort_type)
@@ -937,7 +939,7 @@ unsigned c_regex_traits<wchar_t>::sort_type;
 wchar_t c_regex_traits<wchar_t>::sort_delim;
 
 
-int BOOST_RE_CALL c_regex_traits<wchar_t>::toi(wchar_t c)
+int BOOST_REGEX_CALL c_regex_traits<wchar_t>::toi(wchar_t c)
 {
    if(is_class(c, char_class_digit))
       return c - re_zero_w;
@@ -946,7 +948,7 @@ int BOOST_RE_CALL c_regex_traits<wchar_t>::toi(wchar_t c)
    return -1; // error!!
 }
 
-int BOOST_RE_CALL c_regex_traits<wchar_t>::toi(const wchar_t*& first, const wchar_t* last, int radix)
+int BOOST_REGEX_CALL c_regex_traits<wchar_t>::toi(const wchar_t*& first, const wchar_t* last, int radix)
 {
    unsigned int maxval;
    if(radix < 0)
@@ -976,7 +978,7 @@ int BOOST_RE_CALL c_regex_traits<wchar_t>::toi(const wchar_t*& first, const wcha
    return result;
 }
 
-boost::uint_fast32_t BOOST_RE_CALL c_regex_traits<wchar_t>::lookup_classname(const wchar_t* first, const wchar_t* last)
+boost::uint_fast32_t BOOST_REGEX_CALL c_regex_traits<wchar_t>::lookup_classname(const wchar_t* first, const wchar_t* last)
 {
    std::basic_string<wchar_t> s(first, last);
    unsigned int len = strnarrow((char*)0, 0, s.c_str());
@@ -988,7 +990,7 @@ boost::uint_fast32_t BOOST_RE_CALL c_regex_traits<wchar_t>::lookup_classname(con
 
 c_regex_traits<wchar_t> c_regex_traits<wchar_t>::init_;
 
-unsigned int BOOST_RE_CALL c_regex_traits<wchar_t>::strnarrow(char *s1, unsigned int len, const wchar_t *s2)
+unsigned int BOOST_REGEX_CALL c_regex_traits<wchar_t>::strnarrow(char *s1, unsigned int len, const wchar_t *s2)
 {
    BOOST_RE_GUARD_STACK
    unsigned int size = std::wcslen(s2) + 1;
@@ -997,7 +999,7 @@ unsigned int BOOST_RE_CALL c_regex_traits<wchar_t>::strnarrow(char *s1, unsigned
    return std::wcstombs(s1, s2, len);
 }
 
-unsigned int BOOST_RE_CALL c_regex_traits<wchar_t>::strwiden(wchar_t *s1, unsigned int len, const char *s2)
+unsigned int BOOST_REGEX_CALL c_regex_traits<wchar_t>::strwiden(wchar_t *s1, unsigned int len, const char *s2)
 {
    BOOST_RE_GUARD_STACK
    unsigned int size = std::strlen(s2) + 1;
@@ -1008,7 +1010,7 @@ unsigned int BOOST_RE_CALL c_regex_traits<wchar_t>::strwiden(wchar_t *s1, unsign
    return size + 1;
 }
 
-#endif // BOOST_RE_NO_WCSTRING
+#endif // BOOST_NO_WREGEX
 
 
 } // namespace boost

src/c_regex_traits_common.cpp

@@ -22,6 +22,8 @@
   */
 
 
+#define BOOST_REGEX_SOURCE
+
 #include <clocale>
 #include <cstdio>
 #include <list>
@@ -36,7 +38,7 @@ namespace boost{
 //
 // these are the POSIX collating names:
 //
-BOOST_RE_IX_DECL const char* def_coll_names[] = {
+BOOST_REGEX_DECL const char* def_coll_names[] = {
 "NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "alert", "backspace", "tab", "newline", 
 "vertical-tab", "form-feed", "carriage-return", "SO", "SI", "DLE", "DC1", "DC2", "DC3", "DC4", "NAK", 
 "SYN", "ETB", "CAN", "EM", "SUB", "ESC", "IS4", "IS3", "IS2", "IS1", "space", "exclamation-mark", 
@@ -57,7 +59,7 @@ BOOST_RE_IX_DECL const char* def_coll_names[] = {
 // little more - but this will have to do for
 // now:
 
-BOOST_RE_IX_DECL const char* def_multi_coll[] = {
+BOOST_REGEX_DECL const char* def_multi_coll[] = {
    "ae",
    "Ae",
    "AE",
@@ -84,7 +86,7 @@ BOOST_RE_IX_DECL const char* def_multi_coll[] = {
 
 
 
-BOOST_RE_IX_DECL bool BOOST_RE_CALL re_lookup_def_collate_name(std::string& buf, const char* name)
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL re_lookup_def_collate_name(std::string& buf, const char* name)
 {
    BOOST_RE_GUARD_STACK
    unsigned int i = 0;
@@ -112,7 +114,7 @@ BOOST_RE_IX_DECL bool BOOST_RE_CALL re_lookup_def_collate_name(std::string& buf,
 
 //
 // messages:
-BOOST_RE_IX_DECL const char * re_default_error_messages[] =
+BOOST_REGEX_DECL const char * re_default_error_messages[] =
 {  "Success",             /* REG_NOERROR */
    "No match",             /* REG_NOMATCH */
    "Invalid regular expression",    /* REG_BADPAT */
@@ -195,7 +197,7 @@ const mss default_messages[] = {
                             { 0, "", },
                          };
 
-BOOST_RE_IX_DECL unsigned int BOOST_RE_CALL re_get_default_message(char* buf, unsigned int len, unsigned int id)
+BOOST_REGEX_DECL unsigned int BOOST_REGEX_CALL re_get_default_message(char* buf, unsigned int len, unsigned int id)
 {
    BOOST_RE_GUARD_STACK
    const mss* pm = default_messages;
@@ -255,7 +257,7 @@ const wchar_t combining_ranges[] = { 0x0300, 0x0361,
                            0xFE20, 0xFE23, 
                            0xffff, 0xffff, };
 
-BOOST_RE_IX_DECL bool BOOST_RE_CALL is_combining(wchar_t c)
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL is_combining(wchar_t c)
 {
    BOOST_RE_GUARD_STACK
    const wchar_t* p = combining_ranges + 1;
@@ -266,7 +268,7 @@ BOOST_RE_IX_DECL bool BOOST_RE_CALL is_combining(wchar_t c)
    return false;
 }
 
-BOOST_RE_IX_DECL unsigned short wide_unicode_classes[] = {
+BOOST_REGEX_DECL unsigned short wide_unicode_classes[] = {
    c_traits_base::char_class_cntrl,        // ''  0
    c_traits_base::char_class_cntrl,        // ''  1
    c_traits_base::char_class_cntrl,        // ''  2
@@ -526,7 +528,7 @@ BOOST_RE_IX_DECL unsigned short wide_unicode_classes[] = {
    c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // '<27>'  255
 };
 
-BOOST_RE_IX_DECL wchar_t wide_lower_case_map[] = {
+BOOST_REGEX_DECL wchar_t wide_lower_case_map[] = {
    0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf,
    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 
    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 

src/cpp_regex_traits.cpp

@@ -19,17 +19,25 @@
   *   VERSION:     3.12
   *   DESCRIPTION: Implements the cpp_regex_traits<charT> traits class
   */
+
+
+#define BOOST_REGEX_SOURCE
+
+#include <boost/regex/config.hpp>
+
+#ifndef BOOST_NO_STD_LOCALE
+
 #include <clocale>
+#include <locale>
 #include <cstdio>
 #include <list>
 #include <cctype>
 #include <iostream>
-#include <boost/regex/regex_traits.hpp>
 #include <map>
+#include <boost/regex/regex_traits.hpp>
 #include <boost/cregex.hpp>
 #include "primary_transform.hpp"
 
-#ifndef BOOST_RE_NO_LOCALE_H
 
 # ifdef BOOST_MSVC
 #  pragma warning(disable:4786)
@@ -180,8 +188,8 @@ message_data<char>::message_data(const std::locale& l, const std::string& regex_
    : is(&sbuf)
 {
    is.imbue(l);
-#ifndef BOOST_RE_NO_MESSAGES
+#ifndef BOOST_NO_STD_MESSAGES
-   const std::messages<char>* pm = &BOOST_RE_USE_FACET(l, std::messages<char>);
+   const std::messages<char>* pm = &BOOST_USE_FACET(std::messages<char>, l);
    std::messages<char>::catalog cat = regex_message_catalogue.size() ? pm->open(regex_message_catalogue, l) : -1;
 #endif
    std::memset(syntax_map, cpp_regex_traits<char>::syntax_char, 256);
@@ -199,7 +207,7 @@ message_data<char>::message_data(const std::locale& l, const std::string& regex_
       }
       re_get_default_message(a.get(), array_size, i+100);
       std::string s = a.get();
-#ifndef BOOST_RE_NO_MESSAGES
+#ifndef BOOST_NO_STD_MESSAGES
       if((int)cat >= 0)
          s = pm->get(cat, 0, i+100, s);
 #endif
@@ -209,7 +217,7 @@ message_data<char>::message_data(const std::locale& l, const std::string& regex_
       }
    }
 
-#ifndef BOOST_RE_NO_MESSAGES
+#ifndef BOOST_NO_STD_MESSAGES
    // load any custom collate names:
    std::string c1, c2;
    i = 400;
@@ -249,7 +257,7 @@ message_data<char>::message_data(const std::locale& l, const std::string& regex_
 */
    std::string m;
    std::string s;
-#ifndef BOOST_RE_NO_MESSAGES
+#ifndef BOOST_NO_STD_MESSAGES
    if((int)cat >= 0)
    {
       for(i = 0; i < re_classes_max; ++i)
@@ -270,7 +278,7 @@ message_data<char>::message_data(const std::locale& l, const std::string& regex_
 #endif
 }
 
-std::string BOOST_RE_CALL cpp_regex_traits_base::set_message_catalogue(const std::string& l)
+std::string BOOST_REGEX_CALL cpp_regex_traits_base::set_message_catalogue(const std::string& l)
 {
    if(sizeof(regex_message_cat) <= l.size())
       return l;
@@ -299,9 +307,9 @@ cpp_regex_traits<char>::cpp_regex_traits()
    }
    for(unsigned int i = 0; i < char_set_size; ++i)
       lower_map[i] = static_cast<char>(i);
-   pctype = &BOOST_RE_USE_FACET(locale_inst, std::ctype<char>);
+   pctype = &BOOST_USE_FACET(std::ctype<char>, locale_inst);
    pctype->tolower(&lower_map[0], &lower_map[char_set_size]);
-   pcollate = &BOOST_RE_USE_FACET(locale_inst, std::collate<char>);
+   pcollate = &BOOST_USE_FACET(std::collate<char>, locale_inst);
    sort_type = re_detail::find_sort_syntax(this, &(this->sort_delim));
 }
 
@@ -311,7 +319,7 @@ cpp_regex_traits<char>::~cpp_regex_traits()
    delete[] lower_map;
 }
 
-int BOOST_RE_CALL cpp_regex_traits<char>::toi(char c)const
+int BOOST_REGEX_CALL cpp_regex_traits<char>::toi(char c)const
 {
    pmd->sbuf.pubsetbuf(&c, 1);
    pmd->is.clear();
@@ -325,7 +333,7 @@ int BOOST_RE_CALL cpp_regex_traits<char>::toi(char c)const
       return 0;
 }
 
-int BOOST_RE_CALL cpp_regex_traits<char>::toi(const char*& first, const char* last, int radix)const
+int BOOST_REGEX_CALL cpp_regex_traits<char>::toi(const char*& first, const char* last, int radix)const
 {
    pmd->sbuf.pubsetbuf((char*)first, last-first);
    pmd->is.clear();
@@ -342,7 +350,7 @@ int BOOST_RE_CALL cpp_regex_traits<char>::toi(const char*& first, const char* la
       return 0;
 }
 
-boost::uint_fast32_t BOOST_RE_CALL cpp_regex_traits<char>::lookup_classname(const char* first, const char* last)const
+boost::uint_fast32_t BOOST_REGEX_CALL cpp_regex_traits<char>::lookup_classname(const char* first, const char* last)const
 {
    BOOST_RE_GUARD_STACK
    unsigned int i;
@@ -360,7 +368,7 @@ boost::uint_fast32_t BOOST_RE_CALL cpp_regex_traits<char>::lookup_classname(cons
    return 0;
 }
 
-bool BOOST_RE_CALL cpp_regex_traits<char>::lookup_collatename(std::string& s, const char* first, const char* last)const
+bool BOOST_REGEX_CALL cpp_regex_traits<char>::lookup_collatename(std::string& s, const char* first, const char* last)const
 {
    BOOST_RE_GUARD_STACK
    std::string name(first, last);
@@ -373,7 +381,7 @@ bool BOOST_RE_CALL cpp_regex_traits<char>::lookup_collatename(std::string& s, co
    return re_detail::re_lookup_def_collate_name(s, name.c_str());
 }
 
-void BOOST_RE_CALL cpp_regex_traits<char>::transform_primary(std::string& out, const std::string& in)const
+void BOOST_REGEX_CALL cpp_regex_traits<char>::transform_primary(std::string& out, const std::string& in)const
 {
    transform(out, in);
    switch(sort_type)
@@ -398,14 +406,14 @@ void BOOST_RE_CALL cpp_regex_traits<char>::transform_primary(std::string& out, c
 }
 
 
-std::string BOOST_RE_CALL cpp_regex_traits<char>::error_string(unsigned id)const
+std::string BOOST_REGEX_CALL cpp_regex_traits<char>::error_string(unsigned id)const
 {
    if((id <= boost::REG_E_UNKNOWN) && (pmd->error_strings[id].size()))
       return pmd->error_strings[id];
    return boost::re_detail::re_default_error_messages[id];
 }
 
-cpp_regex_traits<char>::locale_type BOOST_RE_CALL cpp_regex_traits<char>::imbue(locale_type l)
+cpp_regex_traits<char>::locale_type BOOST_REGEX_CALL cpp_regex_traits<char>::imbue(locale_type l)
 {
    locale_type old_l(locale_inst);
    locale_inst = l;
@@ -415,18 +423,18 @@ cpp_regex_traits<char>::locale_type BOOST_RE_CALL cpp_regex_traits<char>::imbue(
    psyntax = pmd->syntax_map;
    for(unsigned int i = 0; i < char_set_size; ++i)
       lower_map[i] = static_cast<char>(i);
-   pctype = &BOOST_RE_USE_FACET(locale_inst, std::ctype<char>);
+   pctype = &BOOST_USE_FACET(std::ctype<char>, locale_inst);
    pctype->tolower(&lower_map[0], &lower_map[char_set_size]);
-   pcollate = &BOOST_RE_USE_FACET(locale_inst, std::collate<char>);
+   pcollate = &BOOST_USE_FACET(std::collate<char>, locale_inst);
    sort_type = re_detail::find_sort_syntax(this, &(this->sort_delim));
    return old_l;
 }
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 
 namespace re_detail{
 
-std::string BOOST_RE_CALL to_narrow(const std::basic_string<wchar_t>& is, const std::codecvt<wchar_t, char, std::mbstate_t>& cvt)
+std::string BOOST_REGEX_CALL to_narrow(const std::basic_string<wchar_t>& is, const std::codecvt<wchar_t, char, std::mbstate_t>& cvt)
 {
    BOOST_RE_GUARD_STACK
    unsigned int bufsize = is.size() * 2;
@@ -434,8 +442,6 @@ std::string BOOST_RE_CALL to_narrow(const std::basic_string<wchar_t>& is, const
    // declare buffer first as VC6 workaround for internal compiler error!
    char* pc = new char[bufsize];
    scoped_array<char> t(pc);
-   //typedef std::codecvt<wchar_t, char, std::mbstate_t> cvt_type;
-   //const cvt_type& cvt = BOOST_RE_USE_FACET(l, cvt_type);
    #ifdef BOOST_MSVC
    std::mbstate_t state = 0;
    #else
@@ -467,7 +473,7 @@ std::string BOOST_RE_CALL to_narrow(const std::basic_string<wchar_t>& is, const
    }
 }
 
-std::wstring BOOST_RE_CALL to_wide(const std::string& is, const std::codecvt<wchar_t, char, std::mbstate_t>& cvt)
+std::wstring BOOST_REGEX_CALL to_wide(const std::string& is, const std::codecvt<wchar_t, char, std::mbstate_t>& cvt)
 {
    BOOST_RE_GUARD_STACK
    unsigned int bufsize = is.size() + 2;
@@ -476,8 +482,6 @@ std::wstring BOOST_RE_CALL to_wide(const std::string& is, const std::codecvt<wch
    // declare buffer first as VC6 workaround for internal compiler error!
    wchar_t* pc = new wchar_t[bufsize];
    scoped_array<wchar_t> t(pc);
-   //typedef std::codecvt<wchar_t, char, std::mbstate_t> cvt_type;
-   //const cvt_type& cvt = BOOST_RE_USE_FACET(l, cvt_type);
    #ifdef BOOST_MSVC
    std::mbstate_t state = 0;
    #else
@@ -520,7 +524,7 @@ std::wstring BOOST_RE_CALL to_wide(const std::string& is, const std::codecvt<wch
 template <>
 struct message_data<wchar_t>
 {
-#ifndef BOOST_RE_NO_MESSAGES
+#ifndef BOOST_NO_STD_MESSAGES
    typedef std::messages<wchar_t>::string_type string_type;
 #else
    typedef std::wstring string_type;
@@ -555,9 +559,9 @@ message_data<wchar_t>::message_data(const std::locale& l, const std::string& reg
    is.imbue(l);
    syntax_map m;
    typedef std::codecvt<wchar_t, char, std::mbstate_t> cvt_type;
-   const cvt_type& cvt = BOOST_RE_USE_FACET(l, cvt_type);
+   const cvt_type& cvt = BOOST_USE_FACET(cvt_type, l);
-#ifndef BOOST_RE_NO_MESSAGES
+#ifndef BOOST_NO_STD_MESSAGES
-   const std::messages<wchar_t>& msgs = BOOST_RE_USE_FACET(l, std::messages<wchar_t>);
+   const std::messages<wchar_t>& msgs = BOOST_USE_FACET(std::messages<wchar_t>, l);
    std::messages<wchar_t>::catalog cat = regex_message_catalogue.size() ? msgs.open(regex_message_catalogue, l) : -1;
 #endif
    scoped_array<char> a;
@@ -576,9 +580,9 @@ message_data<wchar_t>::message_data(const std::locale& l, const std::string& reg
       re_get_default_message(a.get(), array_size, i+100);
       std::string ns = a.get();
       string_type s = to_wide(ns, cvt);
-#ifndef BOOST_RE_NO_MESSAGES
+#ifndef BOOST_NO_STD_MESSAGES
       if((int)cat >= 0)
-         s = BOOST_RE_USE_FACET(l, std::messages<wchar_t>).get(cat, 0, i+100, s);
+         s = BOOST_USE_FACET(std::messages<wchar_t>, l).get(cat, 0, i+100, s);
 #endif
       for(unsigned int j = 0; j < s.size(); ++j)
       {
@@ -593,7 +597,7 @@ message_data<wchar_t>::message_data(const std::locale& l, const std::string& reg
       }
    }
 
-#ifndef BOOST_RE_NO_MESSAGES
+#ifndef BOOST_NO_STD_MESSAGES
    // load any custom collate names:
    string_type c1, c2;
    i = 400;
@@ -639,7 +643,7 @@ message_data<wchar_t>::message_data(const std::locale& l, const std::string& reg
 
 } // namespace re_detail
 
-unsigned int BOOST_RE_CALL cpp_regex_traits<wchar_t>::do_syntax_type(size_type c)const
+unsigned int BOOST_REGEX_CALL cpp_regex_traits<wchar_t>::do_syntax_type(size_type c)const
 {
    std::list<re_detail::message_data<wchar_t>::syntax_map>::const_iterator i, j;
    i = pmd->syntax.begin();
@@ -653,7 +657,7 @@ unsigned int BOOST_RE_CALL cpp_regex_traits<wchar_t>::do_syntax_type(size_type c
    return 0;
 }
 
-void BOOST_RE_CALL cpp_regex_traits<wchar_t>::transform_primary(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in)const
+void BOOST_REGEX_CALL cpp_regex_traits<wchar_t>::transform_primary(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in)const
 {
    transform(out, in);
    switch(sort_type)
@@ -677,7 +681,7 @@ void BOOST_RE_CALL cpp_regex_traits<wchar_t>::transform_primary(std::basic_strin
    }
 }
 
-int BOOST_RE_CALL cpp_regex_traits<wchar_t>::toi(wchar_t c)const
+int BOOST_REGEX_CALL cpp_regex_traits<wchar_t>::toi(wchar_t c)const
 {
    pmd->sbuf.pubsetbuf(&c, 1);
    pmd->is.clear();
@@ -691,7 +695,7 @@ int BOOST_RE_CALL cpp_regex_traits<wchar_t>::toi(wchar_t c)const
       return 0;
 }
 
-int BOOST_RE_CALL cpp_regex_traits<wchar_t>::toi(const wchar_t*& first, const wchar_t* last, int radix)const
+int BOOST_REGEX_CALL cpp_regex_traits<wchar_t>::toi(const wchar_t*& first, const wchar_t* last, int radix)const
 {
    pmd->sbuf.pubsetbuf((wchar_t*)first, last-first);
    pmd->is.clear();
@@ -708,7 +712,7 @@ int BOOST_RE_CALL cpp_regex_traits<wchar_t>::toi(const wchar_t*& first, const wc
       return 0;
 }
 
-boost::uint_fast32_t BOOST_RE_CALL cpp_regex_traits<wchar_t>::lookup_classname(const wchar_t* first, const wchar_t* last)const
+boost::uint_fast32_t BOOST_REGEX_CALL cpp_regex_traits<wchar_t>::lookup_classname(const wchar_t* first, const wchar_t* last)const
 {
    BOOST_RE_GUARD_STACK
    unsigned int i;
@@ -728,7 +732,7 @@ boost::uint_fast32_t BOOST_RE_CALL cpp_regex_traits<wchar_t>::lookup_classname(c
    return 0;
 }
 
-bool BOOST_RE_CALL cpp_regex_traits<wchar_t>::lookup_collatename(std::basic_string<wchar_t>& s, const wchar_t* first, const wchar_t* last)const
+bool BOOST_REGEX_CALL cpp_regex_traits<wchar_t>::lookup_collatename(std::basic_string<wchar_t>& s, const wchar_t* first, const wchar_t* last)const
 {
    BOOST_RE_GUARD_STACK
    std::wstring name(first, last);
@@ -745,7 +749,7 @@ bool BOOST_RE_CALL cpp_regex_traits<wchar_t>::lookup_collatename(std::basic_stri
    return result;
 }
 
-std::string BOOST_RE_CALL cpp_regex_traits<wchar_t>::error_string(unsigned id)const
+std::string BOOST_REGEX_CALL cpp_regex_traits<wchar_t>::error_string(unsigned id)const
 {
    if((id <= boost::REG_E_UNKNOWN) && (pmd->error_strings[id].size()))
       return pmd->error_strings[id];
@@ -766,11 +770,11 @@ cpp_regex_traits<wchar_t>::cpp_regex_traits()
    }
    for(unsigned int i = 0; i < char_set_size; ++i)
       lower_map[i] = static_cast<wchar_t>(i);
-   pctype = &BOOST_RE_USE_FACET(locale_inst, std::ctype<wchar_t>);
+   pctype = &BOOST_USE_FACET(std::ctype<wchar_t>, locale_inst);
    pctype->tolower(&lower_map[0], &lower_map[char_set_size]);
-   pcollate = &BOOST_RE_USE_FACET(locale_inst, std::collate<wchar_t>);
+   pcollate = &BOOST_USE_FACET(std::collate<wchar_t>, locale_inst);
    typedef std::codecvt<wchar_t, char, std::mbstate_t> cvt_t;
-   pcdv = &BOOST_RE_USE_FACET(locale_inst, cvt_t);
+   pcdv = &BOOST_USE_FACET(cvt_t, locale_inst);
    sort_type = re_detail::find_sort_syntax(this, &(this->sort_delim));
 }
 
@@ -780,7 +784,7 @@ cpp_regex_traits<wchar_t>::~cpp_regex_traits()
    delete[] lower_map;
 }
 
-cpp_regex_traits<wchar_t>::locale_type BOOST_RE_CALL cpp_regex_traits<wchar_t>::imbue(locale_type l)
+cpp_regex_traits<wchar_t>::locale_type BOOST_REGEX_CALL cpp_regex_traits<wchar_t>::imbue(locale_type l)
 {
    locale_type old_l(locale_inst);
    locale_inst = l;
@@ -790,16 +794,16 @@ cpp_regex_traits<wchar_t>::locale_type BOOST_RE_CALL cpp_regex_traits<wchar_t>::
    psyntax = pmd->syntax_;
    for(unsigned int i = 0; i < char_set_size; ++i)
       lower_map[i] = static_cast<wchar_t>(i);
-   pctype = &BOOST_RE_USE_FACET(locale_inst, std::ctype<wchar_t>);
+   pctype = &BOOST_USE_FACET(std::ctype<wchar_t>, locale_inst);
    pctype->tolower(&lower_map[0], &lower_map[char_set_size]);
-   pcollate = &BOOST_RE_USE_FACET(locale_inst, std::collate<wchar_t>);
+   pcollate = &BOOST_USE_FACET(std::collate<wchar_t>, locale_inst);
    typedef std::codecvt<wchar_t, char, std::mbstate_t> cvt_t;
-   pcdv = &BOOST_RE_USE_FACET(locale_inst, cvt_t);
+   pcdv = &BOOST_USE_FACET(cvt_t, locale_inst);
    sort_type = re_detail::find_sort_syntax(this, &(this->sort_delim));
    return old_l;
 }
 
-unsigned int BOOST_RE_CALL cpp_regex_traits<wchar_t>::strwiden(wchar_t *s1, unsigned int len, const char *s2)const
+unsigned int BOOST_REGEX_CALL cpp_regex_traits<wchar_t>::strwiden(wchar_t *s1, unsigned int len, const char *s2)const
 {
    std::string s(s2);
    std::wstring ws = re_detail::to_wide(s2, *pcdv);
@@ -808,7 +812,7 @@ unsigned int BOOST_RE_CALL cpp_regex_traits<wchar_t>::strwiden(wchar_t *s1, unsi
    return ws.size()+1;
 }
 
-#endif // BOOST_RE_NO_WCSTRING
+#endif // BOOST_NO_WREGEX
 
 
 } // namespace boost

src/cregex.cpp

@@ -19,6 +19,10 @@
   *   VERSION:     3.12
   *   DESCRIPTION: Implements high level class boost::RexEx
   */
+
+
+#define BOOST_REGEX_SOURCE
+
 #include <boost/cregex.hpp>
 #include <boost/regex.hpp>
 #if !defined(BOOST_RE_NO_STRING_H)

src/fileiter.cpp

@@ -21,6 +21,8 @@
   */
 
 
+#define BOOST_REGEX_SOURCE
+
 #include <climits>
 #include <stdexcept>
 #include <boost/regex/detail/fileiter.hpp>
@@ -29,11 +31,15 @@
 #include <sys/cygwin.h>
 #endif
 
+#ifdef BOOST_MSVC
+#  pragma warning(disable: 4800)
+#endif
+
 namespace boost{
    namespace re_detail{
 // start with the operating system specific stuff:
 
-#if (defined(__BORLANDC__) || defined(FI_WIN32_DIR) || defined(BOOST_MSVC)) && !defined(BOOST_RE_NO_WIN32)
+#if (defined(__BORLANDC__) || defined(BOOST_REGEX_FI_WIN32_DIR) || defined(BOOST_MSVC)) && !defined(BOOST_RE_NO_WIN32)
 
 // platform is DOS or Windows
 // directories are separated with '\\'
@@ -41,7 +47,7 @@ namespace boost{
 
 const char* _fi_sep = "\\";
 const char* _fi_sep_alt = "/";
-#define FI_TRANSLATE(c) std::tolower(c)
+#define BOOST_REGEX_FI_TRANSLATE(c) std::tolower(c)
 
 #else
 
@@ -51,11 +57,11 @@ const char* _fi_sep_alt = "/";
 
 const char* _fi_sep = "/";
 const char* _fi_sep_alt = _fi_sep;
-#define FI_TRANSLATE(c) c
+#define BOOST_REGEX_FI_TRANSLATE(c) c
 
 #endif
 
-#ifdef FI_WIN32_MAP
+#ifdef BOOST_REGEX_FI_WIN32_MAP
 
 void mapfile::open(const char* file)
 {
@@ -679,7 +685,7 @@ void directory_iterator::next()
 }
 
 
-#ifdef FI_POSIX_DIR
+#ifdef BOOST_REGEX_FI_POSIX_DIR
 
 struct _fi_priv_data
 {
@@ -746,7 +752,7 @@ bool iswild(const char* mask, const char* name)
          }
          // fall through:
       default:
-         if(FI_TRANSLATE(*mask) != FI_TRANSLATE(*name))
+         if(BOOST_REGEX_FI_TRANSLATE(*mask) != BOOST_REGEX_FI_TRANSLATE(*name))
             return false;
          ++mask;
          ++name;

src/posix_api.cpp

@@ -20,6 +20,8 @@
   *   DESCRIPTION: Implements the Posix API wrappers.
   */
 
+#define BOOST_REGEX_SOURCE
+
 #include <cstdio>
 #include <boost/regex.hpp>
 
@@ -35,7 +37,7 @@ const char* names[] = {"REG_NOERROR", "REG_NOMATCH", "REG_BADPAT", "REG_ECOLLATE
                         "REG_ESPACE", "REG_BADRPT", "REG_EMPTY", "REG_E_UNKNOWN"};
 } // namespace
 
-BOOST_RE_IX_DECL int BOOST_RE_CCALL regcompA(regex_tA* expression, const char* ptr, int f)
+BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompA(regex_tA* expression, const char* ptr, int f)
 {
    BOOST_RE_GUARD_STACK
    if(expression->re_magic != magic_value)
@@ -90,7 +92,7 @@ BOOST_RE_IX_DECL int BOOST_RE_CCALL regcompA(regex_tA* expression, const char* p
 
 }
 
-BOOST_RE_IX_DECL unsigned int BOOST_RE_CCALL regerrorA(int code, const regex_tA* e, char* buf, unsigned int buf_size)
+BOOST_REGEX_DECL unsigned int BOOST_REGEX_CCALL regerrorA(int code, const regex_tA* e, char* buf, unsigned int buf_size)
 {
    BOOST_RE_GUARD_STACK
    unsigned int result = 0;
@@ -148,7 +150,7 @@ BOOST_RE_IX_DECL unsigned int BOOST_RE_CCALL regerrorA(int code, const regex_tA*
    return 0;
 }
 
-BOOST_RE_IX_DECL int BOOST_RE_CCALL regexecA(const regex_tA* expression, const char* buf, unsigned int n, regmatch_t* array, int eflags)
+BOOST_REGEX_DECL int BOOST_REGEX_CCALL regexecA(const regex_tA* expression, const char* buf, unsigned int n, regmatch_t* array, int eflags)
 {
    BOOST_RE_GUARD_STACK
    bool result = false;
@@ -204,7 +206,7 @@ BOOST_RE_IX_DECL int BOOST_RE_CCALL regexecA(const regex_tA* expression, const c
    return REG_NOMATCH;
 }
 
-BOOST_RE_IX_DECL void BOOST_RE_CCALL regfreeA(regex_tA* expression)
+BOOST_REGEX_DECL void BOOST_REGEX_CCALL regfreeA(regex_tA* expression)
 {
    BOOST_RE_GUARD_STACK
    if(expression->re_magic == magic_value)

src/regex.cpp

@@ -21,6 +21,8 @@
   */
 
 
+#define BOOST_REGEX_SOURCE
+
 #include <boost/regex.hpp>
 
 

src/regex_debug.cpp

@@ -21,7 +21,9 @@
   */
 
 
-#include <boost/regex/detail/regex_config.hpp>
+#define BOOST_REGEX_SOURCE
+
+#include <boost/regex/config.hpp>
 #include <boost/regex/detail/regex_raw_buffer.hpp>
 #include <boost/regex.hpp>
 
@@ -29,7 +31,7 @@
 #include <crtdbg.h>
 #endif
 
-#ifdef BOOST_RE_DEBUG
+#ifdef BOOST_REGEX_DEBUG
 #ifndef BOOST_RE_OLD_IOSTREAM
 #include <ostream>
 #else 

src/regex_synch.cpp

@@ -20,15 +20,19 @@
   *   DESCRIPTION: Thread synch helper functions, for regular
   *                expression library.
   */
+
+
+#define BOOST_REGEX_SOURCE
+
 #include <boost/regex/detail/regex_synch.hpp>
 
 namespace boost{
    namespace re_detail{
 
-void BOOST_RE_CALL re_init_threads()
+void BOOST_REGEX_CALL re_init_threads()
 {
    BOOST_RE_GUARD_STACK
-#ifdef BOOST_RE_THREADS
+#ifdef BOOST_HAS_THREADS
    if(p_re_lock == 0)
       p_re_lock = new critical_section();
    cs_guard g(*p_re_lock);
@@ -36,10 +40,10 @@ void BOOST_RE_CALL re_init_threads()
 #endif
 }
 
-void BOOST_RE_CALL re_free_threads()
+void BOOST_REGEX_CALL re_free_threads()
 {
    BOOST_RE_GUARD_STACK
-#ifdef BOOST_RE_THREADS
+#ifdef BOOST_HAS_THREADS
    cs_guard g(*p_re_lock);
    --re_lock_count;
    if(re_lock_count == 0)
@@ -51,11 +55,11 @@ void BOOST_RE_CALL re_free_threads()
 #endif
 }
 
-#ifdef BOOST_RE_THREADS
+#ifdef BOOST_HAS_THREADS
 
-BOOST_RE_IX_DECL critical_section* p_re_lock = 0;
+BOOST_REGEX_DECL critical_section* p_re_lock = 0;
 
-BOOST_RE_IX_DECL unsigned int re_lock_count = 0;
+BOOST_REGEX_DECL unsigned int re_lock_count = 0;
 
 #endif
 

src/w32_regex_traits.cpp

@@ -20,6 +20,8 @@
   *   DESCRIPTION: Implements the w32_regex_traits<charT> traits class
   */
 
+#define BOOST_REGEX_SOURCE
+
 #include <clocale>
 #include <cstdio>
 #include <list>
@@ -30,7 +32,7 @@
 #include <boost/regex/detail/regex_synch.hpp>
 #include <boost/regex/detail/regex_cstring.hpp>
 
-#if defined(_WIN32) && !defined(BOOST_RE_NO_W32)
+#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
 
 //
 // VC6 needs to link to user32.lib:
@@ -103,7 +105,7 @@ std::list<collate_name_t>* pcoll_names = 0;
 
 HINSTANCE hresmod = 0;
 
-BOOST_RE_IX_DECL char* re_custom_error_messages[] = {
+BOOST_REGEX_DECL char* re_custom_error_messages[] = {
    0,
    0,
    0,
@@ -140,10 +142,10 @@ enum syntax_map_size
    map_size = UCHAR_MAX + 1
 };
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 
-BOOST_RE_IX_DECL wchar_t re_zero_w;
+BOOST_REGEX_DECL wchar_t re_zero_w;
-BOOST_RE_IX_DECL wchar_t re_ten_w;
+BOOST_REGEX_DECL wchar_t re_ten_w;
 
 bool isPlatformNT = false;
 
@@ -157,10 +159,10 @@ std::list<syntax_map_t>* syntax;
 
 #endif
 
-unsigned int BOOST_RE_CALL _re_get_message(char* buf, unsigned int len, unsigned int id);
+unsigned int BOOST_REGEX_CALL _re_get_message(char* buf, unsigned int len, unsigned int id);
 
 template <class charT>
-unsigned int BOOST_RE_CALL get_message(charT* buf, unsigned int len, unsigned int id)
+unsigned int BOOST_REGEX_CALL get_message(charT* buf, unsigned int len, unsigned int id)
 {
    unsigned int size = _re_get_message((char*)0, 0, id);
    if(len < size)
@@ -171,12 +173,12 @@ unsigned int BOOST_RE_CALL get_message(charT* buf, unsigned int len, unsigned in
    return size;
 }
 
-inline unsigned int BOOST_RE_CALL get_message(char* buf, unsigned int len, unsigned int id)
+inline unsigned int BOOST_REGEX_CALL get_message(char* buf, unsigned int len, unsigned int id)
 {
    return _re_get_message(buf, len, id);
 }
 
-unsigned int BOOST_RE_CALL _re_get_message(char* buf, unsigned int len, unsigned int id)
+unsigned int BOOST_REGEX_CALL _re_get_message(char* buf, unsigned int len, unsigned int id)
 {
    BOOST_RE_GUARD_STACK
    // get the customised message if any:
@@ -193,7 +195,7 @@ unsigned int BOOST_RE_CALL _re_get_message(char* buf, unsigned int len, unsigned
    return boost::re_detail::re_get_default_message(buf, len, id);
 }
 
-const char* BOOST_RE_CALL re_get_error_str(unsigned int id)
+const char* BOOST_REGEX_CALL re_get_error_str(unsigned int id)
 {
    BOOST_RE_GUARD_STACK
 #ifdef BOOST_RE_THREADS
@@ -221,7 +223,7 @@ namespace re_detail{
 
 char w32_traits_base::regex_message_catalogue[200] = {0};
 
-void BOOST_RE_CALL w32_traits_base::do_init()
+void BOOST_REGEX_CALL w32_traits_base::do_init()
 {
    BOOST_RE_GUARD_STACK
    if(is_init == 0)
@@ -240,7 +242,7 @@ void BOOST_RE_CALL w32_traits_base::do_init()
             re_custom_error_messages[i] = 0;
          }
       }
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
       //
       // wide character strings:
       syntax = new std::list<syntax_map_t>();
@@ -323,7 +325,7 @@ void BOOST_RE_CALL w32_traits_base::do_init()
       }
       else
          re_ten = 'a';
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
       //
       // wide string data:
       std::basic_string<wchar_t> ws;
@@ -359,11 +361,11 @@ void BOOST_RE_CALL w32_traits_base::do_init()
             syntax->push_back(sm);
          }
       }
-#endif // BOOST_RE_NO_WCSTRING
+#endif // BOOST_NO_WREGEX
    }
 }
 
-void BOOST_RE_CALL w32_traits_base::do_free()
+void BOOST_REGEX_CALL w32_traits_base::do_free()
 {
    BOOST_RE_GUARD_STACK
    delete[] pclasses;
@@ -384,12 +386,12 @@ void BOOST_RE_CALL w32_traits_base::do_free()
    }
 }
 
-std::string BOOST_RE_CALL w32_traits_base::error_string(unsigned id)
+std::string BOOST_REGEX_CALL w32_traits_base::error_string(unsigned id)
 {
    return re_get_error_str(id);
 }
 
-boost::uint_fast32_t BOOST_RE_CALL w32_traits_base::do_lookup_class(const char* p)
+boost::uint_fast32_t BOOST_REGEX_CALL w32_traits_base::do_lookup_class(const char* p)
 {
    BOOST_RE_GUARD_STACK
    unsigned int i;
@@ -410,7 +412,7 @@ boost::uint_fast32_t BOOST_RE_CALL w32_traits_base::do_lookup_class(const char*
    return 0;
 }
 
-bool BOOST_RE_CALL w32_traits_base::do_lookup_collate(std::string& buf, const char* p)
+bool BOOST_REGEX_CALL w32_traits_base::do_lookup_collate(std::string& buf, const char* p)
 {
    BOOST_RE_GUARD_STACK
    std::list<collate_name_t>::iterator first, last;
@@ -435,7 +437,7 @@ bool BOOST_RE_CALL w32_traits_base::do_lookup_collate(std::string& buf, const ch
    return result;
 }
 
-std::string BOOST_RE_CALL w32_traits_base::set_message_catalogue(const std::string& l)
+std::string BOOST_REGEX_CALL w32_traits_base::set_message_catalogue(const std::string& l)
 {
    BOOST_RE_GUARD_STACK
    #ifdef BOOST_RE_THREADS
@@ -456,7 +458,7 @@ char w32_traits_base::lower_case_map[map_size];
 
 w32_regex_traits<char> w32_regex_traits<char>::i;
 
-void BOOST_RE_CALL w32_regex_traits<char>::update()
+void BOOST_REGEX_CALL w32_regex_traits<char>::update()
 {
    BOOST_RE_GUARD_STACK
    #ifdef BOOST_RE_THREADS
@@ -489,7 +491,7 @@ w32_regex_traits<char>::~w32_regex_traits()
 #endif
 }
 
-void BOOST_RE_CALL w32_regex_traits<char>::transform(std::string& out, const std::string& in)
+void BOOST_REGEX_CALL w32_regex_traits<char>::transform(std::string& out, const std::string& in)
 {
    BOOST_RE_GUARD_STACK
    size_t n = LCMapStringA(GetUserDefaultLCID(), LCMAP_SORTKEY, in.c_str(), -1, 0, 0);
@@ -508,7 +510,7 @@ void BOOST_RE_CALL w32_regex_traits<char>::transform(std::string& out, const std
    out = buf.get();
 }
 
-void BOOST_RE_CALL w32_regex_traits<char>::transform_primary(std::string& out, const std::string& in)
+void BOOST_REGEX_CALL w32_regex_traits<char>::transform_primary(std::string& out, const std::string& in)
 {
    transform(out, in);
    for(unsigned int i = 0; i < out.size(); ++i)
@@ -522,7 +524,7 @@ void BOOST_RE_CALL w32_regex_traits<char>::transform_primary(std::string& out, c
 }
 
 
-int BOOST_RE_CALL w32_regex_traits<char>::toi(char c)
+int BOOST_REGEX_CALL w32_regex_traits<char>::toi(char c)
 {
    if(is_class(c, char_class_digit))
       return c - re_zero;
@@ -531,7 +533,7 @@ int BOOST_RE_CALL w32_regex_traits<char>::toi(char c)
    return -1; // error!!
 }
 
-int BOOST_RE_CALL w32_regex_traits<char>::toi(const char*& first, const char* last, int radix)
+int BOOST_REGEX_CALL w32_regex_traits<char>::toi(const char*& first, const char* last, int radix)
 {
    unsigned int maxval;
    if(radix < 0)
@@ -561,9 +563,9 @@ int BOOST_RE_CALL w32_regex_traits<char>::toi(const char*& first, const char* la
    return result;
 }
 
-#ifndef BOOST_RE_NO_WCSTRING
+#ifndef BOOST_NO_WREGEX
 
-bool BOOST_RE_CALL w32_regex_traits<wchar_t>::lookup_collatename(std::basic_string<wchar_t>& out, const wchar_t* first, const wchar_t* last)
+bool BOOST_REGEX_CALL w32_regex_traits<wchar_t>::lookup_collatename(std::basic_string<wchar_t>& out, const wchar_t* first, const wchar_t* last)
 {
    BOOST_RE_GUARD_STACK
    std::basic_string<wchar_t> s(first, last);
@@ -588,7 +590,7 @@ bool BOOST_RE_CALL w32_regex_traits<wchar_t>::lookup_collatename(std::basic_stri
    return result;
 }
 
-unsigned int BOOST_RE_CALL w32_regex_traits<wchar_t>::syntax_type(size_type c)
+unsigned int BOOST_REGEX_CALL w32_regex_traits<wchar_t>::syntax_type(size_type c)
 {
    BOOST_RE_GUARD_STACK
    std::list<syntax_map_t>::const_iterator first, last;
@@ -603,7 +605,7 @@ unsigned int BOOST_RE_CALL w32_regex_traits<wchar_t>::syntax_type(size_type c)
    return 0;
 }
 
-bool BOOST_RE_CALL w32_regex_traits<wchar_t>::do_lookup_collate(std::basic_string<wchar_t>& out, const wchar_t* first, const wchar_t* last)
+bool BOOST_REGEX_CALL w32_regex_traits<wchar_t>::do_lookup_collate(std::basic_string<wchar_t>& out, const wchar_t* first, const wchar_t* last)
 {
    BOOST_RE_GUARD_STACK
    std::basic_string<wchar_t> s(first, last);
@@ -623,7 +625,7 @@ bool BOOST_RE_CALL w32_regex_traits<wchar_t>::do_lookup_collate(std::basic_strin
 }
 
 
-void BOOST_RE_CALL w32_regex_traits<wchar_t>::update()
+void BOOST_REGEX_CALL w32_regex_traits<wchar_t>::update()
 {
    BOOST_RE_GUARD_STACK
 #ifdef BOOST_RE_THREADS
@@ -656,22 +658,22 @@ w32_regex_traits<wchar_t>::~w32_regex_traits()
 #endif
 }
 
-bool BOOST_RE_CALL w32_regex_traits<wchar_t>::do_iswclass(wchar_t c, boost::uint_fast32_t f)
+bool BOOST_REGEX_CALL w32_regex_traits<wchar_t>::do_iswclass(wchar_t c, boost::uint_fast32_t f)
 {
    BOOST_RE_GUARD_STACK
    if((c & ~0xFF) == 0)
-      return BOOST_RE_MAKE_BOOL(re_detail::wide_unicode_classes[(uchar_type)c] & f);
+      return BOOST_REGEX_MAKE_BOOL(re_detail::wide_unicode_classes[(uchar_type)c] & f);
    WORD mask;
    if(f & char_class_unicode)
       return true;
    else if(isPlatformNT && GetStringTypeW(CT_CTYPE1, &c, 1, &mask))
-      return BOOST_RE_MAKE_BOOL(mask & f &char_class_win);
+      return BOOST_REGEX_MAKE_BOOL(mask & f &char_class_win);
    else if((f & char_class_graph) == char_class_graph)
       return true;  // all wide characters are considered "graphics"
    return false;
 }
 
-void BOOST_RE_CALL w32_regex_traits<wchar_t>::transform(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in)
+void BOOST_REGEX_CALL w32_regex_traits<wchar_t>::transform(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in)
 {
    BOOST_RE_GUARD_STACK
    scoped_array<char> alt;
@@ -714,7 +716,7 @@ void BOOST_RE_CALL w32_regex_traits<wchar_t>::transform(std::basic_string<wchar_
    out = buf.get();
 }
 
-void BOOST_RE_CALL w32_regex_traits<wchar_t>::transform_primary(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in)
+void BOOST_REGEX_CALL w32_regex_traits<wchar_t>::transform_primary(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in)
 {
    transform(out, in);
    for(unsigned int i = 0; i < out.size(); ++i)
@@ -728,7 +730,7 @@ void BOOST_RE_CALL w32_regex_traits<wchar_t>::transform_primary(std::basic_strin
 }
 
 
-int BOOST_RE_CALL w32_regex_traits<wchar_t>::toi(wchar_t c)
+int BOOST_REGEX_CALL w32_regex_traits<wchar_t>::toi(wchar_t c)
 {
    if(is_class(c, char_class_digit))
       return c - re_zero_w;
@@ -737,7 +739,7 @@ int BOOST_RE_CALL w32_regex_traits<wchar_t>::toi(wchar_t c)
    return -1; // error!!
 }
 
-int BOOST_RE_CALL w32_regex_traits<wchar_t>::toi(const wchar_t*& first, const wchar_t* last, int radix)
+int BOOST_REGEX_CALL w32_regex_traits<wchar_t>::toi(const wchar_t*& first, const wchar_t* last, int radix)
 {
    unsigned int maxval;
    if(radix < 0)
@@ -767,7 +769,7 @@ int BOOST_RE_CALL w32_regex_traits<wchar_t>::toi(const wchar_t*& first, const wc
    return result;
 }
 
-boost::uint_fast32_t BOOST_RE_CALL w32_regex_traits<wchar_t>::lookup_classname(const wchar_t* first, const wchar_t* last)
+boost::uint_fast32_t BOOST_REGEX_CALL w32_regex_traits<wchar_t>::lookup_classname(const wchar_t* first, const wchar_t* last)
 {
    std::basic_string<wchar_t> s(first, last);
    unsigned int len = strnarrow((char*)0, 0, s.c_str());
@@ -777,7 +779,7 @@ boost::uint_fast32_t BOOST_RE_CALL w32_regex_traits<wchar_t>::lookup_classname(c
    return len;
 }
 
-wchar_t BOOST_RE_CALL w32_regex_traits<wchar_t>::wtolower(wchar_t c)
+wchar_t BOOST_REGEX_CALL w32_regex_traits<wchar_t>::wtolower(wchar_t c)
 {
    BOOST_RE_GUARD_STACK
    if(isPlatformNT)
@@ -788,7 +790,7 @@ wchar_t BOOST_RE_CALL w32_regex_traits<wchar_t>::wtolower(wchar_t c)
 
 w32_regex_traits<wchar_t> w32_regex_traits<wchar_t>::init_;
 
-unsigned int BOOST_RE_CALL w32_regex_traits<wchar_t>::strnarrow(char *s1, unsigned int len, const wchar_t *s2)
+unsigned int BOOST_REGEX_CALL w32_regex_traits<wchar_t>::strnarrow(char *s1, unsigned int len, const wchar_t *s2)
 {
    BOOST_RE_GUARD_STACK
    unsigned int size = WideCharToMultiByte(CP_ACP, 0, s2, -1, s1, 0, 0, 0);
@@ -797,7 +799,7 @@ unsigned int BOOST_RE_CALL w32_regex_traits<wchar_t>::strnarrow(char *s1, unsign
    return WideCharToMultiByte(CP_ACP, 0, s2, -1, s1, len, 0, 0);
 }
 
-unsigned int BOOST_RE_CALL w32_regex_traits<wchar_t>::strwiden(wchar_t *s1, unsigned int len, const char *s2)
+unsigned int BOOST_REGEX_CALL w32_regex_traits<wchar_t>::strwiden(wchar_t *s1, unsigned int len, const char *s2)
 {
    BOOST_RE_GUARD_STACK
    unsigned int size = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED,   s2, -1, s1, 0);
@@ -1068,10 +1070,10 @@ unsigned short w32_regex_traits<wchar_t>::wide_unicode_classes[] = {
 
 
 
-#endif // BOOST_RE_NO_WCSTRING
+#endif // BOOST_NO_WREGEX
 
 
 } // namespace boost
 
-#endif // #if defined(_WIN32) && !defined(BOOST_RE_NO_W32)
+#endif // #if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
 

src/wide_posix_api.cpp

@@ -20,9 +20,11 @@
   *   DESCRIPTION: Implements the wide character POSIX API wrappers.
   */
 
-#include <boost/regex/detail/regex_config.hpp>
+#define BOOST_REGEX_SOURCE
 
-#ifndef BOOST_RE_NO_WCSTRING
+#include <boost/regex/config.hpp>
+
+#ifndef BOOST_NO_WREGEX
 
 #include <boost/regex.hpp>
 
@@ -45,7 +47,7 @@ const wchar_t* wnames[] = {L"REG_NOERROR", L"REG_NOMATCH", L"REG_BADPAT", L"REG_
 
 }
 
-BOOST_RE_IX_DECL int BOOST_RE_CCALL regcompW(regex_tW* expression, const wchar_t* ptr, int f)
+BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompW(regex_tW* expression, const wchar_t* ptr, int f)
 {
    BOOST_RE_GUARD_STACK
    if(expression->re_magic != wmagic_value)
@@ -100,7 +102,7 @@ BOOST_RE_IX_DECL int BOOST_RE_CCALL regcompW(regex_tW* expression, const wchar_t
 
 }
 
-BOOST_RE_IX_DECL unsigned int BOOST_RE_CCALL regerrorW(int code, const regex_tW* e, wchar_t* buf, unsigned int buf_size)
+BOOST_REGEX_DECL unsigned int BOOST_REGEX_CCALL regerrorW(int code, const regex_tW* e, wchar_t* buf, unsigned int buf_size)
 {
    BOOST_RE_GUARD_STACK
    unsigned int result = 0;
@@ -116,7 +118,7 @@ BOOST_RE_IX_DECL unsigned int BOOST_RE_CCALL regerrorW(int code, const regex_tW*
       }
       return result;
    }
-#if !defined(BOOST_RE_NO_SWPRINTF)
+#if !defined(BOOST_NO_SWPRINTF)
    if(code == REG_ATOI)
    {
       wchar_t localbuf[5];
@@ -158,7 +160,7 @@ BOOST_RE_IX_DECL unsigned int BOOST_RE_CCALL regerrorW(int code, const regex_tW*
    return 0;
 }
 
-BOOST_RE_IX_DECL int BOOST_RE_CCALL regexecW(const regex_tW* expression, const wchar_t* buf, unsigned int n, regmatch_t* array, int eflags)
+BOOST_REGEX_DECL int BOOST_REGEX_CCALL regexecW(const regex_tW* expression, const wchar_t* buf, unsigned int n, regmatch_t* array, int eflags)
 {
    BOOST_RE_GUARD_STACK
    bool result = false;
@@ -214,7 +216,7 @@ BOOST_RE_IX_DECL int BOOST_RE_CCALL regexecW(const regex_tW* expression, const w
    return REG_NOMATCH;
 }
 
-BOOST_RE_IX_DECL void BOOST_RE_CCALL regfreeW(regex_tW* expression)
+BOOST_REGEX_DECL void BOOST_REGEX_CCALL regfreeW(regex_tW* expression)
 {
    BOOST_RE_GUARD_STACK
    if(expression->re_magic == wmagic_value)

template_class_ref.htm

@@ -791,8 +791,8 @@ template <class charT> class regex_traits : public base_type { /*detailts*
 <p>Where &quot;<i>base_type</i>&quot; defaults to <i>w32_regex_traits</i>
 on Win32 systems, and <i>c_regex_traits</i> otherwise. The
 default behaviour can be changed by defining one of
-BOOST_RE_LOCALE_C (forces use of <i>c_regex_traits</i> by default),
+BOOST_REGEX_USE_C_LOCALE (forces use of <i>c_regex_traits</i> by default),
-or BOOST_RE_LOCALE_CPP (forces use of <i>cpp_regex_traits</i> by
+or BOOST_REGEX_USE_CPP_LOCALE (forces use of <i>cpp_regex_traits</i> by
 default). Alternatively a specific traits class can be passed to
 the <i>reg_expression</i> template. </p>
 

test/Jamfile

@@ -4,8 +4,8 @@ subproject libs/regex/test ;
 unit-test regress : regress/parse.cpp regress/regress.cpp regress/tests.cpp
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic
@@ -14,8 +14,8 @@ unit-test regress : regress/parse.cpp regress/regress.cpp regress/tests.cpp
 unit-test wregress : regress/parse.cpp regress/regress.cpp regress/tests.cpp
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 		<define>TEST_UNICODE=1
 	: 
 		debug
@@ -25,8 +25,8 @@ unit-test wregress : regress/parse.cpp regress/regress.cpp regress/tests.cpp
 unit-test posix_api_check_c : c_compiler_checks/posix_api_check.c
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic
@@ -35,8 +35,8 @@ unit-test posix_api_check_c : c_compiler_checks/posix_api_check.c
 unit-test wide_posix_api_check_c : c_compiler_checks/wide_posix_api_check.c
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic
@@ -45,8 +45,8 @@ unit-test wide_posix_api_check_c : c_compiler_checks/wide_posix_api_check.c
 unit-test posix_api_check : c_compiler_checks/posix_api_check.cpp
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic
@@ -55,8 +55,8 @@ unit-test posix_api_check : c_compiler_checks/posix_api_check.cpp
 unit-test wide_posix_api_check : c_compiler_checks/wide_posix_api_check.cpp
    <lib>../build/libboost_regex$(SUFLIB) 
 	: 
-		<include>$(BOOST_ROOT)
+		<include>../../../
-		<define>BOOST_RE_NO_LIB=1
+		<define>BOOST_REGEX_NO_LIB=1
 	: 
 		debug
       <runtime-link>dynamic

test/regress/makefile.in

@@ -1,47 +0,0 @@
-
-# very basic makefile for regression tests
-#
-CXX=@CXX@
-CXXFLAGS=@CXXFLAGS@ -I../../../../
-LIBS=@LIBS@ -L../../build -lboost_regex
-EXE=@ac_exe_ext@
-OBJ=@ac_obj_ext@
-
-total : @ac_regress@
-
-LIBDEP=../../build/libboost_regex.a ../../../../boost/regex/detail/regex_options.hpp ../../../../boost/regex/detail/regex_config.hpp
-
-r1$(EXE) :: tests.cpp parse.cpp regress.cpp
-	$(CXX) -o r1$(EXE) $(CXXFLAGS) tests.cpp parse.cpp regress.cpp $(LIBS)
-	./r1 tests.txt
-
-r2$(EXE) ::  tests.cpp parse.cpp regress.cpp
-	$(CXX) -o r2$(EXE) $(CXXFLAGS) -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LIBS)
-	./r2 tests.txt
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

test/regress/regex_test.cpp

@@ -24,11 +24,14 @@
   */
 
 // disable automatic selection of support library:
-#define BOOST_RE_NO_LIB
+#define BOOST_REGEX_NO_LIB
 
 #include <boost/regex.hpp>
 #include <boost/regex/src.cpp>
 
+#ifdef BOOST_MSVC
+#  pragma warning(disable: 4660)
+#endif
 //
 // instantiate templates used:
 //
@@ -111,7 +114,7 @@ template std::size_t regex_split(test_string_type*,
 
 template std::size_t regex_split(test_string_type*, test_string_type&);
 
-#ifndef BOOST_RE_NO_PARTIAL_FUNC_SPEC
+#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
 //
 // the following prototypes are only available if partial ordering
 // of template functions is supported:
@@ -170,9 +173,9 @@ template test_string_type regex_merge(const test_string_type&,
 //
 // include regression test source files:
 //
-#ifdef BOOST_RE_LOCALE_W32
+#ifdef BOOST_REGEX_USE_WIN32_LOCALE
 #define BOOST_RE_TEST_LOCALE_W32
-#elif !defined(BOOST_RE_LOCALE_C)
+#elif !defined(BOOST_REGEX_USE_C_LOCALE)
 #define BOOST_RE_TEST_LOCALE_CPP
 #endif
 

test/regress/regress.cpp

@@ -248,15 +248,16 @@ void jm_debug_alloc::free_()
     }
 }
 
-jm_debug_alloc::pointer jm_debug_alloc::allocate(size_type n, void*)
+void* jm_debug_alloc::allocate(size_type n, void*)
 {
    pointer p = new char[n + maxi(sizeof(size_type), boost::re_detail::padding_size)];
    *(size_type*)p = n;
    ++(*blocks);
    return p + maxi(sizeof(size_type), boost::re_detail::padding_size);
 }
-void jm_debug_alloc::deallocate(pointer p, size_type n)
+void jm_debug_alloc::deallocate(void* pv, size_type n)
 {
+   char* p = (char*)pv;
    p -= maxi(sizeof(size_type), boost::re_detail::padding_size);
    if(*(size_type*)p != n)
    {

test/regress/regress.h

@@ -25,7 +25,7 @@
 #ifndef _REGRESS_H
 #define _REGRESS_H
 
-#include <boost/regex/detail/regex_config.hpp>
+#include <boost/regex/config.hpp>
 
 #ifdef BOOST_RE_OLD_IOSTREAM
 #include <iostream.h>
@@ -114,6 +114,69 @@ extern flag_info flag_data[];
 // class jm_debug_alloc
 // NB this is a byte based allocator
 //
+class jm_debug_alloc;
+
+template <class T, class Base>
+class allocator_binder : public Base
+{
+public:
+
+   typedef T              value_type;
+   typedef value_type *   pointer;
+   typedef const T*       const_pointer;
+   typedef T&             reference;
+   typedef const T&       const_reference;
+   typedef size_t         size_type;
+   typedef ptrdiff_t      difference_type;
+   typedef Base           base_type;
+
+   allocator_binder(){}
+   allocator_binder(const base_type& x) : Base(x){}
+   allocator_binder& operator=(const base_type& x)
+   {
+      *(static_cast<base_type*>(this)) = x;
+      return *this;
+   }
+
+   ~allocator_binder(){}
+
+   pointer address(reference x) { return &x; }
+
+   const_pointer address(const_reference x) const { return &x; }
+
+   pointer allocate(size_type n, const void* = 0) 
+   {
+      return n != 0 ?
+         reinterpret_cast<pointer>(base_type::allocate(n * sizeof(value_type)))
+         : 0;
+   }
+
+   void deallocate(pointer p, size_type n)
+   {
+      assert( (p == 0) == (n == 0) );
+      if (p != 0)
+         base_type::deallocate((void*)p, n * sizeof(value_type));
+   }
+
+   size_type max_size() const
+   { return size_t(-1) / sizeof(value_type); }
+
+   void construct(pointer p, const T& val) const
+   { allocator_construct(p, val); }
+
+   void destroy(pointer __p) const
+   { allocator_destroy(p); }
+
+#ifndef BOOST_NO_MEMBER_TEMPLATES
+   template <class U>
+   struct rebind
+   {
+      typedef allocator_binder<U, jm_debug_alloc> other;
+   };
+#endif
+
+};
+
 class jm_debug_alloc
 {
 private:
@@ -122,20 +185,21 @@ private:
 public:
    typedef std::size_t    size_type;
    typedef std::ptrdiff_t difference_type;
-   typedef char*        pointer;
+   typedef char*          pointer;
-   typedef const char*  const_pointer;
+   typedef const char*    const_pointer;
-   typedef char&        reference;
+   typedef char&          reference;
-   typedef const char&  const_reference;
+   typedef const char&    const_reference;
-   typedef char         value_type;
+   typedef char           value_type;
+   typedef jm_debug_alloc base_type;
 
 
-   #ifndef BOOST_NO_MEMBER_TEMPLATES
+#ifndef BOOST_NO_MEMBER_TEMPLATES
    template <class U>
    struct rebind
    {
-      typedef boost::re_detail::re_alloc_binder<U, jm_debug_alloc> other;
+      typedef allocator_binder<U, jm_debug_alloc> other;
    };
-   #endif
+#endif
 
    jm_debug_alloc();
 
@@ -156,8 +220,8 @@ public:
    {
       return i < j ? j : i;
    }
-   pointer allocate(size_type n, void* hint = 0);
+   void* allocate(size_type n, void* hint = 0);
-   void deallocate(pointer p, size_type n);
+   void deallocate(void* p, size_type n);
 
    static size_type max_size()
    {
@@ -188,6 +252,9 @@ public:
 //
 template <class T>
 struct debug_iterator
+#if !defined(BOOST_NO_STD_ITERATOR) || defined(BOOST_MSVC_STD_ITERATOR)
+: public std::iterator<std::random_access_iterator_tag, char_t>
+#endif
 {
    typedef std::ptrdiff_t                    difference_type;
    typedef char_t                            value_type;

test/regress/tests.cpp

@@ -246,7 +246,7 @@ void cpp_tests(const reg_expression<C, T, A>& e, bool recurse = true)
       debug_iterator<string_type::iterator> y(search_text.end(), search_text.begin(), search_text.end());
       grep_test_predicate<debug_iterator<string_type::iterator>, allocator_type> oi(x, y);
       regex_grep(oi, x, y, e, flags[3]);
-#if !defined(BOOST_RE_NO_PARTIAL_FUNC_SPEC) && !defined(BOOST_RE_NO_STRING_H) && !defined(BOOST_RE_NO_STRING_DEF_ARGS)
+#if !defined(BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING)
       if(!recurse)
       {
          std::basic_string<char_t> s(search_text.begin(), search_text.end());
@@ -309,7 +309,7 @@ void cpp_tests(const reg_expression<C, T, A>& e, bool recurse = true)
 
          //
          // now try alternative forms of regex_search if available:
-#if !defined(BOOST_RE_NO_PARTIAL_FUNC_SPEC) && !defined(BOOST_RE_NO_STRING_H) && !defined(BOOST_RE_NO_STRING_DEF_ARGS)
+#if !defined(BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING)
          if(!recurse)
          {
             std::basic_string<char_t> s(search_text.begin(), search_text.end());

test/regress/vc6.mak

@@ -16,7 +16,7 @@ INCLUDES=
 #
 XLFLAGS=
 
-CFLAGS= $(INCLUDES) /Oityb1 /GF /Gy -GX -GR -I..\..\..\..\ $(CXXFLAGS)
+CFLAGS= $(INCLUDES) /O2 /GB /GF /Gy -GX -GR -I..\..\..\..\ $(CXXFLAGS)
 
 LFLAGS= -link /LIBPATH:..\..\build\vc6 user32.lib $(XLFLAGS)
 
@@ -220,3 +220,4 @@ r6lmd.exe : tests.cpp parse.cpp regress.cpp
 
 
 
+

test/regress/vc7.mak

@@ -0,0 +1,224 @@
+
+# very basic makefile for regression tests
+#
+# Visual C++ 6
+#
+#
+# Add additional compiler options here:
+#
+CXXFLAGS=
+#
+# Add additional include directories here:
+#
+INCLUDES=
+#
+# add additional linker flags here:
+#
+XLFLAGS=
+
+CFLAGS= $(INCLUDES) /O2 /GB /GF /Gy -GX -GR -I..\..\..\..\ $(CXXFLAGS)
+
+LFLAGS= -link /LIBPATH:..\..\build\vc7 $(XLFLAGS)
+
+all :: r1.exe r2.exe r3.exe r4.exe r5.exe r6.exe r1m.exe r2m.exe r3m.exe r4m.exe r5m.exe r6m.exe r1l.exe r2l.exe r3l.exe r4l.exe r5l.exe r6l.exe r1ls.exe r2ls.exe r3ls.exe r4ls.exe r5ls.exe r6ls.exe r1d.exe r2d.exe r3d.exe r4d.exe r5d.exe r6d.exe r1md.exe r2md.exe r3md.exe r4md.exe r5md.exe r6md.exe r1lmd.exe r2lmd.exe r3lmd.exe r4lmd.exe r5lmd.exe r6lmd.exe
+	echo testing static single threaded version....
+	r1 tests.txt test1252.txt
+	r2 tests.txt
+	r3 tests.txt
+	r4 tests.txt test1252.txt
+	r5 tests.txt
+	r6 tests.txt
+	echo testing static multi-threaded version....
+	r1m tests.txt test1252.txt
+	r2m tests.txt
+	r3m tests.txt
+	r4m tests.txt test1252.txt
+	r5m tests.txt
+	r6m tests.txt
+	echo testing DLL version....
+	r1l tests.txt test1252.txt
+	r2l tests.txt
+	r3l tests.txt
+	r4l tests.txt test1252.txt
+	r5l tests.txt
+	r6l tests.txt
+	echo testing static version with DLL runtime....
+	r1ls tests.txt test1252.txt
+	r2ls tests.txt
+	r3ls tests.txt
+	r4ls tests.txt test1252.txt
+	r5ls tests.txt
+	r6ls tests.txt
+	echo testing static single threaded debug version....
+	r1d tests.txt test1252.txt
+	r2d tests.txt
+	r3d tests.txt
+	r4d tests.txt test1252.txt
+	r5d tests.txt
+	r6d tests.txt
+	echo testing static multi-threaded debug version....
+	r1md tests.txt test1252.txt
+	r2md tests.txt
+	r3md tests.txt
+	r4md tests.txt test1252.txt
+	r5md tests.txt
+	r6md tests.txt
+	echo testing dll debug version....
+	r1lmd tests.txt test1252.txt
+	r2lmd tests.txt
+	r3lmd tests.txt
+	r4lmd tests.txt test1252.txt
+	r5lmd tests.txt
+	r6lmd tests.txt
+
+
+r1.exe : tests.cpp parse.cpp regress.cpp
+	cl /ML $(CFLAGS) -o r1.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r2.exe : tests.cpp parse.cpp regress.cpp
+	cl /ML $(CFLAGS) -o r2.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r3.exe : tests.cpp parse.cpp regress.cpp
+	cl /ML $(CFLAGS) -o r3.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r4.exe : tests.cpp parse.cpp regress.cpp
+	cl /ML $(CFLAGS) -o r4.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r5.exe : tests.cpp parse.cpp regress.cpp
+	cl /ML $(CFLAGS) -o r5.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r6.exe : tests.cpp parse.cpp regress.cpp
+	cl /ML $(CFLAGS) -o r6.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+	
+
+r1m.exe : tests.cpp parse.cpp regress.cpp
+	cl /MT /D_MT -o r1m.exe $(CFLAGS) -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r2m.exe : tests.cpp parse.cpp regress.cpp
+	cl /MT /D_MT $(CFLAGS) -o r2m.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r3m.exe : tests.cpp parse.cpp regress.cpp
+	cl /MT /D_MT $(CFLAGS) -o r3m.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r4m.exe : tests.cpp parse.cpp regress.cpp
+	cl /MT /D_MT $(CFLAGS) -o r4m.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r5m.exe : tests.cpp parse.cpp regress.cpp
+	cl /MT /D_MT $(CFLAGS) -o r5m.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r6m.exe : tests.cpp parse.cpp regress.cpp
+	cl /MT /D_MT $(CFLAGS) -o r6m.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+
+r1l.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r1l.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r2l.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r2l.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r3l.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r3l.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r4l.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r4l.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r5l.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r5l.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r6l.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r6l.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+
+r1ls.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r1ls.exe -DBOOST_RE_STATIC_LIB -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r2ls.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r2ls.exe -DBOOST_RE_STATIC_LIB -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r3ls.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r3ls.exe -DBOOST_RE_STATIC_LIB -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r4ls.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r4ls.exe -DBOOST_RE_STATIC_LIB -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r5ls.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r5ls.exe -DBOOST_RE_STATIC_LIB -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r6ls.exe : tests.cpp parse.cpp regress.cpp
+	cl /MD /D_MT /D_DLL $(CFLAGS) -o r6ls.exe -DBOOST_RE_STATIC_LIB -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r1d.exe : tests.cpp parse.cpp regress.cpp
+	cl /MLd $(CFLAGS) -o r1d.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r2d.exe : tests.cpp parse.cpp regress.cpp
+	cl /MLd $(CFLAGS) -o r2d.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r3d.exe : tests.cpp parse.cpp regress.cpp
+	cl /MLd $(CFLAGS) -o r3d.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r4d.exe : tests.cpp parse.cpp regress.cpp
+	cl /MLd $(CFLAGS) -o r4d.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r5d.exe : tests.cpp parse.cpp regress.cpp
+	cl /MLd $(CFLAGS) -o r5d.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r6d.exe : tests.cpp parse.cpp regress.cpp
+	cl /MLd $(CFLAGS) -o r6d.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+
+r1md.exe : tests.cpp parse.cpp regress.cpp
+	cl /MTd /D_MT $(CFLAGS) -o r1md.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r2md.exe : tests.cpp parse.cpp regress.cpp
+	cl /MTd /D_MT $(CFLAGS) -o r2md.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r3md.exe : tests.cpp parse.cpp regress.cpp
+	cl /MTd /D_MT $(CFLAGS) -o r3md.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r4md.exe : tests.cpp parse.cpp regress.cpp
+	cl /MTd /D_MT $(CFLAGS) -o r4md.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r5md.exe : tests.cpp parse.cpp regress.cpp
+	cl /MTd /D_MT $(CFLAGS) -o r5md.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r6md.exe : tests.cpp parse.cpp regress.cpp
+	cl /MTd /D_MT $(CFLAGS) -o r6md.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+
+r1lmd.exe : tests.cpp parse.cpp regress.cpp
+	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r1lmd.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r2lmd.exe : tests.cpp parse.cpp regress.cpp
+	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r2lmd.exe -DBOOST_RE_TEST_LOCALE_C tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r3lmd.exe : tests.cpp parse.cpp regress.cpp
+	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r3lmd.exe -DBOOST_RE_TEST_LOCALE_CPP tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r4lmd.exe : tests.cpp parse.cpp regress.cpp
+	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r4lmd.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r5lmd.exe : tests.cpp parse.cpp regress.cpp
+	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r5lmd.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+r6lmd.exe : tests.cpp parse.cpp regress.cpp
+	cl /MDd /D_MT /D_DLL $(CFLAGS) -o r6lmd.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE tests.cpp parse.cpp regress.cpp $(LFLAGS)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

test/regress/wregex_test.cpp

@@ -24,7 +24,7 @@
   */
 
 // disable automatic selection of support library:
-#define BOOST_RE_NO_LIB
+#define BOOST_REGEX_NO_LIB
 
 #if defined(_MSC_VER) && defined(__STL_DEBUG) && defined(_DLL)
 //
@@ -41,7 +41,7 @@
 #include <boost/regex.hpp>
 #include <boost/regex/src.cpp>
 
-#ifdef BOOST_RE_NO_WCSTRING
+#ifdef BOOST_NO_WREGEX
 #error The regex library is not configured for wide character support
 #endif
 
@@ -122,7 +122,7 @@ template std::size_t regex_split(test_string_type*,
 
 template std::size_t regex_split(test_string_type*, test_string_type&);
 
-#ifndef BOOST_RE_NO_PARTIAL_FUNC_SPEC
+#ifndef BOOST_WEAK_FUNCTION_TEMPLATE_ORDERING
 //
 // the following prototypes are only available if partial ordering
 // of template functions is supported:
@@ -181,9 +181,9 @@ template test_string_type regex_merge(const test_string_type&,
 //
 // include regression test source files:
 //
-#ifdef BOOST_RE_LOCALE_W32
+#ifdef BOOST_REGEX_USE_WIN32_LOCALE
 #define BOOST_RE_TEST_LOCALE_W32
-#elif !defined(BOOST_RE_LOCALE_C)
+#elif !defined(BOOST_REGEX_USE_C_LOCALE)
 #define BOOST_RE_TEST_LOCALE_CPP
 #endif
 #define TEST_UNICODE