From f1ef6b6e9a7096f46a2ede24786fe06cadadaecd Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Mon, 9 Aug 2004 10:25:06 +0000
Subject: [PATCH] Added MFC/ATL wrappers. Added support for unsigned versions
 in MSVC builds. More compiler-specific workarounds.

[SVN r24351]
---
 build/Jamfile                                 |   3 +-
 build/bcb6.mak                                | 110 +++-
 build/gcc-shared.mak                          |  16 +-
 build/gcc.mak                                 |  16 +-
 build/generic.mak                             |   9 +-
 build/sunpro.mak                              |  30 +-
 build/vc6-stlport.mak                         |  44 +-
 build/vc6.mak                                 |  58 +-
 build/vc7-stlport.mak                         |  44 +-
 build/vc7.mak                                 |  58 +-
 build/vc71-stlport.mak                        |  44 +-
 build/vc71.mak                                |  58 +-
 doc/Attic/basic_regex.html                    |  96 +--
 doc/Attic/introduction.html                   |   3 +-
 doc/basic_regex.html                          |  96 +--
 doc/introduction.html                         |   3 +-
 include/boost/regex/config.hpp                |  37 +-
 include/boost/regex/config/borland.hpp        |   9 +
 include/boost/regex/config/cstring.hpp        | 303 ----------
 include/boost/regex/mfc.hpp                   | 185 ++++++
 .../boost/regex/v4/basic_regex_creator.hpp    |  26 +-
 include/boost/regex/v4/basic_regex_parser.hpp |  25 +-
 include/boost/regex/v4/c_regex_traits.hpp     |  63 +-
 include/boost/regex/v4/cpp_regex_traits.hpp   | 180 +++++-
 include/boost/regex/v4/perl_matcher.hpp       |  10 +-
 .../boost/regex/v4/perl_matcher_common.hpp    |   2 +-
 .../boost/regex/v4/perl_matcher_recursive.hpp |  11 +-
 include/boost/regex/v4/regex.hpp              |  12 +
 include/boost/regex/v4/regex_format.hpp       |   3 +
 include/boost/regex/v4/regex_iterator.hpp     |   2 +
 .../boost/regex/v4/regex_token_iterator.hpp   |   2 +
 include/boost/regex/v4/regex_traits.hpp       |   7 +
 .../boost/regex/v4/regex_traits_defaults.hpp  |   1 +
 include/boost/regex/v4/regex_workaround.hpp   |   2 +-
 include/boost/regex/v4/w32_regex_traits.hpp   |  18 +
 src/cpp_regex_traits.cpp                      |   4 +
 src/regex_traits_defaults.cpp                 |  16 +-
 src/usinstances.cpp                           |  50 ++
 src/w32_regex_traits.cpp                      | 115 ++++
 src/wc_regex_traits.cpp                       |  56 +-
 test/Jamfile                                  |   1 +
 test/captures/Jamfile                         |   3 +-
 test/regress/bc55.mak                         | 144 -----
 test/regress/bcb4.mak                         | 194 ------
 test/regress/bcb5.mak                         | 196 -------
 test/regress/bcb6.mak                         |   3 +-
 test/regress/gcc.mak                          |   3 +-
 test/regress/main.cpp                         |   2 +-
 test/regress/sunpro.mak                       |   3 +-
 test/regress/test.hpp                         |  30 +
 test/regress/test_alt.cpp                     |   4 +
 test/regress/test_anchors.cpp                 |   4 +
 test/regress/test_asserts.cpp                 |   4 +
 test/regress/test_backrefs.cpp                |   4 +
 test/regress/test_deprecated.cpp              |   4 +
 test/regress/test_escapes.cpp                 |   4 +
 test/regress/test_grep.cpp                    |   4 +
 test/regress/test_locale.cpp                  |  81 ++-
 test/regress/test_locale.hpp                  |  24 +-
 test/regress/test_mfc.cpp                     | 555 ++++++++++++++++++
 test/regress/test_mfc.hpp                     |  36 ++
 test/regress/test_non_greedy_repeats.cpp      |   4 +
 test/regress/test_perl_ex.cpp                 |   4 +
 test/regress/test_regex_search.hpp            | 126 +++-
 test/regress/test_replace.cpp                 |   4 +
 test/regress/test_sets.cpp                    |  17 +
 test/regress/test_simple_repeats.cpp          |   4 +
 test/regress/test_tricky_cases.cpp            |   4 +
 test/regress/vc6-stlport.mak                  |   3 +-
 test/regress/vc6.mak                          |   3 +-
 test/regress/vc7.mak                          |   3 +-
 test/regress/vc71.mak                         |   3 +-
 72 files changed, 2136 insertions(+), 1169 deletions(-)
 delete mode 100644 include/boost/regex/config/cstring.hpp
 create mode 100644 include/boost/regex/mfc.hpp
 create mode 100644 src/usinstances.cpp
 delete mode 100644 test/regress/bc55.mak
 delete mode 100644 test/regress/bcb4.mak
 delete mode 100644 test/regress/bcb5.mak
 create mode 100644 test/regress/test_mfc.cpp
 create mode 100644 test/regress/test_mfc.hpp

diff --git a/build/Jamfile b/build/Jamfile
index 09d24a66..185ad381 100644
--- a/build/Jamfile
+++ b/build/Jamfile
@@ -52,7 +52,8 @@ SOURCES =
    w32_regex_traits.cpp
    wc_regex_traits.cpp
    wide_posix_api.cpp
-   winstances.cpp ;
+   winstances.cpp 
+   usinstances.cpp ;
        
 lib boost_regex : ../src/$(SOURCES) <template>regex-options
     : 
diff --git a/build/bcb6.mak b/build/bcb6.mak
index ddee982b..d96ec23c 100644
--- a/build/bcb6.mak
+++ b/build/bcb6.mak
@@ -35,7 +35,7 @@ BCROOT=$(MAKEDIR)\..
 !endif
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : bcb bcb\libboost_regex-bcb-s-1_31 bcb\libboost_regex-bcb-s-1_31.lib bcb\libboost_regex-bcb-mt-s-1_31 bcb\libboost_regex-bcb-mt-s-1_31.lib bcb\boost_regex-bcb-mt-1_31 bcb\boost_regex-bcb-mt-1_31.lib bcb\boost_regex-bcb-1_31 bcb\boost_regex-bcb-1_31.lib bcb\libboost_regex-bcb-mt-1_31 bcb\libboost_regex-bcb-mt-1_31.lib bcb\libboost_regex-bcb-1_31 bcb\libboost_regex-bcb-1_31.lib bcb\libboost_regex-bcb-sd-1_31 bcb\libboost_regex-bcb-sd-1_31.lib bcb\libboost_regex-bcb-mt-sd-1_31 bcb\libboost_regex-bcb-mt-sd-1_31.lib bcb\boost_regex-bcb-mt-d-1_31 bcb\boost_regex-bcb-mt-d-1_31.lib bcb\boost_regex-bcb-d-1_31 bcb\boost_regex-bcb-d-1_31.lib bcb\libboost_regex-bcb-mt-d-1_31 bcb\libboost_regex-bcb-mt-d-1_31.lib bcb\libboost_regex-bcb-d-1_31 bcb\libboost_regex-bcb-d-1_31.lib
 
@@ -127,6 +127,11 @@ bcb\libboost_regex-bcb-s-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HE
 -c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
+bcb\libboost_regex-bcb-s-1_31\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_31\usinstances.obj ../src/usinstances.cpp
+|
+
 bcb\libboost_regex-bcb-s-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM- -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-s-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
@@ -156,10 +161,10 @@ libboost_regex-bcb-s-1_31_clean :
 	del bcb\libboost_regex-bcb-s-1_31\*.csm
 	del bcb\libboost_regex-bcb-s-1_31\*.tds
 
-bcb\libboost_regex-bcb-s-1_31.lib : bcb\libboost_regex-bcb-s-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-s-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-s-1_31\cregex.obj bcb\libboost_regex-bcb-s-1_31\fileiter.obj bcb\libboost_regex-bcb-s-1_31\instances.obj bcb\libboost_regex-bcb-s-1_31\posix_api.obj bcb\libboost_regex-bcb-s-1_31\regex.obj bcb\libboost_regex-bcb-s-1_31\regex_debug.obj bcb\libboost_regex-bcb-s-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-s-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-s-1_31\static_mutex.obj bcb\libboost_regex-bcb-s-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-s-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-s-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-s-1_31\winstances.obj
+bcb\libboost_regex-bcb-s-1_31.lib : bcb\libboost_regex-bcb-s-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-s-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-s-1_31\cregex.obj bcb\libboost_regex-bcb-s-1_31\fileiter.obj bcb\libboost_regex-bcb-s-1_31\instances.obj bcb\libboost_regex-bcb-s-1_31\posix_api.obj bcb\libboost_regex-bcb-s-1_31\regex.obj bcb\libboost_regex-bcb-s-1_31\regex_debug.obj bcb\libboost_regex-bcb-s-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-s-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-s-1_31\static_mutex.obj bcb\libboost_regex-bcb-s-1_31\usinstances.obj bcb\libboost_regex-bcb-s-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-s-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-s-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-s-1_31\winstances.obj
 	if exist bcb\libboost_regex-bcb-s-1_31.lib del bcb\libboost_regex-bcb-s-1_31.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-s-1_31.lib"  +"bcb\libboost_regex-bcb-s-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_31\cregex.obj" +"bcb\libboost_regex-bcb-s-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-s-1_31\instances.obj" +"bcb\libboost_regex-bcb-s-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-s-1_31\regex.obj" +"bcb\libboost_regex-bcb-s-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-s-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-s-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-s-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-s-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-s-1_31\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-s-1_31.lib"  +"bcb\libboost_regex-bcb-s-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_31\cregex.obj" +"bcb\libboost_regex-bcb-s-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-s-1_31\instances.obj" +"bcb\libboost_regex-bcb-s-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-s-1_31\regex.obj" +"bcb\libboost_regex-bcb-s-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-s-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-s-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-s-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-s-1_31\usinstances.obj" +"bcb\libboost_regex-bcb-s-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-s-1_31\winstances.obj"
 |
 
 ########################################################
@@ -222,6 +227,11 @@ bcb\libboost_regex-bcb-mt-s-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL
 -c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
+bcb\libboost_regex-bcb-mt-s-1_31\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_31\usinstances.obj ../src/usinstances.cpp
+|
+
 bcb\libboost_regex-bcb-mt-s-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM -D_NO_VCL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-s-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
@@ -251,10 +261,10 @@ libboost_regex-bcb-mt-s-1_31_clean :
 	del bcb\libboost_regex-bcb-mt-s-1_31\*.csm
 	del bcb\libboost_regex-bcb-mt-s-1_31\*.tds
 
-bcb\libboost_regex-bcb-mt-s-1_31.lib : bcb\libboost_regex-bcb-mt-s-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_31\cregex.obj bcb\libboost_regex-bcb-mt-s-1_31\fileiter.obj bcb\libboost_regex-bcb-mt-s-1_31\instances.obj bcb\libboost_regex-bcb-mt-s-1_31\posix_api.obj bcb\libboost_regex-bcb-mt-s-1_31\regex.obj bcb\libboost_regex-bcb-mt-s-1_31\regex_debug.obj bcb\libboost_regex-bcb-mt-s-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-s-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-s-1_31\static_mutex.obj bcb\libboost_regex-bcb-mt-s-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-mt-s-1_31\winstances.obj
+bcb\libboost_regex-bcb-mt-s-1_31.lib : bcb\libboost_regex-bcb-mt-s-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_31\cregex.obj bcb\libboost_regex-bcb-mt-s-1_31\fileiter.obj bcb\libboost_regex-bcb-mt-s-1_31\instances.obj bcb\libboost_regex-bcb-mt-s-1_31\posix_api.obj bcb\libboost_regex-bcb-mt-s-1_31\regex.obj bcb\libboost_regex-bcb-mt-s-1_31\regex_debug.obj bcb\libboost_regex-bcb-mt-s-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-s-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-s-1_31\static_mutex.obj bcb\libboost_regex-bcb-mt-s-1_31\usinstances.obj bcb\libboost_regex-bcb-mt-s-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-mt-s-1_31\winstances.obj
 	if exist bcb\libboost_regex-bcb-mt-s-1_31.lib del bcb\libboost_regex-bcb-mt-s-1_31.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-s-1_31.lib"  +"bcb\libboost_regex-bcb-mt-s-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\cregex.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\instances.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\regex.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-s-1_31.lib"  +"bcb\libboost_regex-bcb-mt-s-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\cregex.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\instances.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\regex.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\usinstances.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_31\winstances.obj"
 |
 
 ########################################################
@@ -317,6 +327,11 @@ bcb\boost_regex-bcb-mt-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEAD
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
+bcb\boost_regex-bcb-mt-1_31\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_31\usinstances.obj ../src/usinstances.cpp
+|
+
 bcb\boost_regex-bcb-mt-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
@@ -347,9 +362,9 @@ boost_regex-bcb-mt-1_31_clean :
 	del bcb\boost_regex-bcb-mt-1_31\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-mt-1_31.lib : bcb\boost_regex-bcb-mt-1_31\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\cregex.obj bcb\boost_regex-bcb-mt-1_31\fileiter.obj bcb\boost_regex-bcb-mt-1_31\instances.obj bcb\boost_regex-bcb-mt-1_31\posix_api.obj bcb\boost_regex-bcb-mt-1_31\regex.obj bcb\boost_regex-bcb-mt-1_31\regex_debug.obj bcb\boost_regex-bcb-mt-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-1_31\static_mutex.obj bcb\boost_regex-bcb-mt-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_31\winstances.obj
+bcb\boost_regex-bcb-mt-1_31.lib : bcb\boost_regex-bcb-mt-1_31\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\cregex.obj bcb\boost_regex-bcb-mt-1_31\fileiter.obj bcb\boost_regex-bcb-mt-1_31\instances.obj bcb\boost_regex-bcb-mt-1_31\posix_api.obj bcb\boost_regex-bcb-mt-1_31\regex.obj bcb\boost_regex-bcb-mt-1_31\regex_debug.obj bcb\boost_regex-bcb-mt-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-1_31\static_mutex.obj bcb\boost_regex-bcb-mt-1_31\usinstances.obj bcb\boost_regex-bcb-mt-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_31\winstances.obj
 	bcc32 @&&|
--lw-dup -lw-dpl -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-mt-1_31.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-1_31\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\cregex.obj bcb\boost_regex-bcb-mt-1_31\fileiter.obj bcb\boost_regex-bcb-mt-1_31\instances.obj bcb\boost_regex-bcb-mt-1_31\posix_api.obj bcb\boost_regex-bcb-mt-1_31\regex.obj bcb\boost_regex-bcb-mt-1_31\regex_debug.obj bcb\boost_regex-bcb-mt-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-1_31\static_mutex.obj bcb\boost_regex-bcb-mt-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_31\winstances.obj $(LIBS)
+-lw-dup -lw-dpl -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-mt-1_31.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-1_31\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\cregex.obj bcb\boost_regex-bcb-mt-1_31\fileiter.obj bcb\boost_regex-bcb-mt-1_31\instances.obj bcb\boost_regex-bcb-mt-1_31\posix_api.obj bcb\boost_regex-bcb-mt-1_31\regex.obj bcb\boost_regex-bcb-mt-1_31\regex_debug.obj bcb\boost_regex-bcb-mt-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-1_31\static_mutex.obj bcb\boost_regex-bcb-mt-1_31\usinstances.obj bcb\boost_regex-bcb-mt-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-mt-1_31\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_31\winstances.obj $(LIBS)
 |
 	implib -w bcb\boost_regex-bcb-mt-1_31.lib bcb\boost_regex-bcb-mt-1_31.dll
 
@@ -413,6 +428,11 @@ bcb\boost_regex-bcb-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
+bcb\boost_regex-bcb-1_31\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_31\usinstances.obj ../src/usinstances.cpp
+|
+
 bcb\boost_regex-bcb-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
@@ -443,9 +463,9 @@ boost_regex-bcb-1_31_clean :
 	del bcb\boost_regex-bcb-1_31\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-1_31.lib : bcb\boost_regex-bcb-1_31\c_regex_traits.obj bcb\boost_regex-bcb-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-1_31\cregex.obj bcb\boost_regex-bcb-1_31\fileiter.obj bcb\boost_regex-bcb-1_31\instances.obj bcb\boost_regex-bcb-1_31\posix_api.obj bcb\boost_regex-bcb-1_31\regex.obj bcb\boost_regex-bcb-1_31\regex_debug.obj bcb\boost_regex-bcb-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-1_31\static_mutex.obj bcb\boost_regex-bcb-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-1_31\wide_posix_api.obj bcb\boost_regex-bcb-1_31\winstances.obj
+bcb\boost_regex-bcb-1_31.lib : bcb\boost_regex-bcb-1_31\c_regex_traits.obj bcb\boost_regex-bcb-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-1_31\cregex.obj bcb\boost_regex-bcb-1_31\fileiter.obj bcb\boost_regex-bcb-1_31\instances.obj bcb\boost_regex-bcb-1_31\posix_api.obj bcb\boost_regex-bcb-1_31\regex.obj bcb\boost_regex-bcb-1_31\regex_debug.obj bcb\boost_regex-bcb-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-1_31\static_mutex.obj bcb\boost_regex-bcb-1_31\usinstances.obj bcb\boost_regex-bcb-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-1_31\wide_posix_api.obj bcb\boost_regex-bcb-1_31\winstances.obj
 	bcc32 @&&|
--lw-dup -lw-dpl -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-1_31.dll $(XLFLAGS)  bcb\boost_regex-bcb-1_31\c_regex_traits.obj bcb\boost_regex-bcb-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-1_31\cregex.obj bcb\boost_regex-bcb-1_31\fileiter.obj bcb\boost_regex-bcb-1_31\instances.obj bcb\boost_regex-bcb-1_31\posix_api.obj bcb\boost_regex-bcb-1_31\regex.obj bcb\boost_regex-bcb-1_31\regex_debug.obj bcb\boost_regex-bcb-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-1_31\static_mutex.obj bcb\boost_regex-bcb-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-1_31\wide_posix_api.obj bcb\boost_regex-bcb-1_31\winstances.obj $(LIBS)
+-lw-dup -lw-dpl -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-1_31.dll $(XLFLAGS)  bcb\boost_regex-bcb-1_31\c_regex_traits.obj bcb\boost_regex-bcb-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-1_31\cregex.obj bcb\boost_regex-bcb-1_31\fileiter.obj bcb\boost_regex-bcb-1_31\instances.obj bcb\boost_regex-bcb-1_31\posix_api.obj bcb\boost_regex-bcb-1_31\regex.obj bcb\boost_regex-bcb-1_31\regex_debug.obj bcb\boost_regex-bcb-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-1_31\static_mutex.obj bcb\boost_regex-bcb-1_31\usinstances.obj bcb\boost_regex-bcb-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-1_31\wide_posix_api.obj bcb\boost_regex-bcb-1_31\winstances.obj $(LIBS)
 |
 	implib -w bcb\boost_regex-bcb-1_31.lib bcb\boost_regex-bcb-1_31.dll
 
@@ -509,6 +529,11 @@ bcb\libboost_regex-bcb-mt-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_H
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
+bcb\libboost_regex-bcb-mt-1_31\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_31\usinstances.obj ../src/usinstances.cpp
+|
+
 bcb\libboost_regex-bcb-mt-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
@@ -538,10 +563,10 @@ libboost_regex-bcb-mt-1_31_clean :
 	del bcb\libboost_regex-bcb-mt-1_31\*.csm
 	del bcb\libboost_regex-bcb-mt-1_31\*.tds
 
-bcb\libboost_regex-bcb-mt-1_31.lib : bcb\libboost_regex-bcb-mt-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-mt-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-1_31\cregex.obj bcb\libboost_regex-bcb-mt-1_31\fileiter.obj bcb\libboost_regex-bcb-mt-1_31\instances.obj bcb\libboost_regex-bcb-mt-1_31\posix_api.obj bcb\libboost_regex-bcb-mt-1_31\regex.obj bcb\libboost_regex-bcb-mt-1_31\regex_debug.obj bcb\libboost_regex-bcb-mt-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-1_31\static_mutex.obj bcb\libboost_regex-bcb-mt-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-mt-1_31\winstances.obj
+bcb\libboost_regex-bcb-mt-1_31.lib : bcb\libboost_regex-bcb-mt-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-mt-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-1_31\cregex.obj bcb\libboost_regex-bcb-mt-1_31\fileiter.obj bcb\libboost_regex-bcb-mt-1_31\instances.obj bcb\libboost_regex-bcb-mt-1_31\posix_api.obj bcb\libboost_regex-bcb-mt-1_31\regex.obj bcb\libboost_regex-bcb-mt-1_31\regex_debug.obj bcb\libboost_regex-bcb-mt-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-1_31\static_mutex.obj bcb\libboost_regex-bcb-mt-1_31\usinstances.obj bcb\libboost_regex-bcb-mt-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-mt-1_31\winstances.obj
 	if exist bcb\libboost_regex-bcb-mt-1_31.lib del bcb\libboost_regex-bcb-mt-1_31.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-1_31.lib"  +"bcb\libboost_regex-bcb-mt-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_31\cregex.obj" +"bcb\libboost_regex-bcb-mt-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-mt-1_31\instances.obj" +"bcb\libboost_regex-bcb-mt-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_31\regex.obj" +"bcb\libboost_regex-bcb-mt-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_31\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-1_31.lib"  +"bcb\libboost_regex-bcb-mt-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_31\cregex.obj" +"bcb\libboost_regex-bcb-mt-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-mt-1_31\instances.obj" +"bcb\libboost_regex-bcb-mt-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_31\regex.obj" +"bcb\libboost_regex-bcb-mt-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-1_31\usinstances.obj" +"bcb\libboost_regex-bcb-mt-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_31\winstances.obj"
 |
 
 ########################################################
@@ -604,6 +629,11 @@ bcb\libboost_regex-bcb-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEAD
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
+bcb\libboost_regex-bcb-1_31\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_31\usinstances.obj ../src/usinstances.cpp
+|
+
 bcb\libboost_regex-bcb-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -O2 -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
@@ -633,10 +663,10 @@ libboost_regex-bcb-1_31_clean :
 	del bcb\libboost_regex-bcb-1_31\*.csm
 	del bcb\libboost_regex-bcb-1_31\*.tds
 
-bcb\libboost_regex-bcb-1_31.lib : bcb\libboost_regex-bcb-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-1_31\cregex.obj bcb\libboost_regex-bcb-1_31\fileiter.obj bcb\libboost_regex-bcb-1_31\instances.obj bcb\libboost_regex-bcb-1_31\posix_api.obj bcb\libboost_regex-bcb-1_31\regex.obj bcb\libboost_regex-bcb-1_31\regex_debug.obj bcb\libboost_regex-bcb-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-1_31\static_mutex.obj bcb\libboost_regex-bcb-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-1_31\winstances.obj
+bcb\libboost_regex-bcb-1_31.lib : bcb\libboost_regex-bcb-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-1_31\cregex.obj bcb\libboost_regex-bcb-1_31\fileiter.obj bcb\libboost_regex-bcb-1_31\instances.obj bcb\libboost_regex-bcb-1_31\posix_api.obj bcb\libboost_regex-bcb-1_31\regex.obj bcb\libboost_regex-bcb-1_31\regex_debug.obj bcb\libboost_regex-bcb-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-1_31\static_mutex.obj bcb\libboost_regex-bcb-1_31\usinstances.obj bcb\libboost_regex-bcb-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-1_31\winstances.obj
 	if exist bcb\libboost_regex-bcb-1_31.lib del bcb\libboost_regex-bcb-1_31.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-1_31.lib"  +"bcb\libboost_regex-bcb-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-1_31\cregex.obj" +"bcb\libboost_regex-bcb-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-1_31\instances.obj" +"bcb\libboost_regex-bcb-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-1_31\regex.obj" +"bcb\libboost_regex-bcb-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-1_31\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-1_31.lib"  +"bcb\libboost_regex-bcb-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-1_31\cregex.obj" +"bcb\libboost_regex-bcb-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-1_31\instances.obj" +"bcb\libboost_regex-bcb-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-1_31\regex.obj" +"bcb\libboost_regex-bcb-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-1_31\usinstances.obj" +"bcb\libboost_regex-bcb-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-1_31\winstances.obj"
 |
 
 ########################################################
@@ -699,6 +729,11 @@ bcb\libboost_regex-bcb-sd-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_H
 -c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
+bcb\libboost_regex-bcb-sd-1_31\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_31\usinstances.obj ../src/usinstances.cpp
+|
+
 bcb\libboost_regex-bcb-sd-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM- -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8037 -w-8057 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-sd-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
@@ -728,10 +763,10 @@ libboost_regex-bcb-sd-1_31_clean :
 	del bcb\libboost_regex-bcb-sd-1_31\*.csm
 	del bcb\libboost_regex-bcb-sd-1_31\*.tds
 
-bcb\libboost_regex-bcb-sd-1_31.lib : bcb\libboost_regex-bcb-sd-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-sd-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-sd-1_31\cregex.obj bcb\libboost_regex-bcb-sd-1_31\fileiter.obj bcb\libboost_regex-bcb-sd-1_31\instances.obj bcb\libboost_regex-bcb-sd-1_31\posix_api.obj bcb\libboost_regex-bcb-sd-1_31\regex.obj bcb\libboost_regex-bcb-sd-1_31\regex_debug.obj bcb\libboost_regex-bcb-sd-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-sd-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-sd-1_31\static_mutex.obj bcb\libboost_regex-bcb-sd-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-sd-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-sd-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-sd-1_31\winstances.obj
+bcb\libboost_regex-bcb-sd-1_31.lib : bcb\libboost_regex-bcb-sd-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-sd-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-sd-1_31\cregex.obj bcb\libboost_regex-bcb-sd-1_31\fileiter.obj bcb\libboost_regex-bcb-sd-1_31\instances.obj bcb\libboost_regex-bcb-sd-1_31\posix_api.obj bcb\libboost_regex-bcb-sd-1_31\regex.obj bcb\libboost_regex-bcb-sd-1_31\regex_debug.obj bcb\libboost_regex-bcb-sd-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-sd-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-sd-1_31\static_mutex.obj bcb\libboost_regex-bcb-sd-1_31\usinstances.obj bcb\libboost_regex-bcb-sd-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-sd-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-sd-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-sd-1_31\winstances.obj
 	if exist bcb\libboost_regex-bcb-sd-1_31.lib del bcb\libboost_regex-bcb-sd-1_31.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-sd-1_31.lib"  +"bcb\libboost_regex-bcb-sd-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_31\cregex.obj" +"bcb\libboost_regex-bcb-sd-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-sd-1_31\instances.obj" +"bcb\libboost_regex-bcb-sd-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_31\regex.obj" +"bcb\libboost_regex-bcb-sd-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-sd-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-sd-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-sd-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-sd-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_31\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-sd-1_31.lib"  +"bcb\libboost_regex-bcb-sd-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_31\cregex.obj" +"bcb\libboost_regex-bcb-sd-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-sd-1_31\instances.obj" +"bcb\libboost_regex-bcb-sd-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_31\regex.obj" +"bcb\libboost_regex-bcb-sd-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-sd-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-sd-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-sd-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-sd-1_31\usinstances.obj" +"bcb\libboost_regex-bcb-sd-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_31\winstances.obj"
 |
 
 ########################################################
@@ -794,6 +829,11 @@ bcb\libboost_regex-bcb-mt-sd-1_31\static_mutex.obj: ../src/static_mutex.cpp $(AL
 -c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
+bcb\libboost_regex-bcb-mt-sd-1_31\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_31\usinstances.obj ../src/usinstances.cpp
+|
+
 bcb\libboost_regex-bcb-mt-sd-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWM -D_NO_VCL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-sd-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
@@ -823,10 +863,10 @@ libboost_regex-bcb-mt-sd-1_31_clean :
 	del bcb\libboost_regex-bcb-mt-sd-1_31\*.csm
 	del bcb\libboost_regex-bcb-mt-sd-1_31\*.tds
 
-bcb\libboost_regex-bcb-mt-sd-1_31.lib : bcb\libboost_regex-bcb-mt-sd-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_31\cregex.obj bcb\libboost_regex-bcb-mt-sd-1_31\fileiter.obj bcb\libboost_regex-bcb-mt-sd-1_31\instances.obj bcb\libboost_regex-bcb-mt-sd-1_31\posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_31\regex.obj bcb\libboost_regex-bcb-mt-sd-1_31\regex_debug.obj bcb\libboost_regex-bcb-mt-sd-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-sd-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-sd-1_31\static_mutex.obj bcb\libboost_regex-bcb-mt-sd-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_31\winstances.obj
+bcb\libboost_regex-bcb-mt-sd-1_31.lib : bcb\libboost_regex-bcb-mt-sd-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_31\cregex.obj bcb\libboost_regex-bcb-mt-sd-1_31\fileiter.obj bcb\libboost_regex-bcb-mt-sd-1_31\instances.obj bcb\libboost_regex-bcb-mt-sd-1_31\posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_31\regex.obj bcb\libboost_regex-bcb-mt-sd-1_31\regex_debug.obj bcb\libboost_regex-bcb-mt-sd-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-sd-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-sd-1_31\static_mutex.obj bcb\libboost_regex-bcb-mt-sd-1_31\usinstances.obj bcb\libboost_regex-bcb-mt-sd-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_31\winstances.obj
 	if exist bcb\libboost_regex-bcb-mt-sd-1_31.lib del bcb\libboost_regex-bcb-mt-sd-1_31.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-sd-1_31.lib"  +"bcb\libboost_regex-bcb-mt-sd-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\cregex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\instances.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\regex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-sd-1_31.lib"  +"bcb\libboost_regex-bcb-mt-sd-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\cregex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\instances.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\regex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\usinstances.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_31\winstances.obj"
 |
 
 ########################################################
@@ -889,6 +929,11 @@ bcb\boost_regex-bcb-mt-d-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HE
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
+bcb\boost_regex-bcb-mt-d-1_31\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_31\usinstances.obj ../src/usinstances.cpp
+|
+
 bcb\boost_regex-bcb-mt-d-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-mt-d-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
@@ -919,9 +964,9 @@ boost_regex-bcb-mt-d-1_31_clean :
 	del bcb\boost_regex-bcb-mt-d-1_31\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-mt-d-1_31.lib : bcb\boost_regex-bcb-mt-d-1_31\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\cregex.obj bcb\boost_regex-bcb-mt-d-1_31\fileiter.obj bcb\boost_regex-bcb-mt-d-1_31\instances.obj bcb\boost_regex-bcb-mt-d-1_31\posix_api.obj bcb\boost_regex-bcb-mt-d-1_31\regex.obj bcb\boost_regex-bcb-mt-d-1_31\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-d-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-d-1_31\static_mutex.obj bcb\boost_regex-bcb-mt-d-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_31\winstances.obj
+bcb\boost_regex-bcb-mt-d-1_31.lib : bcb\boost_regex-bcb-mt-d-1_31\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\cregex.obj bcb\boost_regex-bcb-mt-d-1_31\fileiter.obj bcb\boost_regex-bcb-mt-d-1_31\instances.obj bcb\boost_regex-bcb-mt-d-1_31\posix_api.obj bcb\boost_regex-bcb-mt-d-1_31\regex.obj bcb\boost_regex-bcb-mt-d-1_31\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-d-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-d-1_31\static_mutex.obj bcb\boost_regex-bcb-mt-d-1_31\usinstances.obj bcb\boost_regex-bcb-mt-d-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_31\winstances.obj
 	bcc32 @&&|
--lw-dup -lw-dpl -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-mt-d-1_31.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-d-1_31\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\cregex.obj bcb\boost_regex-bcb-mt-d-1_31\fileiter.obj bcb\boost_regex-bcb-mt-d-1_31\instances.obj bcb\boost_regex-bcb-mt-d-1_31\posix_api.obj bcb\boost_regex-bcb-mt-d-1_31\regex.obj bcb\boost_regex-bcb-mt-d-1_31\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-d-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-d-1_31\static_mutex.obj bcb\boost_regex-bcb-mt-d-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_31\winstances.obj $(LIBS)
+-lw-dup -lw-dpl -tWD -tWM -tWR -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-mt-d-1_31.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-d-1_31\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\cregex.obj bcb\boost_regex-bcb-mt-d-1_31\fileiter.obj bcb\boost_regex-bcb-mt-d-1_31\instances.obj bcb\boost_regex-bcb-mt-d-1_31\posix_api.obj bcb\boost_regex-bcb-mt-d-1_31\regex.obj bcb\boost_regex-bcb-mt-d-1_31\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-d-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-d-1_31\static_mutex.obj bcb\boost_regex-bcb-mt-d-1_31\usinstances.obj bcb\boost_regex-bcb-mt-d-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_31\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_31\winstances.obj $(LIBS)
 |
 	implib -w bcb\boost_regex-bcb-mt-d-1_31.lib bcb\boost_regex-bcb-mt-d-1_31.dll
 
@@ -985,6 +1030,11 @@ bcb\boost_regex-bcb-d-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADE
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
+bcb\boost_regex-bcb-d-1_31\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_31\usinstances.obj ../src/usinstances.cpp
+|
+
 bcb\boost_regex-bcb-d-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -DBOOST_REGEX_DYN_LINK -obcb\boost_regex-bcb-d-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
@@ -1015,9 +1065,9 @@ boost_regex-bcb-d-1_31_clean :
 	del bcb\boost_regex-bcb-d-1_31\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-d-1_31.lib : bcb\boost_regex-bcb-d-1_31\c_regex_traits.obj bcb\boost_regex-bcb-d-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_31\cregex.obj bcb\boost_regex-bcb-d-1_31\fileiter.obj bcb\boost_regex-bcb-d-1_31\instances.obj bcb\boost_regex-bcb-d-1_31\posix_api.obj bcb\boost_regex-bcb-d-1_31\regex.obj bcb\boost_regex-bcb-d-1_31\regex_debug.obj bcb\boost_regex-bcb-d-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-d-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-d-1_31\static_mutex.obj bcb\boost_regex-bcb-d-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-d-1_31\wide_posix_api.obj bcb\boost_regex-bcb-d-1_31\winstances.obj
+bcb\boost_regex-bcb-d-1_31.lib : bcb\boost_regex-bcb-d-1_31\c_regex_traits.obj bcb\boost_regex-bcb-d-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_31\cregex.obj bcb\boost_regex-bcb-d-1_31\fileiter.obj bcb\boost_regex-bcb-d-1_31\instances.obj bcb\boost_regex-bcb-d-1_31\posix_api.obj bcb\boost_regex-bcb-d-1_31\regex.obj bcb\boost_regex-bcb-d-1_31\regex_debug.obj bcb\boost_regex-bcb-d-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-d-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-d-1_31\static_mutex.obj bcb\boost_regex-bcb-d-1_31\usinstances.obj bcb\boost_regex-bcb-d-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-d-1_31\wide_posix_api.obj bcb\boost_regex-bcb-d-1_31\winstances.obj
 	bcc32 @&&|
--lw-dup -lw-dpl -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-d-1_31.dll $(XLFLAGS)  bcb\boost_regex-bcb-d-1_31\c_regex_traits.obj bcb\boost_regex-bcb-d-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_31\cregex.obj bcb\boost_regex-bcb-d-1_31\fileiter.obj bcb\boost_regex-bcb-d-1_31\instances.obj bcb\boost_regex-bcb-d-1_31\posix_api.obj bcb\boost_regex-bcb-d-1_31\regex.obj bcb\boost_regex-bcb-d-1_31\regex_debug.obj bcb\boost_regex-bcb-d-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-d-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-d-1_31\static_mutex.obj bcb\boost_regex-bcb-d-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-d-1_31\wide_posix_api.obj bcb\boost_regex-bcb-d-1_31\winstances.obj $(LIBS)
+-lw-dup -lw-dpl -tWD -tWR -tWM- -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; -ebcb\boost_regex-bcb-d-1_31.dll $(XLFLAGS)  bcb\boost_regex-bcb-d-1_31\c_regex_traits.obj bcb\boost_regex-bcb-d-1_31\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_31\cregex.obj bcb\boost_regex-bcb-d-1_31\fileiter.obj bcb\boost_regex-bcb-d-1_31\instances.obj bcb\boost_regex-bcb-d-1_31\posix_api.obj bcb\boost_regex-bcb-d-1_31\regex.obj bcb\boost_regex-bcb-d-1_31\regex_debug.obj bcb\boost_regex-bcb-d-1_31\regex_raw_buffer.obj bcb\boost_regex-bcb-d-1_31\regex_traits_defaults.obj bcb\boost_regex-bcb-d-1_31\static_mutex.obj bcb\boost_regex-bcb-d-1_31\usinstances.obj bcb\boost_regex-bcb-d-1_31\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_31\wc_regex_traits.obj bcb\boost_regex-bcb-d-1_31\wide_posix_api.obj bcb\boost_regex-bcb-d-1_31\winstances.obj $(LIBS)
 |
 	implib -w bcb\boost_regex-bcb-d-1_31.lib bcb\boost_regex-bcb-d-1_31.dll
 
@@ -1081,6 +1131,11 @@ bcb\libboost_regex-bcb-mt-d-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
+bcb\libboost_regex-bcb-mt-d-1_31\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_31\usinstances.obj ../src/usinstances.cpp
+|
+
 bcb\libboost_regex-bcb-mt-d-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWM -tWR -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-mt-d-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
@@ -1110,10 +1165,10 @@ libboost_regex-bcb-mt-d-1_31_clean :
 	del bcb\libboost_regex-bcb-mt-d-1_31\*.csm
 	del bcb\libboost_regex-bcb-mt-d-1_31\*.tds
 
-bcb\libboost_regex-bcb-mt-d-1_31.lib : bcb\libboost_regex-bcb-mt-d-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_31\cregex.obj bcb\libboost_regex-bcb-mt-d-1_31\fileiter.obj bcb\libboost_regex-bcb-mt-d-1_31\instances.obj bcb\libboost_regex-bcb-mt-d-1_31\posix_api.obj bcb\libboost_regex-bcb-mt-d-1_31\regex.obj bcb\libboost_regex-bcb-mt-d-1_31\regex_debug.obj bcb\libboost_regex-bcb-mt-d-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-d-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-d-1_31\static_mutex.obj bcb\libboost_regex-bcb-mt-d-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-mt-d-1_31\winstances.obj
+bcb\libboost_regex-bcb-mt-d-1_31.lib : bcb\libboost_regex-bcb-mt-d-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_31\cregex.obj bcb\libboost_regex-bcb-mt-d-1_31\fileiter.obj bcb\libboost_regex-bcb-mt-d-1_31\instances.obj bcb\libboost_regex-bcb-mt-d-1_31\posix_api.obj bcb\libboost_regex-bcb-mt-d-1_31\regex.obj bcb\libboost_regex-bcb-mt-d-1_31\regex_debug.obj bcb\libboost_regex-bcb-mt-d-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-d-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-d-1_31\static_mutex.obj bcb\libboost_regex-bcb-mt-d-1_31\usinstances.obj bcb\libboost_regex-bcb-mt-d-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-mt-d-1_31\winstances.obj
 	if exist bcb\libboost_regex-bcb-mt-d-1_31.lib del bcb\libboost_regex-bcb-mt-d-1_31.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-d-1_31.lib"  +"bcb\libboost_regex-bcb-mt-d-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\cregex.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\instances.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\regex.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-d-1_31.lib"  +"bcb\libboost_regex-bcb-mt-d-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\cregex.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\instances.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\regex.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\usinstances.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_31\winstances.obj"
 |
 
 ########################################################
@@ -1176,6 +1231,11 @@ bcb\libboost_regex-bcb-d-1_31\static_mutex.obj: ../src/static_mutex.cpp $(ALL_HE
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_31\static_mutex.obj ../src/static_mutex.cpp
 |
 
+bcb\libboost_regex-bcb-d-1_31\usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	bcc32 @&&|
+-c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_31\usinstances.obj ../src/usinstances.cpp
+|
+
 bcb\libboost_regex-bcb-d-1_31\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	bcc32 @&&|
 -c $(INCLUDES) -tWD -tWR -tWM- -DBOOST_REGEX_STATIC_LINK -D_NO_VCL -D_RTLDLL -v -Ve -Vx -w-inl -w-aus -w-rch -w-8012 -w-8057 -w-8037 -DSTRICT; -I$(BCROOT)\include;../../../ -L$(BCROOT)\lib;$(BCROOT)\lib\release; $(CXXFLAGS) -obcb\libboost_regex-bcb-d-1_31\w32_regex_traits.obj ../src/w32_regex_traits.cpp
@@ -1205,9 +1265,9 @@ libboost_regex-bcb-d-1_31_clean :
 	del bcb\libboost_regex-bcb-d-1_31\*.csm
 	del bcb\libboost_regex-bcb-d-1_31\*.tds
 
-bcb\libboost_regex-bcb-d-1_31.lib : bcb\libboost_regex-bcb-d-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-d-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-d-1_31\cregex.obj bcb\libboost_regex-bcb-d-1_31\fileiter.obj bcb\libboost_regex-bcb-d-1_31\instances.obj bcb\libboost_regex-bcb-d-1_31\posix_api.obj bcb\libboost_regex-bcb-d-1_31\regex.obj bcb\libboost_regex-bcb-d-1_31\regex_debug.obj bcb\libboost_regex-bcb-d-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-d-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-d-1_31\static_mutex.obj bcb\libboost_regex-bcb-d-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-d-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-d-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-d-1_31\winstances.obj
+bcb\libboost_regex-bcb-d-1_31.lib : bcb\libboost_regex-bcb-d-1_31\c_regex_traits.obj bcb\libboost_regex-bcb-d-1_31\cpp_regex_traits.obj bcb\libboost_regex-bcb-d-1_31\cregex.obj bcb\libboost_regex-bcb-d-1_31\fileiter.obj bcb\libboost_regex-bcb-d-1_31\instances.obj bcb\libboost_regex-bcb-d-1_31\posix_api.obj bcb\libboost_regex-bcb-d-1_31\regex.obj bcb\libboost_regex-bcb-d-1_31\regex_debug.obj bcb\libboost_regex-bcb-d-1_31\regex_raw_buffer.obj bcb\libboost_regex-bcb-d-1_31\regex_traits_defaults.obj bcb\libboost_regex-bcb-d-1_31\static_mutex.obj bcb\libboost_regex-bcb-d-1_31\usinstances.obj bcb\libboost_regex-bcb-d-1_31\w32_regex_traits.obj bcb\libboost_regex-bcb-d-1_31\wc_regex_traits.obj bcb\libboost_regex-bcb-d-1_31\wide_posix_api.obj bcb\libboost_regex-bcb-d-1_31\winstances.obj
 	if exist bcb\libboost_regex-bcb-d-1_31.lib del bcb\libboost_regex-bcb-d-1_31.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-d-1_31.lib"  +"bcb\libboost_regex-bcb-d-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_31\cregex.obj" +"bcb\libboost_regex-bcb-d-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-d-1_31\instances.obj" +"bcb\libboost_regex-bcb-d-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-d-1_31\regex.obj" +"bcb\libboost_regex-bcb-d-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-d-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-d-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-d-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-d-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-d-1_31\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-d-1_31.lib"  +"bcb\libboost_regex-bcb-d-1_31\c_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_31\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_31\cregex.obj" +"bcb\libboost_regex-bcb-d-1_31\fileiter.obj" +"bcb\libboost_regex-bcb-d-1_31\instances.obj" +"bcb\libboost_regex-bcb-d-1_31\posix_api.obj" +"bcb\libboost_regex-bcb-d-1_31\regex.obj" +"bcb\libboost_regex-bcb-d-1_31\regex_debug.obj" +"bcb\libboost_regex-bcb-d-1_31\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-d-1_31\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-d-1_31\static_mutex.obj" +"bcb\libboost_regex-bcb-d-1_31\usinstances.obj" +"bcb\libboost_regex-bcb-d-1_31\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_31\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_31\wide_posix_api.obj" +"bcb\libboost_regex-bcb-d-1_31\winstances.obj"
 |
 
diff --git a/build/gcc-shared.mak b/build/gcc-shared.mak
index 61769f2e..8af25e6b 100644
--- a/build/gcc-shared.mak
+++ b/build/gcc-shared.mak
@@ -29,7 +29,7 @@ C1=-c -O2 -I../../../ -fPIC
 C2=-c -g -I../../../ -fPIC
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : gcc  gcc gcc/boost_regex-gcc-1_31_shared ./gcc/libboost_regex-gcc-1_31.so gcc gcc/boost_regex-gcc-d-1_31_shared ./gcc/libboost_regex-gcc-d-1_31.so
 
@@ -80,6 +80,9 @@ gcc/boost_regex-gcc-1_31_shared/regex_traits_defaults.o: ../src/regex_traits_def
 gcc/boost_regex-gcc-1_31_shared/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31_shared/static_mutex.o $(C1) $(CXXFLAGS) ../src/static_mutex.cpp
 
+gcc/boost_regex-gcc-1_31_shared/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31_shared/usinstances.o $(C1) $(CXXFLAGS) ../src/usinstances.cpp
+
 gcc/boost_regex-gcc-1_31_shared/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31_shared/w32_regex_traits.o $(C1) $(CXXFLAGS) ../src/w32_regex_traits.cpp
 
@@ -98,8 +101,8 @@ gcc/boost_regex-gcc-1_31_shared :
 boost_regex-gcc-1_31_clean :
 	rm -f gcc/boost_regex-gcc-1_31_shared/*.o
 
-./gcc/libboost_regex-gcc-1_31.so : gcc/boost_regex-gcc-1_31_shared/c_regex_traits.o gcc/boost_regex-gcc-1_31_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_31_shared/cregex.o gcc/boost_regex-gcc-1_31_shared/fileiter.o gcc/boost_regex-gcc-1_31_shared/instances.o gcc/boost_regex-gcc-1_31_shared/posix_api.o gcc/boost_regex-gcc-1_31_shared/regex.o gcc/boost_regex-gcc-1_31_shared/regex_debug.o gcc/boost_regex-gcc-1_31_shared/regex_raw_buffer.o gcc/boost_regex-gcc-1_31_shared/regex_traits_defaults.o gcc/boost_regex-gcc-1_31_shared/static_mutex.o gcc/boost_regex-gcc-1_31_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_31_shared/wc_regex_traits.o gcc/boost_regex-gcc-1_31_shared/wide_posix_api.o gcc/boost_regex-gcc-1_31_shared/winstances.o
-	$(LINKER) -o gcc/libboost_regex-gcc-1_31.so $(LDFLAGS)  gcc/boost_regex-gcc-1_31_shared/c_regex_traits.o gcc/boost_regex-gcc-1_31_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_31_shared/cregex.o gcc/boost_regex-gcc-1_31_shared/fileiter.o gcc/boost_regex-gcc-1_31_shared/instances.o gcc/boost_regex-gcc-1_31_shared/posix_api.o gcc/boost_regex-gcc-1_31_shared/regex.o gcc/boost_regex-gcc-1_31_shared/regex_debug.o gcc/boost_regex-gcc-1_31_shared/regex_raw_buffer.o gcc/boost_regex-gcc-1_31_shared/regex_traits_defaults.o gcc/boost_regex-gcc-1_31_shared/static_mutex.o gcc/boost_regex-gcc-1_31_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_31_shared/wc_regex_traits.o gcc/boost_regex-gcc-1_31_shared/wide_posix_api.o gcc/boost_regex-gcc-1_31_shared/winstances.o $(LIBS)
+./gcc/libboost_regex-gcc-1_31.so : gcc/boost_regex-gcc-1_31_shared/c_regex_traits.o gcc/boost_regex-gcc-1_31_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_31_shared/cregex.o gcc/boost_regex-gcc-1_31_shared/fileiter.o gcc/boost_regex-gcc-1_31_shared/instances.o gcc/boost_regex-gcc-1_31_shared/posix_api.o gcc/boost_regex-gcc-1_31_shared/regex.o gcc/boost_regex-gcc-1_31_shared/regex_debug.o gcc/boost_regex-gcc-1_31_shared/regex_raw_buffer.o gcc/boost_regex-gcc-1_31_shared/regex_traits_defaults.o gcc/boost_regex-gcc-1_31_shared/static_mutex.o gcc/boost_regex-gcc-1_31_shared/usinstances.o gcc/boost_regex-gcc-1_31_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_31_shared/wc_regex_traits.o gcc/boost_regex-gcc-1_31_shared/wide_posix_api.o gcc/boost_regex-gcc-1_31_shared/winstances.o
+	$(LINKER) -o gcc/libboost_regex-gcc-1_31.so $(LDFLAGS)  gcc/boost_regex-gcc-1_31_shared/c_regex_traits.o gcc/boost_regex-gcc-1_31_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_31_shared/cregex.o gcc/boost_regex-gcc-1_31_shared/fileiter.o gcc/boost_regex-gcc-1_31_shared/instances.o gcc/boost_regex-gcc-1_31_shared/posix_api.o gcc/boost_regex-gcc-1_31_shared/regex.o gcc/boost_regex-gcc-1_31_shared/regex_debug.o gcc/boost_regex-gcc-1_31_shared/regex_raw_buffer.o gcc/boost_regex-gcc-1_31_shared/regex_traits_defaults.o gcc/boost_regex-gcc-1_31_shared/static_mutex.o gcc/boost_regex-gcc-1_31_shared/usinstances.o gcc/boost_regex-gcc-1_31_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_31_shared/wc_regex_traits.o gcc/boost_regex-gcc-1_31_shared/wide_posix_api.o gcc/boost_regex-gcc-1_31_shared/winstances.o $(LIBS)
 
 ########################################################
 #
@@ -139,6 +142,9 @@ gcc/boost_regex-gcc-d-1_31_shared/regex_traits_defaults.o: ../src/regex_traits_d
 gcc/boost_regex-gcc-d-1_31_shared/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31_shared/static_mutex.o $(C2) $(CXXFLAGS) ../src/static_mutex.cpp
 
+gcc/boost_regex-gcc-d-1_31_shared/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31_shared/usinstances.o $(C2) $(CXXFLAGS) ../src/usinstances.cpp
+
 gcc/boost_regex-gcc-d-1_31_shared/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31_shared/w32_regex_traits.o $(C2) $(CXXFLAGS) ../src/w32_regex_traits.cpp
 
@@ -157,6 +163,6 @@ gcc/boost_regex-gcc-d-1_31_shared :
 boost_regex-gcc-d-1_31_clean :
 	rm -f gcc/boost_regex-gcc-d-1_31_shared/*.o
 
-./gcc/libboost_regex-gcc-d-1_31.so : gcc/boost_regex-gcc-d-1_31_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/cregex.o gcc/boost_regex-gcc-d-1_31_shared/fileiter.o gcc/boost_regex-gcc-d-1_31_shared/instances.o gcc/boost_regex-gcc-d-1_31_shared/posix_api.o gcc/boost_regex-gcc-d-1_31_shared/regex.o gcc/boost_regex-gcc-d-1_31_shared/regex_debug.o gcc/boost_regex-gcc-d-1_31_shared/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_31_shared/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_31_shared/static_mutex.o gcc/boost_regex-gcc-d-1_31_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/wc_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_31_shared/winstances.o
-	$(LINKER) -o gcc/libboost_regex-gcc-d-1_31.so $(LDFLAGS)  gcc/boost_regex-gcc-d-1_31_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/cregex.o gcc/boost_regex-gcc-d-1_31_shared/fileiter.o gcc/boost_regex-gcc-d-1_31_shared/instances.o gcc/boost_regex-gcc-d-1_31_shared/posix_api.o gcc/boost_regex-gcc-d-1_31_shared/regex.o gcc/boost_regex-gcc-d-1_31_shared/regex_debug.o gcc/boost_regex-gcc-d-1_31_shared/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_31_shared/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_31_shared/static_mutex.o gcc/boost_regex-gcc-d-1_31_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/wc_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_31_shared/winstances.o $(LIBS)
+./gcc/libboost_regex-gcc-d-1_31.so : gcc/boost_regex-gcc-d-1_31_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/cregex.o gcc/boost_regex-gcc-d-1_31_shared/fileiter.o gcc/boost_regex-gcc-d-1_31_shared/instances.o gcc/boost_regex-gcc-d-1_31_shared/posix_api.o gcc/boost_regex-gcc-d-1_31_shared/regex.o gcc/boost_regex-gcc-d-1_31_shared/regex_debug.o gcc/boost_regex-gcc-d-1_31_shared/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_31_shared/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_31_shared/static_mutex.o gcc/boost_regex-gcc-d-1_31_shared/usinstances.o gcc/boost_regex-gcc-d-1_31_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/wc_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_31_shared/winstances.o
+	$(LINKER) -o gcc/libboost_regex-gcc-d-1_31.so $(LDFLAGS)  gcc/boost_regex-gcc-d-1_31_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/cregex.o gcc/boost_regex-gcc-d-1_31_shared/fileiter.o gcc/boost_regex-gcc-d-1_31_shared/instances.o gcc/boost_regex-gcc-d-1_31_shared/posix_api.o gcc/boost_regex-gcc-d-1_31_shared/regex.o gcc/boost_regex-gcc-d-1_31_shared/regex_debug.o gcc/boost_regex-gcc-d-1_31_shared/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_31_shared/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_31_shared/static_mutex.o gcc/boost_regex-gcc-d-1_31_shared/usinstances.o gcc/boost_regex-gcc-d-1_31_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/wc_regex_traits.o gcc/boost_regex-gcc-d-1_31_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_31_shared/winstances.o $(LIBS)
 
diff --git a/build/gcc.mak b/build/gcc.mak
index 5df872b0..b87ee53b 100644
--- a/build/gcc.mak
+++ b/build/gcc.mak
@@ -30,7 +30,7 @@ C2=-c -g -I../../../
 
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : gcc  gcc gcc/boost_regex-gcc-1_31 ./gcc/libboost_regex-gcc-1_31.a gcc gcc/boost_regex-gcc-d-1_31 ./gcc/libboost_regex-gcc-d-1_31.a
 
@@ -81,6 +81,9 @@ gcc/boost_regex-gcc-1_31/regex_traits_defaults.o: ../src/regex_traits_defaults.c
 gcc/boost_regex-gcc-1_31/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31/static_mutex.o $(C1) $(CXXFLAGS) ../src/static_mutex.cpp
 
+gcc/boost_regex-gcc-1_31/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31/usinstances.o $(C1) $(CXXFLAGS) ../src/usinstances.cpp
+
 gcc/boost_regex-gcc-1_31/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_31/w32_regex_traits.o $(C1) $(CXXFLAGS) ../src/w32_regex_traits.cpp
 
@@ -99,8 +102,8 @@ gcc/boost_regex-gcc-1_31 :
 boost_regex-gcc-1_31_clean :
 	rm -f gcc/boost_regex-gcc-1_31/*.o
 
-./gcc/libboost_regex-gcc-1_31.a : gcc/boost_regex-gcc-1_31/c_regex_traits.o gcc/boost_regex-gcc-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-1_31/cregex.o gcc/boost_regex-gcc-1_31/fileiter.o gcc/boost_regex-gcc-1_31/instances.o gcc/boost_regex-gcc-1_31/posix_api.o gcc/boost_regex-gcc-1_31/regex.o gcc/boost_regex-gcc-1_31/regex_debug.o gcc/boost_regex-gcc-1_31/regex_raw_buffer.o gcc/boost_regex-gcc-1_31/regex_traits_defaults.o gcc/boost_regex-gcc-1_31/static_mutex.o gcc/boost_regex-gcc-1_31/w32_regex_traits.o gcc/boost_regex-gcc-1_31/wc_regex_traits.o gcc/boost_regex-gcc-1_31/wide_posix_api.o gcc/boost_regex-gcc-1_31/winstances.o
-	ar -r gcc/libboost_regex-gcc-1_31.a  gcc/boost_regex-gcc-1_31/c_regex_traits.o gcc/boost_regex-gcc-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-1_31/cregex.o gcc/boost_regex-gcc-1_31/fileiter.o gcc/boost_regex-gcc-1_31/instances.o gcc/boost_regex-gcc-1_31/posix_api.o gcc/boost_regex-gcc-1_31/regex.o gcc/boost_regex-gcc-1_31/regex_debug.o gcc/boost_regex-gcc-1_31/regex_raw_buffer.o gcc/boost_regex-gcc-1_31/regex_traits_defaults.o gcc/boost_regex-gcc-1_31/static_mutex.o gcc/boost_regex-gcc-1_31/w32_regex_traits.o gcc/boost_regex-gcc-1_31/wc_regex_traits.o gcc/boost_regex-gcc-1_31/wide_posix_api.o gcc/boost_regex-gcc-1_31/winstances.o
+./gcc/libboost_regex-gcc-1_31.a : gcc/boost_regex-gcc-1_31/c_regex_traits.o gcc/boost_regex-gcc-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-1_31/cregex.o gcc/boost_regex-gcc-1_31/fileiter.o gcc/boost_regex-gcc-1_31/instances.o gcc/boost_regex-gcc-1_31/posix_api.o gcc/boost_regex-gcc-1_31/regex.o gcc/boost_regex-gcc-1_31/regex_debug.o gcc/boost_regex-gcc-1_31/regex_raw_buffer.o gcc/boost_regex-gcc-1_31/regex_traits_defaults.o gcc/boost_regex-gcc-1_31/static_mutex.o gcc/boost_regex-gcc-1_31/usinstances.o gcc/boost_regex-gcc-1_31/w32_regex_traits.o gcc/boost_regex-gcc-1_31/wc_regex_traits.o gcc/boost_regex-gcc-1_31/wide_posix_api.o gcc/boost_regex-gcc-1_31/winstances.o
+	ar -r gcc/libboost_regex-gcc-1_31.a  gcc/boost_regex-gcc-1_31/c_regex_traits.o gcc/boost_regex-gcc-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-1_31/cregex.o gcc/boost_regex-gcc-1_31/fileiter.o gcc/boost_regex-gcc-1_31/instances.o gcc/boost_regex-gcc-1_31/posix_api.o gcc/boost_regex-gcc-1_31/regex.o gcc/boost_regex-gcc-1_31/regex_debug.o gcc/boost_regex-gcc-1_31/regex_raw_buffer.o gcc/boost_regex-gcc-1_31/regex_traits_defaults.o gcc/boost_regex-gcc-1_31/static_mutex.o gcc/boost_regex-gcc-1_31/usinstances.o gcc/boost_regex-gcc-1_31/w32_regex_traits.o gcc/boost_regex-gcc-1_31/wc_regex_traits.o gcc/boost_regex-gcc-1_31/wide_posix_api.o gcc/boost_regex-gcc-1_31/winstances.o
 	-ar -s gcc/libboost_regex-gcc-1_31.a
 
 ########################################################
@@ -141,6 +144,9 @@ gcc/boost_regex-gcc-d-1_31/regex_traits_defaults.o: ../src/regex_traits_defaults
 gcc/boost_regex-gcc-d-1_31/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31/static_mutex.o $(C2) $(CXXFLAGS) ../src/static_mutex.cpp
 
+gcc/boost_regex-gcc-d-1_31/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31/usinstances.o $(C2) $(CXXFLAGS) ../src/usinstances.cpp
+
 gcc/boost_regex-gcc-d-1_31/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_31/w32_regex_traits.o $(C2) $(CXXFLAGS) ../src/w32_regex_traits.cpp
 
@@ -159,7 +165,7 @@ gcc/boost_regex-gcc-d-1_31 :
 boost_regex-gcc-d-1_31_clean :
 	rm -f gcc/boost_regex-gcc-d-1_31/*.o
 
-./gcc/libboost_regex-gcc-d-1_31.a : gcc/boost_regex-gcc-d-1_31/c_regex_traits.o gcc/boost_regex-gcc-d-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31/cregex.o gcc/boost_regex-gcc-d-1_31/fileiter.o gcc/boost_regex-gcc-d-1_31/instances.o gcc/boost_regex-gcc-d-1_31/posix_api.o gcc/boost_regex-gcc-d-1_31/regex.o gcc/boost_regex-gcc-d-1_31/regex_debug.o gcc/boost_regex-gcc-d-1_31/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_31/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_31/static_mutex.o gcc/boost_regex-gcc-d-1_31/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31/wc_regex_traits.o gcc/boost_regex-gcc-d-1_31/wide_posix_api.o gcc/boost_regex-gcc-d-1_31/winstances.o
-	ar -r gcc/libboost_regex-gcc-d-1_31.a  gcc/boost_regex-gcc-d-1_31/c_regex_traits.o gcc/boost_regex-gcc-d-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31/cregex.o gcc/boost_regex-gcc-d-1_31/fileiter.o gcc/boost_regex-gcc-d-1_31/instances.o gcc/boost_regex-gcc-d-1_31/posix_api.o gcc/boost_regex-gcc-d-1_31/regex.o gcc/boost_regex-gcc-d-1_31/regex_debug.o gcc/boost_regex-gcc-d-1_31/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_31/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_31/static_mutex.o gcc/boost_regex-gcc-d-1_31/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31/wc_regex_traits.o gcc/boost_regex-gcc-d-1_31/wide_posix_api.o gcc/boost_regex-gcc-d-1_31/winstances.o
+./gcc/libboost_regex-gcc-d-1_31.a : gcc/boost_regex-gcc-d-1_31/c_regex_traits.o gcc/boost_regex-gcc-d-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31/cregex.o gcc/boost_regex-gcc-d-1_31/fileiter.o gcc/boost_regex-gcc-d-1_31/instances.o gcc/boost_regex-gcc-d-1_31/posix_api.o gcc/boost_regex-gcc-d-1_31/regex.o gcc/boost_regex-gcc-d-1_31/regex_debug.o gcc/boost_regex-gcc-d-1_31/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_31/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_31/static_mutex.o gcc/boost_regex-gcc-d-1_31/usinstances.o gcc/boost_regex-gcc-d-1_31/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31/wc_regex_traits.o gcc/boost_regex-gcc-d-1_31/wide_posix_api.o gcc/boost_regex-gcc-d-1_31/winstances.o
+	ar -r gcc/libboost_regex-gcc-d-1_31.a  gcc/boost_regex-gcc-d-1_31/c_regex_traits.o gcc/boost_regex-gcc-d-1_31/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_31/cregex.o gcc/boost_regex-gcc-d-1_31/fileiter.o gcc/boost_regex-gcc-d-1_31/instances.o gcc/boost_regex-gcc-d-1_31/posix_api.o gcc/boost_regex-gcc-d-1_31/regex.o gcc/boost_regex-gcc-d-1_31/regex_debug.o gcc/boost_regex-gcc-d-1_31/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_31/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_31/static_mutex.o gcc/boost_regex-gcc-d-1_31/usinstances.o gcc/boost_regex-gcc-d-1_31/w32_regex_traits.o gcc/boost_regex-gcc-d-1_31/wc_regex_traits.o gcc/boost_regex-gcc-d-1_31/wide_posix_api.o gcc/boost_regex-gcc-d-1_31/winstances.o
 	-ar -s gcc/libboost_regex-gcc-d-1_31.a
 
diff --git a/build/generic.mak b/build/generic.mak
index 1c166f98..f2a71305 100644
--- a/build/generic.mak
+++ b/build/generic.mak
@@ -26,7 +26,7 @@ C1=-c -O2 -I../../../
 
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : $(DIRNAME)  $(DIRNAME) $(DIRNAME)/boost_regex ./$(DIRNAME)/libboost_regex.so
 
@@ -77,6 +77,9 @@ $(DIRNAME)/boost_regex/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp
 $(DIRNAME)/boost_regex/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/static_mutex.o $(C1) $(CXXFLAGS) ../src/static_mutex.cpp
 
+$(DIRNAME)/boost_regex/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/usinstances.o $(C1) $(CXXFLAGS) ../src/usinstances.cpp
+
 $(DIRNAME)/boost_regex/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/w32_regex_traits.o $(C1) $(CXXFLAGS) ../src/w32_regex_traits.cpp
 
@@ -95,6 +98,6 @@ $(DIRNAME)/boost_regex :
 boost_regex_clean :
 	rm -f $(DIRNAME)/boost_regex/*.o
 
-./$(DIRNAME)/libboost_regex.so : $(DIRNAME)/boost_regex/c_regex_traits.o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(DIRNAME)/boost_regex/cregex.o $(DIRNAME)/boost_regex/fileiter.o $(DIRNAME)/boost_regex/instances.o $(DIRNAME)/boost_regex/posix_api.o $(DIRNAME)/boost_regex/regex.o $(DIRNAME)/boost_regex/regex_debug.o $(DIRNAME)/boost_regex/regex_raw_buffer.o $(DIRNAME)/boost_regex/regex_traits_defaults.o $(DIRNAME)/boost_regex/static_mutex.o $(DIRNAME)/boost_regex/w32_regex_traits.o $(DIRNAME)/boost_regex/wc_regex_traits.o $(DIRNAME)/boost_regex/wide_posix_api.o $(DIRNAME)/boost_regex/winstances.o
-	$(LINKER) $(LDFLAGS) -o $(DIRNAME)/libboost_regex.so  $(DIRNAME)/boost_regex/c_regex_traits.o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(DIRNAME)/boost_regex/cregex.o $(DIRNAME)/boost_regex/fileiter.o $(DIRNAME)/boost_regex/instances.o $(DIRNAME)/boost_regex/posix_api.o $(DIRNAME)/boost_regex/regex.o $(DIRNAME)/boost_regex/regex_debug.o $(DIRNAME)/boost_regex/regex_raw_buffer.o $(DIRNAME)/boost_regex/regex_traits_defaults.o $(DIRNAME)/boost_regex/static_mutex.o $(DIRNAME)/boost_regex/w32_regex_traits.o $(DIRNAME)/boost_regex/wc_regex_traits.o $(DIRNAME)/boost_regex/wide_posix_api.o $(DIRNAME)/boost_regex/winstances.o $(LIBS)
+./$(DIRNAME)/libboost_regex.so : $(DIRNAME)/boost_regex/c_regex_traits.o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(DIRNAME)/boost_regex/cregex.o $(DIRNAME)/boost_regex/fileiter.o $(DIRNAME)/boost_regex/instances.o $(DIRNAME)/boost_regex/posix_api.o $(DIRNAME)/boost_regex/regex.o $(DIRNAME)/boost_regex/regex_debug.o $(DIRNAME)/boost_regex/regex_raw_buffer.o $(DIRNAME)/boost_regex/regex_traits_defaults.o $(DIRNAME)/boost_regex/static_mutex.o $(DIRNAME)/boost_regex/usinstances.o $(DIRNAME)/boost_regex/w32_regex_traits.o $(DIRNAME)/boost_regex/wc_regex_traits.o $(DIRNAME)/boost_regex/wide_posix_api.o $(DIRNAME)/boost_regex/winstances.o
+	$(LINKER) $(LDFLAGS) -o $(DIRNAME)/libboost_regex.so  $(DIRNAME)/boost_regex/c_regex_traits.o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(DIRNAME)/boost_regex/cregex.o $(DIRNAME)/boost_regex/fileiter.o $(DIRNAME)/boost_regex/instances.o $(DIRNAME)/boost_regex/posix_api.o $(DIRNAME)/boost_regex/regex.o $(DIRNAME)/boost_regex/regex_debug.o $(DIRNAME)/boost_regex/regex_raw_buffer.o $(DIRNAME)/boost_regex/regex_traits_defaults.o $(DIRNAME)/boost_regex/static_mutex.o $(DIRNAME)/boost_regex/usinstances.o $(DIRNAME)/boost_regex/w32_regex_traits.o $(DIRNAME)/boost_regex/wc_regex_traits.o $(DIRNAME)/boost_regex/wide_posix_api.o $(DIRNAME)/boost_regex/winstances.o $(LIBS)
 
diff --git a/build/sunpro.mak b/build/sunpro.mak
index df50d2ae..d619949d 100644
--- a/build/sunpro.mak
+++ b/build/sunpro.mak
@@ -34,7 +34,7 @@ SUNWS_CACHE_NAME=SunWS_cache
 
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : sunpro sunpro/libboost_regex$(LIBSUFFIX) sunpro/libboost_regex$(LIBSUFFIX).a sunpro/libboost_regex_mt$(LIBSUFFIX) sunpro/libboost_regex_mt$(LIBSUFFIX).a sunpro/shared_libboost_regex$(LIBSUFFIX) sunpro/libboost_regex$(LIBSUFFIX).so sunpro/shared_libboost_regex_mt$(LIBSUFFIX) sunpro/libboost_regex_mt$(LIBSUFFIX).so
 
@@ -84,6 +84,9 @@ sunpro/libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o: ../src/regex_traits_d
 sunpro/libboost_regex$(LIBSUFFIX)/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/static_mutex.o ../src/static_mutex.cpp
 
+sunpro/libboost_regex$(LIBSUFFIX)/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/usinstances.o ../src/usinstances.cpp
+
 sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o ../src/w32_regex_traits.cpp
 
@@ -103,8 +106,8 @@ libboost_regex$(LIBSUFFIX)_clean :
 	rm -f sunpro/libboost_regex$(LIBSUFFIX)/*.o
 	rm -fr sunpro/libboost_regex$(LIBSUFFIX)/$(SUNWS_CACHE_NAME)
 
-sunpro/libboost_regex$(LIBSUFFIX).a : sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cregex.o sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex$(LIBSUFFIX)/instances.o sunpro/libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/regex.o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/winstances.o
-	CC -xar $(CXXFLAGS) $(LDFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX).a  sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cregex.o sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex$(LIBSUFFIX)/instances.o sunpro/libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/regex.o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/winstances.o
+sunpro/libboost_regex$(LIBSUFFIX).a : sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cregex.o sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex$(LIBSUFFIX)/instances.o sunpro/libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/regex.o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex$(LIBSUFFIX)/usinstances.o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/winstances.o
+	CC -xar $(CXXFLAGS) $(LDFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX).a  sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cregex.o sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex$(LIBSUFFIX)/instances.o sunpro/libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/regex.o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex$(LIBSUFFIX)/usinstances.o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/winstances.o
 
 ########################################################
 #
@@ -144,6 +147,9 @@ sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o: ../src/regex_trait
 sunpro/libboost_regex_mt$(LIBSUFFIX)/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/static_mutex.o ../src/static_mutex.cpp
 
+sunpro/libboost_regex_mt$(LIBSUFFIX)/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/usinstances.o ../src/usinstances.cpp
+
 sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o ../src/w32_regex_traits.cpp
 
@@ -163,8 +169,8 @@ libboost_regex_mt$(LIBSUFFIX)_clean :
 	rm -f sunpro/libboost_regex_mt$(LIBSUFFIX)/*.o
 	rm -fr sunpro/libboost_regex_mt$(LIBSUFFIX)/$(SUNWS_CACHE_NAME)
 
-sunpro/libboost_regex_mt$(LIBSUFFIX).a : sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/winstances.o
-	CC -xar $(CXXFLAGS) $(LDFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX).a  sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/winstances.o
+sunpro/libboost_regex_mt$(LIBSUFFIX).a : sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/usinstances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/winstances.o
+	CC -xar $(CXXFLAGS) $(LDFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX).a  sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/usinstances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/winstances.o
 
 ########################################################
 #
@@ -204,6 +210,9 @@ sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o: ../src/regex_t
 sunpro/shared_libboost_regex$(LIBSUFFIX)/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/static_mutex.o ../src/static_mutex.cpp
 
+sunpro/shared_libboost_regex$(LIBSUFFIX)/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/usinstances.o ../src/usinstances.cpp
+
 sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o ../src/w32_regex_traits.cpp
 
@@ -223,8 +232,8 @@ libboost_regex$(LIBSUFFIX)_clean_shared :
 	rm -f sunpro/shared_libboost_regex$(LIBSUFFIX)/*.o
 	rm -fr sunpro/shared_libboost_regex$(LIBSUFFIX)/$(SUNWS_CACHE_NAME)
 
-sunpro/libboost_regex$(LIBSUFFIX).so : sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/winstances.o
-	CC -KPIC -O2 -I../../../ -G -o sunpro/libboost_regex$(LIBSUFFIX).so $(LDFLAGS)  sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/winstances.o $(LIBS)
+sunpro/libboost_regex$(LIBSUFFIX).so : sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/usinstances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/winstances.o
+	CC -KPIC -O2 -I../../../ -G -o sunpro/libboost_regex$(LIBSUFFIX).so $(LDFLAGS)  sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/usinstances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/winstances.o $(LIBS)
 
 ########################################################
 #
@@ -264,6 +273,9 @@ sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o: ../src/rege
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/static_mutex.o ../src/static_mutex.cpp
 
+sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/usinstances.o ../src/usinstances.cpp
+
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o ../src/w32_regex_traits.cpp
 
@@ -283,6 +295,6 @@ libboost_regex_mt$(LIBSUFFIX)_clean_shared :
 	rm -f sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/*.o
 	rm -fr sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/$(SUNWS_CACHE_NAME)
 
-sunpro/libboost_regex_mt$(LIBSUFFIX).so : sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/winstances.o
-	CC -KPIC -O2 -mt -I../../../ -G -o sunpro/libboost_regex_mt$(LIBSUFFIX).so $(LDFLAGS)  sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/winstances.o $(LIBS)
+sunpro/libboost_regex_mt$(LIBSUFFIX).so : sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/usinstances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/winstances.o
+	CC -KPIC -O2 -mt -I../../../ -G -o sunpro/libboost_regex_mt$(LIBSUFFIX).so $(LDFLAGS)  sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/usinstances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/winstances.o $(LIBS)
 
diff --git a/build/vc6-stlport.mak b/build/vc6-stlport.mak
index d719faad..38f8dcb9 100644
--- a/build/vc6-stlport.mak
+++ b/build/vc6-stlport.mak
@@ -40,7 +40,7 @@ NULL=nul
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc6-mt-sp-1_31_dir ./vc6-stlport/libboost_regex-vc6-mt-sp-1_31.lib boost_regex-vc6-mt-p-1_31_dir ./vc6-stlport/boost_regex-vc6-mt-p-1_31.lib libboost_regex-vc6-mt-p-1_31_dir ./vc6-stlport/libboost_regex-vc6-mt-p-1_31.lib boost_regex-vc6-mt-gdp-1_31_dir ./vc6-stlport/boost_regex-vc6-mt-gdp-1_31.lib libboost_regex-vc6-mt-sgdp-1_31_dir ./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.lib libboost_regex-vc6-mt-gdp-1_31_dir ./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31.lib
 
@@ -104,6 +104,9 @@ vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_traits_defaults.obj: ../src/rege
 vc6-stlport/libboost_regex-vc6-mt-sp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_31.pdb ../src/static_mutex.cpp
 
+vc6-stlport/libboost_regex-vc6-mt-sp-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_31.pdb ../src/usinstances.cpp
+
 vc6-stlport/libboost_regex-vc6-mt-sp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -125,8 +128,8 @@ libboost_regex-vc6-mt-sp-1_31_clean :
 	del vc6-stlport\libboost_regex-vc6-mt-sp-1_31\*.exp
 	del vc6-stlport\libboost_regex-vc6-mt-sp-1_31\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-sp-1_31.lib : vc6-stlport/libboost_regex-vc6-mt-sp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sp-1_31.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-sp-1_31.lib : vc6-stlport/libboost_regex-vc6-mt-sp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sp-1_31.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_31/winstances.obj
 
 ########################################################
 #
@@ -166,6 +169,9 @@ vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_traits_defaults.obj: ../src/regex_tr
 vc6-stlport/boost_regex-vc6-mt-p-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_31.pdb ../src/static_mutex.cpp
 
+vc6-stlport/boost_regex-vc6-mt-p-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_31.pdb ../src/usinstances.cpp
+
 vc6-stlport/boost_regex-vc6-mt-p-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -187,8 +193,8 @@ boost_regex-vc6-mt-p-1_31_clean :
 	del vc6-stlport\boost_regex-vc6-mt-p-1_31\*.exp
 	del vc6-stlport\boost_regex-vc6-mt-p-1_31\*.pch
 
-./vc6-stlport/boost_regex-vc6-mt-p-1_31.lib : vc6-stlport/boost_regex-vc6-mt-p-1_31/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6-stlport/boost_regex-vc6-mt-p-1_31.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-p-1_31.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-p-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6-stlport/boost_regex-vc6-mt-p-1_31/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/winstances.obj
+./vc6-stlport/boost_regex-vc6-mt-p-1_31.lib : vc6-stlport/boost_regex-vc6-mt-p-1_31/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/usinstances.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6-stlport/boost_regex-vc6-mt-p-1_31.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-p-1_31.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-p-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6-stlport/boost_regex-vc6-mt-p-1_31/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/usinstances.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_31/winstances.obj
 
 ########################################################
 #
@@ -228,6 +234,9 @@ vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_traits_defaults.obj: ../src/regex
 vc6-stlport/libboost_regex-vc6-mt-p-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_31.pdb ../src/static_mutex.cpp
 
+vc6-stlport/libboost_regex-vc6-mt-p-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_31.pdb ../src/usinstances.cpp
+
 vc6-stlport/libboost_regex-vc6-mt-p-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL  /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -249,8 +258,8 @@ libboost_regex-vc6-mt-p-1_31_clean :
 	del vc6-stlport\libboost_regex-vc6-mt-p-1_31\*.exp
 	del vc6-stlport\libboost_regex-vc6-mt-p-1_31\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-p-1_31.lib : vc6-stlport/libboost_regex-vc6-mt-p-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-p-1_31.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-p-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-p-1_31.lib : vc6-stlport/libboost_regex-vc6-mt-p-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-p-1_31.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-p-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_31/winstances.obj
 
 ########################################################
 #
@@ -290,6 +299,9 @@ vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_traits_defaults.obj: ../src/regex_
 vc6-stlport/boost_regex-vc6-mt-gdp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_31.pdb ../src/static_mutex.cpp
 
+vc6-stlport/boost_regex-vc6-mt-gdp-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_31.pdb ../src/usinstances.cpp
+
 vc6-stlport/boost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -311,8 +323,8 @@ boost_regex-vc6-mt-gdp-1_31_clean :
 	del vc6-stlport\boost_regex-vc6-mt-gdp-1_31\*.exp
 	del vc6-stlport\boost_regex-vc6-mt-gdp-1_31\*.pch
 
-./vc6-stlport/boost_regex-vc6-mt-gdp-1_31.lib : vc6-stlport/boost_regex-vc6-mt-gdp-1_31/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6-stlport/boost_regex-vc6-mt-gdp-1_31.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-gdp-1_31.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-gdp-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6-stlport/boost_regex-vc6-mt-gdp-1_31/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/winstances.obj
+./vc6-stlport/boost_regex-vc6-mt-gdp-1_31.lib : vc6-stlport/boost_regex-vc6-mt-gdp-1_31/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/usinstances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6-stlport/boost_regex-vc6-mt-gdp-1_31.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-gdp-1_31.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-gdp-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6-stlport/boost_regex-vc6-mt-gdp-1_31/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/usinstances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_31/winstances.obj
 
 ########################################################
 #
@@ -352,6 +364,9 @@ vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_traits_defaults.obj: ../src/re
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.pdb ../src/static_mutex.cpp
 
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.pdb ../src/usinstances.cpp
+
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -373,8 +388,8 @@ libboost_regex-vc6-mt-sgdp-1_31_clean :
 	del vc6-stlport\libboost_regex-vc6-mt-sgdp-1_31\*.exp
 	del vc6-stlport\libboost_regex-vc6-mt-sgdp-1_31\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.lib : vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.lib : vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_31/winstances.obj
 
 ########################################################
 #
@@ -414,6 +429,9 @@ vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_traits_defaults.obj: ../src/reg
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_31.pdb ../src/static_mutex.cpp
 
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_31.pdb ../src/usinstances.cpp
+
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /c $(CXXFLAGS) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -435,6 +453,6 @@ libboost_regex-vc6-mt-gdp-1_31_clean :
 	del vc6-stlport\libboost_regex-vc6-mt-gdp-1_31\*.exp
 	del vc6-stlport\libboost_regex-vc6-mt-gdp-1_31\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31.lib : vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-gdp-1_31.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-gdp-1_31.lib : vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-gdp-1_31.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_31/winstances.obj
 
diff --git a/build/vc6.mak b/build/vc6.mak
index 7eabf665..f4ffcc49 100644
--- a/build/vc6.mak
+++ b/build/vc6.mak
@@ -36,7 +36,7 @@ NULL=nul
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc6-s-1_31_dir ./vc6/libboost_regex-vc6-s-1_31.lib libboost_regex-vc6-mt-s-1_31_dir ./vc6/libboost_regex-vc6-mt-s-1_31.lib libboost_regex-vc6-sgd-1_31_dir ./vc6/libboost_regex-vc6-sgd-1_31.lib libboost_regex-vc6-mt-sgd-1_31_dir ./vc6/libboost_regex-vc6-mt-sgd-1_31.lib boost_regex-vc6-mt-gd-1_31_dir ./vc6/boost_regex-vc6-mt-gd-1_31.lib boost_regex-vc6-mt-1_31_dir ./vc6/boost_regex-vc6-mt-1_31.lib libboost_regex-vc6-mt-1_31_dir ./vc6/libboost_regex-vc6-mt-1_31.lib libboost_regex-vc6-mt-gd-1_31_dir ./vc6/libboost_regex-vc6-mt-gd-1_31.lib
 
@@ -100,6 +100,9 @@ vc6/libboost_regex-vc6-s-1_31/regex_traits_defaults.obj: ../src/regex_traits_def
 vc6/libboost_regex-vc6-s-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_31/ -Fdvc6/libboost_regex-vc6-s-1_31.pdb ../src/static_mutex.cpp
 
+vc6/libboost_regex-vc6-s-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_31/ -Fdvc6/libboost_regex-vc6-s-1_31.pdb ../src/usinstances.cpp
+
 vc6/libboost_regex-vc6-s-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_31/ -Fdvc6/libboost_regex-vc6-s-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -121,8 +124,8 @@ libboost_regex-vc6-s-1_31_clean :
 	del vc6\libboost_regex-vc6-s-1_31\*.exp
 	del vc6\libboost_regex-vc6-s-1_31\*.pch
 
-./vc6/libboost_regex-vc6-s-1_31.lib : vc6/libboost_regex-vc6-s-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/cregex.obj vc6/libboost_regex-vc6-s-1_31/fileiter.obj vc6/libboost_regex-vc6-s-1_31/instances.obj vc6/libboost_regex-vc6-s-1_31/posix_api.obj vc6/libboost_regex-vc6-s-1_31/regex.obj vc6/libboost_regex-vc6-s-1_31/regex_debug.obj vc6/libboost_regex-vc6-s-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-s-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-s-1_31/static_mutex.obj vc6/libboost_regex-vc6-s-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_31/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-s-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-s-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/cregex.obj vc6/libboost_regex-vc6-s-1_31/fileiter.obj vc6/libboost_regex-vc6-s-1_31/instances.obj vc6/libboost_regex-vc6-s-1_31/posix_api.obj vc6/libboost_regex-vc6-s-1_31/regex.obj vc6/libboost_regex-vc6-s-1_31/regex_debug.obj vc6/libboost_regex-vc6-s-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-s-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-s-1_31/static_mutex.obj vc6/libboost_regex-vc6-s-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_31/winstances.obj
+./vc6/libboost_regex-vc6-s-1_31.lib : vc6/libboost_regex-vc6-s-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/cregex.obj vc6/libboost_regex-vc6-s-1_31/fileiter.obj vc6/libboost_regex-vc6-s-1_31/instances.obj vc6/libboost_regex-vc6-s-1_31/posix_api.obj vc6/libboost_regex-vc6-s-1_31/regex.obj vc6/libboost_regex-vc6-s-1_31/regex_debug.obj vc6/libboost_regex-vc6-s-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-s-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-s-1_31/static_mutex.obj vc6/libboost_regex-vc6-s-1_31/usinstances.obj vc6/libboost_regex-vc6-s-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_31/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-s-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-s-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/cregex.obj vc6/libboost_regex-vc6-s-1_31/fileiter.obj vc6/libboost_regex-vc6-s-1_31/instances.obj vc6/libboost_regex-vc6-s-1_31/posix_api.obj vc6/libboost_regex-vc6-s-1_31/regex.obj vc6/libboost_regex-vc6-s-1_31/regex_debug.obj vc6/libboost_regex-vc6-s-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-s-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-s-1_31/static_mutex.obj vc6/libboost_regex-vc6-s-1_31/usinstances.obj vc6/libboost_regex-vc6-s-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-s-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_31/winstances.obj
 
 ########################################################
 #
@@ -162,6 +165,9 @@ vc6/libboost_regex-vc6-mt-s-1_31/regex_traits_defaults.obj: ../src/regex_traits_
 vc6/libboost_regex-vc6-mt-s-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_31/ -Fdvc6/libboost_regex-vc6-mt-s-1_31.pdb ../src/static_mutex.cpp
 
+vc6/libboost_regex-vc6-mt-s-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_31/ -Fdvc6/libboost_regex-vc6-mt-s-1_31.pdb ../src/usinstances.cpp
+
 vc6/libboost_regex-vc6-mt-s-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_31/ -Fdvc6/libboost_regex-vc6-mt-s-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -183,8 +189,8 @@ libboost_regex-vc6-mt-s-1_31_clean :
 	del vc6\libboost_regex-vc6-mt-s-1_31\*.exp
 	del vc6\libboost_regex-vc6-mt-s-1_31\*.pch
 
-./vc6/libboost_regex-vc6-mt-s-1_31.lib : vc6/libboost_regex-vc6-mt-s-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/cregex.obj vc6/libboost_regex-vc6-mt-s-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_31/instances.obj vc6/libboost_regex-vc6-mt-s-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_31/regex.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-s-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-s-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_31/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-s-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-s-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/cregex.obj vc6/libboost_regex-vc6-mt-s-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_31/instances.obj vc6/libboost_regex-vc6-mt-s-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_31/regex.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-s-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-s-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_31/winstances.obj
+./vc6/libboost_regex-vc6-mt-s-1_31.lib : vc6/libboost_regex-vc6-mt-s-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/cregex.obj vc6/libboost_regex-vc6-mt-s-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_31/instances.obj vc6/libboost_regex-vc6-mt-s-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_31/regex.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-s-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-s-1_31/usinstances.obj vc6/libboost_regex-vc6-mt-s-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_31/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-s-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-s-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/cregex.obj vc6/libboost_regex-vc6-mt-s-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_31/instances.obj vc6/libboost_regex-vc6-mt-s-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_31/regex.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-s-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-s-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-s-1_31/usinstances.obj vc6/libboost_regex-vc6-mt-s-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_31/winstances.obj
 
 ########################################################
 #
@@ -224,6 +230,9 @@ vc6/libboost_regex-vc6-sgd-1_31/regex_traits_defaults.obj: ../src/regex_traits_d
 vc6/libboost_regex-vc6-sgd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_31/ -Fdvc6/libboost_regex-vc6-sgd-1_31.pdb ../src/static_mutex.cpp
 
+vc6/libboost_regex-vc6-sgd-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_31/ -Fdvc6/libboost_regex-vc6-sgd-1_31.pdb ../src/usinstances.cpp
+
 vc6/libboost_regex-vc6-sgd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_31/ -Fdvc6/libboost_regex-vc6-sgd-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -245,8 +254,8 @@ libboost_regex-vc6-sgd-1_31_clean :
 	del vc6\libboost_regex-vc6-sgd-1_31\*.exp
 	del vc6\libboost_regex-vc6-sgd-1_31\*.pch
 
-./vc6/libboost_regex-vc6-sgd-1_31.lib : vc6/libboost_regex-vc6-sgd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/cregex.obj vc6/libboost_regex-vc6-sgd-1_31/fileiter.obj vc6/libboost_regex-vc6-sgd-1_31/instances.obj vc6/libboost_regex-vc6-sgd-1_31/posix_api.obj vc6/libboost_regex-vc6-sgd-1_31/regex.obj vc6/libboost_regex-vc6-sgd-1_31/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-sgd-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-sgd-1_31/static_mutex.obj vc6/libboost_regex-vc6-sgd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_31/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-sgd-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-sgd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/cregex.obj vc6/libboost_regex-vc6-sgd-1_31/fileiter.obj vc6/libboost_regex-vc6-sgd-1_31/instances.obj vc6/libboost_regex-vc6-sgd-1_31/posix_api.obj vc6/libboost_regex-vc6-sgd-1_31/regex.obj vc6/libboost_regex-vc6-sgd-1_31/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-sgd-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-sgd-1_31/static_mutex.obj vc6/libboost_regex-vc6-sgd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_31/winstances.obj
+./vc6/libboost_regex-vc6-sgd-1_31.lib : vc6/libboost_regex-vc6-sgd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/cregex.obj vc6/libboost_regex-vc6-sgd-1_31/fileiter.obj vc6/libboost_regex-vc6-sgd-1_31/instances.obj vc6/libboost_regex-vc6-sgd-1_31/posix_api.obj vc6/libboost_regex-vc6-sgd-1_31/regex.obj vc6/libboost_regex-vc6-sgd-1_31/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-sgd-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-sgd-1_31/static_mutex.obj vc6/libboost_regex-vc6-sgd-1_31/usinstances.obj vc6/libboost_regex-vc6-sgd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_31/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-sgd-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-sgd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/cregex.obj vc6/libboost_regex-vc6-sgd-1_31/fileiter.obj vc6/libboost_regex-vc6-sgd-1_31/instances.obj vc6/libboost_regex-vc6-sgd-1_31/posix_api.obj vc6/libboost_regex-vc6-sgd-1_31/regex.obj vc6/libboost_regex-vc6-sgd-1_31/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-sgd-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-sgd-1_31/static_mutex.obj vc6/libboost_regex-vc6-sgd-1_31/usinstances.obj vc6/libboost_regex-vc6-sgd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_31/winstances.obj
 
 ########################################################
 #
@@ -286,6 +295,9 @@ vc6/libboost_regex-vc6-mt-sgd-1_31/regex_traits_defaults.obj: ../src/regex_trait
 vc6/libboost_regex-vc6-mt-sgd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_31/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_31.pdb ../src/static_mutex.cpp
 
+vc6/libboost_regex-vc6-mt-sgd-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_31/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_31.pdb ../src/usinstances.cpp
+
 vc6/libboost_regex-vc6-mt-sgd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_31/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -307,8 +319,8 @@ libboost_regex-vc6-mt-sgd-1_31_clean :
 	del vc6\libboost_regex-vc6-mt-sgd-1_31\*.exp
 	del vc6\libboost_regex-vc6-mt-sgd-1_31\*.pch
 
-./vc6/libboost_regex-vc6-mt-sgd-1_31.lib : vc6/libboost_regex-vc6-mt-sgd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_31/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-sgd-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_31/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-sgd-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-sgd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_31/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-sgd-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_31/winstances.obj
+./vc6/libboost_regex-vc6-mt-sgd-1_31.lib : vc6/libboost_regex-vc6-mt-sgd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_31/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-sgd-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/usinstances.obj vc6/libboost_regex-vc6-mt-sgd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_31/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-sgd-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-sgd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_31/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-sgd-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-sgd-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-sgd-1_31/usinstances.obj vc6/libboost_regex-vc6-mt-sgd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_31/winstances.obj
 
 ########################################################
 #
@@ -348,6 +360,9 @@ vc6/boost_regex-vc6-mt-gd-1_31/regex_traits_defaults.obj: ../src/regex_traits_de
 vc6/boost_regex-vc6-mt-gd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_31/ -Fdvc6/boost_regex-vc6-mt-gd-1_31.pdb ../src/static_mutex.cpp
 
+vc6/boost_regex-vc6-mt-gd-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_31/ -Fdvc6/boost_regex-vc6-mt-gd-1_31.pdb ../src/usinstances.cpp
+
 vc6/boost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_31/ -Fdvc6/boost_regex-vc6-mt-gd-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -369,8 +384,8 @@ boost_regex-vc6-mt-gd-1_31_clean :
 	del vc6\boost_regex-vc6-mt-gd-1_31\*.exp
 	del vc6\boost_regex-vc6-mt-gd-1_31\*.pch
 
-./vc6/boost_regex-vc6-mt-gd-1_31.lib : vc6/boost_regex-vc6-mt-gd-1_31/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/cregex.obj vc6/boost_regex-vc6-mt-gd-1_31/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_31/instances.obj vc6/boost_regex-vc6-mt-gd-1_31/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_31/regex.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-gd-1_31/static_mutex.obj vc6/boost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/wc_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6/boost_regex-vc6-mt-gd-1_31.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-gd-1_31.dll" /implib:"vc6/boost_regex-vc6-mt-gd-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6/boost_regex-vc6-mt-gd-1_31/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/cregex.obj vc6/boost_regex-vc6-mt-gd-1_31/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_31/instances.obj vc6/boost_regex-vc6-mt-gd-1_31/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_31/regex.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-gd-1_31/static_mutex.obj vc6/boost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/wc_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_31/winstances.obj
+./vc6/boost_regex-vc6-mt-gd-1_31.lib : vc6/boost_regex-vc6-mt-gd-1_31/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/cregex.obj vc6/boost_regex-vc6-mt-gd-1_31/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_31/instances.obj vc6/boost_regex-vc6-mt-gd-1_31/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_31/regex.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-gd-1_31/static_mutex.obj vc6/boost_regex-vc6-mt-gd-1_31/usinstances.obj vc6/boost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/wc_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6/boost_regex-vc6-mt-gd-1_31.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-gd-1_31.dll" /implib:"vc6/boost_regex-vc6-mt-gd-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6/boost_regex-vc6-mt-gd-1_31/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/cregex.obj vc6/boost_regex-vc6-mt-gd-1_31/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_31/instances.obj vc6/boost_regex-vc6-mt-gd-1_31/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_31/regex.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-gd-1_31/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-gd-1_31/static_mutex.obj vc6/boost_regex-vc6-mt-gd-1_31/usinstances.obj vc6/boost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/wc_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_31/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_31/winstances.obj
 
 ########################################################
 #
@@ -410,6 +425,9 @@ vc6/boost_regex-vc6-mt-1_31/regex_traits_defaults.obj: ../src/regex_traits_defau
 vc6/boost_regex-vc6-mt-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_31/ -Fdvc6/boost_regex-vc6-mt-1_31.pdb ../src/static_mutex.cpp
 
+vc6/boost_regex-vc6-mt-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_31/ -Fdvc6/boost_regex-vc6-mt-1_31.pdb ../src/usinstances.cpp
+
 vc6/boost_regex-vc6-mt-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/boost_regex-vc6-mt-1_31/ -Fdvc6/boost_regex-vc6-mt-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -431,8 +449,8 @@ boost_regex-vc6-mt-1_31_clean :
 	del vc6\boost_regex-vc6-mt-1_31\*.exp
 	del vc6\boost_regex-vc6-mt-1_31\*.pch
 
-./vc6/boost_regex-vc6-mt-1_31.lib : vc6/boost_regex-vc6-mt-1_31/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/cregex.obj vc6/boost_regex-vc6-mt-1_31/fileiter.obj vc6/boost_regex-vc6-mt-1_31/instances.obj vc6/boost_regex-vc6-mt-1_31/posix_api.obj vc6/boost_regex-vc6-mt-1_31/regex.obj vc6/boost_regex-vc6-mt-1_31/regex_debug.obj vc6/boost_regex-vc6-mt-1_31/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-1_31/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-1_31/static_mutex.obj vc6/boost_regex-vc6-mt-1_31/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/wc_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6/boost_regex-vc6-mt-1_31.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-1_31.dll" /implib:"vc6/boost_regex-vc6-mt-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6/boost_regex-vc6-mt-1_31/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/cregex.obj vc6/boost_regex-vc6-mt-1_31/fileiter.obj vc6/boost_regex-vc6-mt-1_31/instances.obj vc6/boost_regex-vc6-mt-1_31/posix_api.obj vc6/boost_regex-vc6-mt-1_31/regex.obj vc6/boost_regex-vc6-mt-1_31/regex_debug.obj vc6/boost_regex-vc6-mt-1_31/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-1_31/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-1_31/static_mutex.obj vc6/boost_regex-vc6-mt-1_31/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/wc_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_31/winstances.obj
+./vc6/boost_regex-vc6-mt-1_31.lib : vc6/boost_regex-vc6-mt-1_31/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/cregex.obj vc6/boost_regex-vc6-mt-1_31/fileiter.obj vc6/boost_regex-vc6-mt-1_31/instances.obj vc6/boost_regex-vc6-mt-1_31/posix_api.obj vc6/boost_regex-vc6-mt-1_31/regex.obj vc6/boost_regex-vc6-mt-1_31/regex_debug.obj vc6/boost_regex-vc6-mt-1_31/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-1_31/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-1_31/static_mutex.obj vc6/boost_regex-vc6-mt-1_31/usinstances.obj vc6/boost_regex-vc6-mt-1_31/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/wc_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc6/boost_regex-vc6-mt-1_31.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-1_31.dll" /implib:"vc6/boost_regex-vc6-mt-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6/boost_regex-vc6-mt-1_31/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/cregex.obj vc6/boost_regex-vc6-mt-1_31/fileiter.obj vc6/boost_regex-vc6-mt-1_31/instances.obj vc6/boost_regex-vc6-mt-1_31/posix_api.obj vc6/boost_regex-vc6-mt-1_31/regex.obj vc6/boost_regex-vc6-mt-1_31/regex_debug.obj vc6/boost_regex-vc6-mt-1_31/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-1_31/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-1_31/static_mutex.obj vc6/boost_regex-vc6-mt-1_31/usinstances.obj vc6/boost_regex-vc6-mt-1_31/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/wc_regex_traits.obj vc6/boost_regex-vc6-mt-1_31/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_31/winstances.obj
 
 ########################################################
 #
@@ -472,6 +490,9 @@ vc6/libboost_regex-vc6-mt-1_31/regex_traits_defaults.obj: ../src/regex_traits_de
 vc6/libboost_regex-vc6-mt-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_31/ -Fdvc6/libboost_regex-vc6-mt-1_31.pdb ../src/static_mutex.cpp
 
+vc6/libboost_regex-vc6-mt-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_31/ -Fdvc6/libboost_regex-vc6-mt-1_31.pdb ../src/usinstances.cpp
+
 vc6/libboost_regex-vc6-mt-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD  /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_31/ -Fdvc6/libboost_regex-vc6-mt-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -493,8 +514,8 @@ libboost_regex-vc6-mt-1_31_clean :
 	del vc6\libboost_regex-vc6-mt-1_31\*.exp
 	del vc6\libboost_regex-vc6-mt-1_31\*.pch
 
-./vc6/libboost_regex-vc6-mt-1_31.lib : vc6/libboost_regex-vc6-mt-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/cregex.obj vc6/libboost_regex-vc6-mt-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-1_31/instances.obj vc6/libboost_regex-vc6-mt-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-1_31/regex.obj vc6/libboost_regex-vc6-mt-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_31/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/cregex.obj vc6/libboost_regex-vc6-mt-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-1_31/instances.obj vc6/libboost_regex-vc6-mt-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-1_31/regex.obj vc6/libboost_regex-vc6-mt-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_31/winstances.obj
+./vc6/libboost_regex-vc6-mt-1_31.lib : vc6/libboost_regex-vc6-mt-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/cregex.obj vc6/libboost_regex-vc6-mt-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-1_31/instances.obj vc6/libboost_regex-vc6-mt-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-1_31/regex.obj vc6/libboost_regex-vc6-mt-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-1_31/usinstances.obj vc6/libboost_regex-vc6-mt-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_31/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/cregex.obj vc6/libboost_regex-vc6-mt-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-1_31/instances.obj vc6/libboost_regex-vc6-mt-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-1_31/regex.obj vc6/libboost_regex-vc6-mt-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-1_31/usinstances.obj vc6/libboost_regex-vc6-mt-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_31/winstances.obj
 
 ########################################################
 #
@@ -534,6 +555,9 @@ vc6/libboost_regex-vc6-mt-gd-1_31/regex_traits_defaults.obj: ../src/regex_traits
 vc6/libboost_regex-vc6-mt-gd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_31/ -Fdvc6/libboost_regex-vc6-mt-gd-1_31.pdb ../src/static_mutex.cpp
 
+vc6/libboost_regex-vc6-mt-gd-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_31/ -Fdvc6/libboost_regex-vc6-mt-gd-1_31.pdb ../src/usinstances.cpp
+
 vc6/libboost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /c $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_31/ -Fdvc6/libboost_regex-vc6-mt-gd-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -555,6 +579,6 @@ libboost_regex-vc6-mt-gd-1_31_clean :
 	del vc6\libboost_regex-vc6-mt-gd-1_31\*.exp
 	del vc6\libboost_regex-vc6-mt-gd-1_31\*.pch
 
-./vc6/libboost_regex-vc6-mt-gd-1_31.lib : vc6/libboost_regex-vc6-mt-gd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_31/instances.obj vc6/libboost_regex-vc6-mt-gd-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-gd-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_31/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-gd-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-gd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_31/instances.obj vc6/libboost_regex-vc6-mt-gd-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-gd-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_31/winstances.obj
+./vc6/libboost_regex-vc6-mt-gd-1_31.lib : vc6/libboost_regex-vc6-mt-gd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_31/instances.obj vc6/libboost_regex-vc6-mt-gd-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-gd-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-gd-1_31/usinstances.obj vc6/libboost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_31/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-gd-1_31.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-gd-1_31/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_31/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_31/instances.obj vc6/libboost_regex-vc6-mt-gd-1_31/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-gd-1_31/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-gd-1_31/static_mutex.obj vc6/libboost_regex-vc6-mt-gd-1_31/usinstances.obj vc6/libboost_regex-vc6-mt-gd-1_31/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_31/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_31/winstances.obj
 
diff --git a/build/vc7-stlport.mak b/build/vc7-stlport.mak
index 5fdd64a0..1c022bcd 100644
--- a/build/vc7-stlport.mak
+++ b/build/vc7-stlport.mak
@@ -40,7 +40,7 @@ NULL=nul
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc7-mt-sp-1_31_dir ./vc7-stlport/libboost_regex-vc7-mt-sp-1_31.lib boost_regex-vc7-mt-p-1_31_dir ./vc7-stlport/boost_regex-vc7-mt-p-1_31.lib libboost_regex-vc7-mt-p-1_31_dir ./vc7-stlport/libboost_regex-vc7-mt-p-1_31.lib boost_regex-vc7-mt-gdp-1_31_dir ./vc7-stlport/boost_regex-vc7-mt-gdp-1_31.lib libboost_regex-vc7-mt-sgdp-1_31_dir ./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.lib libboost_regex-vc7-mt-gdp-1_31_dir ./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31.lib
 
@@ -104,6 +104,9 @@ vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_traits_defaults.obj: ../src/rege
 vc7-stlport/libboost_regex-vc7-mt-sp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_31.pdb ../src/static_mutex.cpp
 
+vc7-stlport/libboost_regex-vc7-mt-sp-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_31.pdb ../src/usinstances.cpp
+
 vc7-stlport/libboost_regex-vc7-mt-sp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -125,8 +128,8 @@ libboost_regex-vc7-mt-sp-1_31_clean :
 	del vc7-stlport\libboost_regex-vc7-mt-sp-1_31\*.exp
 	del vc7-stlport\libboost_regex-vc7-mt-sp-1_31\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-sp-1_31.lib : vc7-stlport/libboost_regex-vc7-mt-sp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sp-1_31.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-sp-1_31.lib : vc7-stlport/libboost_regex-vc7-mt-sp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sp-1_31.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_31/winstances.obj
 
 ########################################################
 #
@@ -166,6 +169,9 @@ vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_traits_defaults.obj: ../src/regex_tr
 vc7-stlport/boost_regex-vc7-mt-p-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_31.pdb ../src/static_mutex.cpp
 
+vc7-stlport/boost_regex-vc7-mt-p-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_31.pdb ../src/usinstances.cpp
+
 vc7-stlport/boost_regex-vc7-mt-p-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -187,8 +193,8 @@ boost_regex-vc7-mt-p-1_31_clean :
 	del vc7-stlport\boost_regex-vc7-mt-p-1_31\*.exp
 	del vc7-stlport\boost_regex-vc7-mt-p-1_31\*.pch
 
-./vc7-stlport/boost_regex-vc7-mt-p-1_31.lib : vc7-stlport/boost_regex-vc7-mt-p-1_31/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7-stlport/boost_regex-vc7-mt-p-1_31.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-p-1_31.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-p-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7-stlport/boost_regex-vc7-mt-p-1_31/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/winstances.obj
+./vc7-stlport/boost_regex-vc7-mt-p-1_31.lib : vc7-stlport/boost_regex-vc7-mt-p-1_31/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/usinstances.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7-stlport/boost_regex-vc7-mt-p-1_31.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-p-1_31.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-p-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7-stlport/boost_regex-vc7-mt-p-1_31/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/usinstances.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_31/winstances.obj
 
 ########################################################
 #
@@ -228,6 +234,9 @@ vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_traits_defaults.obj: ../src/regex
 vc7-stlport/libboost_regex-vc7-mt-p-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_31.pdb ../src/static_mutex.cpp
 
+vc7-stlport/libboost_regex-vc7-mt-p-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_31.pdb ../src/usinstances.cpp
+
 vc7-stlport/libboost_regex-vc7-mt-p-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -249,8 +258,8 @@ libboost_regex-vc7-mt-p-1_31_clean :
 	del vc7-stlport\libboost_regex-vc7-mt-p-1_31\*.exp
 	del vc7-stlport\libboost_regex-vc7-mt-p-1_31\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-p-1_31.lib : vc7-stlport/libboost_regex-vc7-mt-p-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-p-1_31.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-p-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-p-1_31.lib : vc7-stlport/libboost_regex-vc7-mt-p-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-p-1_31.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-p-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_31/winstances.obj
 
 ########################################################
 #
@@ -290,6 +299,9 @@ vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_traits_defaults.obj: ../src/regex_
 vc7-stlport/boost_regex-vc7-mt-gdp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_31.pdb ../src/static_mutex.cpp
 
+vc7-stlport/boost_regex-vc7-mt-gdp-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_31.pdb ../src/usinstances.cpp
+
 vc7-stlport/boost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -311,8 +323,8 @@ boost_regex-vc7-mt-gdp-1_31_clean :
 	del vc7-stlport\boost_regex-vc7-mt-gdp-1_31\*.exp
 	del vc7-stlport\boost_regex-vc7-mt-gdp-1_31\*.pch
 
-./vc7-stlport/boost_regex-vc7-mt-gdp-1_31.lib : vc7-stlport/boost_regex-vc7-mt-gdp-1_31/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7-stlport/boost_regex-vc7-mt-gdp-1_31.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-gdp-1_31.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-gdp-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7-stlport/boost_regex-vc7-mt-gdp-1_31/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/winstances.obj
+./vc7-stlport/boost_regex-vc7-mt-gdp-1_31.lib : vc7-stlport/boost_regex-vc7-mt-gdp-1_31/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/usinstances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7-stlport/boost_regex-vc7-mt-gdp-1_31.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-gdp-1_31.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-gdp-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7-stlport/boost_regex-vc7-mt-gdp-1_31/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/usinstances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_31/winstances.obj
 
 ########################################################
 #
@@ -352,6 +364,9 @@ vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_traits_defaults.obj: ../src/re
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.pdb ../src/static_mutex.cpp
 
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.pdb ../src/usinstances.cpp
+
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -373,8 +388,8 @@ libboost_regex-vc7-mt-sgdp-1_31_clean :
 	del vc7-stlport\libboost_regex-vc7-mt-sgdp-1_31\*.exp
 	del vc7-stlport\libboost_regex-vc7-mt-sgdp-1_31\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.lib : vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.lib : vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_31/winstances.obj
 
 ########################################################
 #
@@ -414,6 +429,9 @@ vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_traits_defaults.obj: ../src/reg
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_31.pdb ../src/static_mutex.cpp
 
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_31.pdb ../src/usinstances.cpp
+
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -435,6 +453,6 @@ libboost_regex-vc7-mt-gdp-1_31_clean :
 	del vc7-stlport\libboost_regex-vc7-mt-gdp-1_31\*.exp
 	del vc7-stlport\libboost_regex-vc7-mt-gdp-1_31\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31.lib : vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-gdp-1_31.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-gdp-1_31.lib : vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-gdp-1_31.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_31/winstances.obj
 
diff --git a/build/vc7.mak b/build/vc7.mak
index 5ea3e7e1..489d99e9 100644
--- a/build/vc7.mak
+++ b/build/vc7.mak
@@ -36,7 +36,7 @@ NULL=nul
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc7-s-1_31_dir ./vc7/libboost_regex-vc7-s-1_31.lib libboost_regex-vc7-mt-s-1_31_dir ./vc7/libboost_regex-vc7-mt-s-1_31.lib libboost_regex-vc7-sgd-1_31_dir ./vc7/libboost_regex-vc7-sgd-1_31.lib libboost_regex-vc7-mt-sgd-1_31_dir ./vc7/libboost_regex-vc7-mt-sgd-1_31.lib boost_regex-vc7-mt-gd-1_31_dir ./vc7/boost_regex-vc7-mt-gd-1_31.lib boost_regex-vc7-mt-1_31_dir ./vc7/boost_regex-vc7-mt-1_31.lib libboost_regex-vc7-mt-1_31_dir ./vc7/libboost_regex-vc7-mt-1_31.lib libboost_regex-vc7-mt-gd-1_31_dir ./vc7/libboost_regex-vc7-mt-gd-1_31.lib
 
@@ -100,6 +100,9 @@ vc7/libboost_regex-vc7-s-1_31/regex_traits_defaults.obj: ../src/regex_traits_def
 vc7/libboost_regex-vc7-s-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_31/ -Fdvc7/libboost_regex-vc7-s-1_31.pdb ../src/static_mutex.cpp
 
+vc7/libboost_regex-vc7-s-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_31/ -Fdvc7/libboost_regex-vc7-s-1_31.pdb ../src/usinstances.cpp
+
 vc7/libboost_regex-vc7-s-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-s-1_31/ -Fdvc7/libboost_regex-vc7-s-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -121,8 +124,8 @@ libboost_regex-vc7-s-1_31_clean :
 	del vc7\libboost_regex-vc7-s-1_31\*.exp
 	del vc7\libboost_regex-vc7-s-1_31\*.pch
 
-./vc7/libboost_regex-vc7-s-1_31.lib : vc7/libboost_regex-vc7-s-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/cregex.obj vc7/libboost_regex-vc7-s-1_31/fileiter.obj vc7/libboost_regex-vc7-s-1_31/instances.obj vc7/libboost_regex-vc7-s-1_31/posix_api.obj vc7/libboost_regex-vc7-s-1_31/regex.obj vc7/libboost_regex-vc7-s-1_31/regex_debug.obj vc7/libboost_regex-vc7-s-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-s-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-s-1_31/static_mutex.obj vc7/libboost_regex-vc7-s-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_31/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-s-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-s-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/cregex.obj vc7/libboost_regex-vc7-s-1_31/fileiter.obj vc7/libboost_regex-vc7-s-1_31/instances.obj vc7/libboost_regex-vc7-s-1_31/posix_api.obj vc7/libboost_regex-vc7-s-1_31/regex.obj vc7/libboost_regex-vc7-s-1_31/regex_debug.obj vc7/libboost_regex-vc7-s-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-s-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-s-1_31/static_mutex.obj vc7/libboost_regex-vc7-s-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_31/winstances.obj
+./vc7/libboost_regex-vc7-s-1_31.lib : vc7/libboost_regex-vc7-s-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/cregex.obj vc7/libboost_regex-vc7-s-1_31/fileiter.obj vc7/libboost_regex-vc7-s-1_31/instances.obj vc7/libboost_regex-vc7-s-1_31/posix_api.obj vc7/libboost_regex-vc7-s-1_31/regex.obj vc7/libboost_regex-vc7-s-1_31/regex_debug.obj vc7/libboost_regex-vc7-s-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-s-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-s-1_31/static_mutex.obj vc7/libboost_regex-vc7-s-1_31/usinstances.obj vc7/libboost_regex-vc7-s-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_31/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-s-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-s-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/cregex.obj vc7/libboost_regex-vc7-s-1_31/fileiter.obj vc7/libboost_regex-vc7-s-1_31/instances.obj vc7/libboost_regex-vc7-s-1_31/posix_api.obj vc7/libboost_regex-vc7-s-1_31/regex.obj vc7/libboost_regex-vc7-s-1_31/regex_debug.obj vc7/libboost_regex-vc7-s-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-s-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-s-1_31/static_mutex.obj vc7/libboost_regex-vc7-s-1_31/usinstances.obj vc7/libboost_regex-vc7-s-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-s-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_31/winstances.obj
 
 ########################################################
 #
@@ -162,6 +165,9 @@ vc7/libboost_regex-vc7-mt-s-1_31/regex_traits_defaults.obj: ../src/regex_traits_
 vc7/libboost_regex-vc7-mt-s-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_31/ -Fdvc7/libboost_regex-vc7-mt-s-1_31.pdb ../src/static_mutex.cpp
 
+vc7/libboost_regex-vc7-mt-s-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_31/ -Fdvc7/libboost_regex-vc7-mt-s-1_31.pdb ../src/usinstances.cpp
+
 vc7/libboost_regex-vc7-mt-s-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_31/ -Fdvc7/libboost_regex-vc7-mt-s-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -183,8 +189,8 @@ libboost_regex-vc7-mt-s-1_31_clean :
 	del vc7\libboost_regex-vc7-mt-s-1_31\*.exp
 	del vc7\libboost_regex-vc7-mt-s-1_31\*.pch
 
-./vc7/libboost_regex-vc7-mt-s-1_31.lib : vc7/libboost_regex-vc7-mt-s-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/cregex.obj vc7/libboost_regex-vc7-mt-s-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_31/instances.obj vc7/libboost_regex-vc7-mt-s-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_31/regex.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-s-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-s-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_31/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-s-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-s-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/cregex.obj vc7/libboost_regex-vc7-mt-s-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_31/instances.obj vc7/libboost_regex-vc7-mt-s-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_31/regex.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-s-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-s-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_31/winstances.obj
+./vc7/libboost_regex-vc7-mt-s-1_31.lib : vc7/libboost_regex-vc7-mt-s-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/cregex.obj vc7/libboost_regex-vc7-mt-s-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_31/instances.obj vc7/libboost_regex-vc7-mt-s-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_31/regex.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-s-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-s-1_31/usinstances.obj vc7/libboost_regex-vc7-mt-s-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_31/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-s-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-s-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/cregex.obj vc7/libboost_regex-vc7-mt-s-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_31/instances.obj vc7/libboost_regex-vc7-mt-s-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_31/regex.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-s-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-s-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-s-1_31/usinstances.obj vc7/libboost_regex-vc7-mt-s-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_31/winstances.obj
 
 ########################################################
 #
@@ -224,6 +230,9 @@ vc7/libboost_regex-vc7-sgd-1_31/regex_traits_defaults.obj: ../src/regex_traits_d
 vc7/libboost_regex-vc7-sgd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_31/ -Fdvc7/libboost_regex-vc7-sgd-1_31.pdb ../src/static_mutex.cpp
 
+vc7/libboost_regex-vc7-sgd-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_31/ -Fdvc7/libboost_regex-vc7-sgd-1_31.pdb ../src/usinstances.cpp
+
 vc7/libboost_regex-vc7-sgd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_31/ -Fdvc7/libboost_regex-vc7-sgd-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -245,8 +254,8 @@ libboost_regex-vc7-sgd-1_31_clean :
 	del vc7\libboost_regex-vc7-sgd-1_31\*.exp
 	del vc7\libboost_regex-vc7-sgd-1_31\*.pch
 
-./vc7/libboost_regex-vc7-sgd-1_31.lib : vc7/libboost_regex-vc7-sgd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/cregex.obj vc7/libboost_regex-vc7-sgd-1_31/fileiter.obj vc7/libboost_regex-vc7-sgd-1_31/instances.obj vc7/libboost_regex-vc7-sgd-1_31/posix_api.obj vc7/libboost_regex-vc7-sgd-1_31/regex.obj vc7/libboost_regex-vc7-sgd-1_31/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-sgd-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-sgd-1_31/static_mutex.obj vc7/libboost_regex-vc7-sgd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_31/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-sgd-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-sgd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/cregex.obj vc7/libboost_regex-vc7-sgd-1_31/fileiter.obj vc7/libboost_regex-vc7-sgd-1_31/instances.obj vc7/libboost_regex-vc7-sgd-1_31/posix_api.obj vc7/libboost_regex-vc7-sgd-1_31/regex.obj vc7/libboost_regex-vc7-sgd-1_31/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-sgd-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-sgd-1_31/static_mutex.obj vc7/libboost_regex-vc7-sgd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_31/winstances.obj
+./vc7/libboost_regex-vc7-sgd-1_31.lib : vc7/libboost_regex-vc7-sgd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/cregex.obj vc7/libboost_regex-vc7-sgd-1_31/fileiter.obj vc7/libboost_regex-vc7-sgd-1_31/instances.obj vc7/libboost_regex-vc7-sgd-1_31/posix_api.obj vc7/libboost_regex-vc7-sgd-1_31/regex.obj vc7/libboost_regex-vc7-sgd-1_31/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-sgd-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-sgd-1_31/static_mutex.obj vc7/libboost_regex-vc7-sgd-1_31/usinstances.obj vc7/libboost_regex-vc7-sgd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_31/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-sgd-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-sgd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/cregex.obj vc7/libboost_regex-vc7-sgd-1_31/fileiter.obj vc7/libboost_regex-vc7-sgd-1_31/instances.obj vc7/libboost_regex-vc7-sgd-1_31/posix_api.obj vc7/libboost_regex-vc7-sgd-1_31/regex.obj vc7/libboost_regex-vc7-sgd-1_31/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-sgd-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-sgd-1_31/static_mutex.obj vc7/libboost_regex-vc7-sgd-1_31/usinstances.obj vc7/libboost_regex-vc7-sgd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_31/winstances.obj
 
 ########################################################
 #
@@ -286,6 +295,9 @@ vc7/libboost_regex-vc7-mt-sgd-1_31/regex_traits_defaults.obj: ../src/regex_trait
 vc7/libboost_regex-vc7-mt-sgd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_31/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_31.pdb ../src/static_mutex.cpp
 
+vc7/libboost_regex-vc7-mt-sgd-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_31/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_31.pdb ../src/usinstances.cpp
+
 vc7/libboost_regex-vc7-mt-sgd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_31/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -307,8 +319,8 @@ libboost_regex-vc7-mt-sgd-1_31_clean :
 	del vc7\libboost_regex-vc7-mt-sgd-1_31\*.exp
 	del vc7\libboost_regex-vc7-mt-sgd-1_31\*.pch
 
-./vc7/libboost_regex-vc7-mt-sgd-1_31.lib : vc7/libboost_regex-vc7-mt-sgd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_31/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-sgd-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_31/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-sgd-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-sgd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_31/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-sgd-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_31/winstances.obj
+./vc7/libboost_regex-vc7-mt-sgd-1_31.lib : vc7/libboost_regex-vc7-mt-sgd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_31/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-sgd-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/usinstances.obj vc7/libboost_regex-vc7-mt-sgd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_31/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-sgd-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-sgd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_31/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-sgd-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-sgd-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-sgd-1_31/usinstances.obj vc7/libboost_regex-vc7-mt-sgd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_31/winstances.obj
 
 ########################################################
 #
@@ -348,6 +360,9 @@ vc7/boost_regex-vc7-mt-gd-1_31/regex_traits_defaults.obj: ../src/regex_traits_de
 vc7/boost_regex-vc7-mt-gd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_31/ -Fdvc7/boost_regex-vc7-mt-gd-1_31.pdb ../src/static_mutex.cpp
 
+vc7/boost_regex-vc7-mt-gd-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_31/ -Fdvc7/boost_regex-vc7-mt-gd-1_31.pdb ../src/usinstances.cpp
+
 vc7/boost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_31/ -Fdvc7/boost_regex-vc7-mt-gd-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -369,8 +384,8 @@ boost_regex-vc7-mt-gd-1_31_clean :
 	del vc7\boost_regex-vc7-mt-gd-1_31\*.exp
 	del vc7\boost_regex-vc7-mt-gd-1_31\*.pch
 
-./vc7/boost_regex-vc7-mt-gd-1_31.lib : vc7/boost_regex-vc7-mt-gd-1_31/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/cregex.obj vc7/boost_regex-vc7-mt-gd-1_31/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_31/instances.obj vc7/boost_regex-vc7-mt-gd-1_31/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_31/regex.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-gd-1_31/static_mutex.obj vc7/boost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/wc_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7/boost_regex-vc7-mt-gd-1_31.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-gd-1_31.dll" /implib:"vc7/boost_regex-vc7-mt-gd-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7/boost_regex-vc7-mt-gd-1_31/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/cregex.obj vc7/boost_regex-vc7-mt-gd-1_31/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_31/instances.obj vc7/boost_regex-vc7-mt-gd-1_31/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_31/regex.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-gd-1_31/static_mutex.obj vc7/boost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/wc_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_31/winstances.obj
+./vc7/boost_regex-vc7-mt-gd-1_31.lib : vc7/boost_regex-vc7-mt-gd-1_31/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/cregex.obj vc7/boost_regex-vc7-mt-gd-1_31/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_31/instances.obj vc7/boost_regex-vc7-mt-gd-1_31/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_31/regex.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-gd-1_31/static_mutex.obj vc7/boost_regex-vc7-mt-gd-1_31/usinstances.obj vc7/boost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/wc_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7/boost_regex-vc7-mt-gd-1_31.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-gd-1_31.dll" /implib:"vc7/boost_regex-vc7-mt-gd-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7/boost_regex-vc7-mt-gd-1_31/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/cregex.obj vc7/boost_regex-vc7-mt-gd-1_31/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_31/instances.obj vc7/boost_regex-vc7-mt-gd-1_31/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_31/regex.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-gd-1_31/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-gd-1_31/static_mutex.obj vc7/boost_regex-vc7-mt-gd-1_31/usinstances.obj vc7/boost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/wc_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_31/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_31/winstances.obj
 
 ########################################################
 #
@@ -410,6 +425,9 @@ vc7/boost_regex-vc7-mt-1_31/regex_traits_defaults.obj: ../src/regex_traits_defau
 vc7/boost_regex-vc7-mt-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_31/ -Fdvc7/boost_regex-vc7-mt-1_31.pdb ../src/static_mutex.cpp
 
+vc7/boost_regex-vc7-mt-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_31/ -Fdvc7/boost_regex-vc7-mt-1_31.pdb ../src/usinstances.cpp
+
 vc7/boost_regex-vc7-mt-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/boost_regex-vc7-mt-1_31/ -Fdvc7/boost_regex-vc7-mt-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -431,8 +449,8 @@ boost_regex-vc7-mt-1_31_clean :
 	del vc7\boost_regex-vc7-mt-1_31\*.exp
 	del vc7\boost_regex-vc7-mt-1_31\*.pch
 
-./vc7/boost_regex-vc7-mt-1_31.lib : vc7/boost_regex-vc7-mt-1_31/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/cregex.obj vc7/boost_regex-vc7-mt-1_31/fileiter.obj vc7/boost_regex-vc7-mt-1_31/instances.obj vc7/boost_regex-vc7-mt-1_31/posix_api.obj vc7/boost_regex-vc7-mt-1_31/regex.obj vc7/boost_regex-vc7-mt-1_31/regex_debug.obj vc7/boost_regex-vc7-mt-1_31/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-1_31/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-1_31/static_mutex.obj vc7/boost_regex-vc7-mt-1_31/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/wc_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7/boost_regex-vc7-mt-1_31.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-1_31.dll" /implib:"vc7/boost_regex-vc7-mt-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7/boost_regex-vc7-mt-1_31/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/cregex.obj vc7/boost_regex-vc7-mt-1_31/fileiter.obj vc7/boost_regex-vc7-mt-1_31/instances.obj vc7/boost_regex-vc7-mt-1_31/posix_api.obj vc7/boost_regex-vc7-mt-1_31/regex.obj vc7/boost_regex-vc7-mt-1_31/regex_debug.obj vc7/boost_regex-vc7-mt-1_31/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-1_31/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-1_31/static_mutex.obj vc7/boost_regex-vc7-mt-1_31/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/wc_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_31/winstances.obj
+./vc7/boost_regex-vc7-mt-1_31.lib : vc7/boost_regex-vc7-mt-1_31/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/cregex.obj vc7/boost_regex-vc7-mt-1_31/fileiter.obj vc7/boost_regex-vc7-mt-1_31/instances.obj vc7/boost_regex-vc7-mt-1_31/posix_api.obj vc7/boost_regex-vc7-mt-1_31/regex.obj vc7/boost_regex-vc7-mt-1_31/regex_debug.obj vc7/boost_regex-vc7-mt-1_31/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-1_31/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-1_31/static_mutex.obj vc7/boost_regex-vc7-mt-1_31/usinstances.obj vc7/boost_regex-vc7-mt-1_31/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/wc_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc7/boost_regex-vc7-mt-1_31.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-1_31.dll" /implib:"vc7/boost_regex-vc7-mt-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7/boost_regex-vc7-mt-1_31/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/cregex.obj vc7/boost_regex-vc7-mt-1_31/fileiter.obj vc7/boost_regex-vc7-mt-1_31/instances.obj vc7/boost_regex-vc7-mt-1_31/posix_api.obj vc7/boost_regex-vc7-mt-1_31/regex.obj vc7/boost_regex-vc7-mt-1_31/regex_debug.obj vc7/boost_regex-vc7-mt-1_31/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-1_31/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-1_31/static_mutex.obj vc7/boost_regex-vc7-mt-1_31/usinstances.obj vc7/boost_regex-vc7-mt-1_31/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/wc_regex_traits.obj vc7/boost_regex-vc7-mt-1_31/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_31/winstances.obj
 
 ########################################################
 #
@@ -472,6 +490,9 @@ vc7/libboost_regex-vc7-mt-1_31/regex_traits_defaults.obj: ../src/regex_traits_de
 vc7/libboost_regex-vc7-mt-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_31/ -Fdvc7/libboost_regex-vc7-mt-1_31.pdb ../src/static_mutex.cpp
 
+vc7/libboost_regex-vc7-mt-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_31/ -Fdvc7/libboost_regex-vc7-mt-1_31.pdb ../src/usinstances.cpp
+
 vc7/libboost_regex-vc7-mt-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_31/ -Fdvc7/libboost_regex-vc7-mt-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -493,8 +514,8 @@ libboost_regex-vc7-mt-1_31_clean :
 	del vc7\libboost_regex-vc7-mt-1_31\*.exp
 	del vc7\libboost_regex-vc7-mt-1_31\*.pch
 
-./vc7/libboost_regex-vc7-mt-1_31.lib : vc7/libboost_regex-vc7-mt-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/cregex.obj vc7/libboost_regex-vc7-mt-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-1_31/instances.obj vc7/libboost_regex-vc7-mt-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-1_31/regex.obj vc7/libboost_regex-vc7-mt-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_31/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/cregex.obj vc7/libboost_regex-vc7-mt-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-1_31/instances.obj vc7/libboost_regex-vc7-mt-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-1_31/regex.obj vc7/libboost_regex-vc7-mt-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_31/winstances.obj
+./vc7/libboost_regex-vc7-mt-1_31.lib : vc7/libboost_regex-vc7-mt-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/cregex.obj vc7/libboost_regex-vc7-mt-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-1_31/instances.obj vc7/libboost_regex-vc7-mt-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-1_31/regex.obj vc7/libboost_regex-vc7-mt-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-1_31/usinstances.obj vc7/libboost_regex-vc7-mt-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_31/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/cregex.obj vc7/libboost_regex-vc7-mt-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-1_31/instances.obj vc7/libboost_regex-vc7-mt-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-1_31/regex.obj vc7/libboost_regex-vc7-mt-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-1_31/usinstances.obj vc7/libboost_regex-vc7-mt-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_31/winstances.obj
 
 ########################################################
 #
@@ -534,6 +555,9 @@ vc7/libboost_regex-vc7-mt-gd-1_31/regex_traits_defaults.obj: ../src/regex_traits
 vc7/libboost_regex-vc7-mt-gd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_31/ -Fdvc7/libboost_regex-vc7-mt-gd-1_31.pdb ../src/static_mutex.cpp
 
+vc7/libboost_regex-vc7-mt-gd-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_31/ -Fdvc7/libboost_regex-vc7-mt-gd-1_31.pdb ../src/usinstances.cpp
+
 vc7/libboost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_31/ -Fdvc7/libboost_regex-vc7-mt-gd-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -555,6 +579,6 @@ libboost_regex-vc7-mt-gd-1_31_clean :
 	del vc7\libboost_regex-vc7-mt-gd-1_31\*.exp
 	del vc7\libboost_regex-vc7-mt-gd-1_31\*.pch
 
-./vc7/libboost_regex-vc7-mt-gd-1_31.lib : vc7/libboost_regex-vc7-mt-gd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_31/instances.obj vc7/libboost_regex-vc7-mt-gd-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-gd-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_31/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-gd-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-gd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_31/instances.obj vc7/libboost_regex-vc7-mt-gd-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-gd-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_31/winstances.obj
+./vc7/libboost_regex-vc7-mt-gd-1_31.lib : vc7/libboost_regex-vc7-mt-gd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_31/instances.obj vc7/libboost_regex-vc7-mt-gd-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-gd-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-gd-1_31/usinstances.obj vc7/libboost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_31/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-gd-1_31.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-gd-1_31/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_31/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_31/instances.obj vc7/libboost_regex-vc7-mt-gd-1_31/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-gd-1_31/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-gd-1_31/static_mutex.obj vc7/libboost_regex-vc7-mt-gd-1_31/usinstances.obj vc7/libboost_regex-vc7-mt-gd-1_31/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_31/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_31/winstances.obj
 
diff --git a/build/vc71-stlport.mak b/build/vc71-stlport.mak
index 983d482d..d0e3e743 100644
--- a/build/vc71-stlport.mak
+++ b/build/vc71-stlport.mak
@@ -40,7 +40,7 @@ NULL=nul
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc71-mt-sp-1_31_dir ./vc71-stlport/libboost_regex-vc71-mt-sp-1_31.lib boost_regex-vc71-mt-p-1_31_dir ./vc71-stlport/boost_regex-vc71-mt-p-1_31.lib libboost_regex-vc71-mt-p-1_31_dir ./vc71-stlport/libboost_regex-vc71-mt-p-1_31.lib boost_regex-vc71-mt-gdp-1_31_dir ./vc71-stlport/boost_regex-vc71-mt-gdp-1_31.lib libboost_regex-vc71-mt-sgdp-1_31_dir ./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.lib libboost_regex-vc71-mt-gdp-1_31_dir ./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31.lib
 
@@ -104,6 +104,9 @@ vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_traits_defaults.obj: ../src/re
 vc71-stlport/libboost_regex-vc71-mt-sp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_31.pdb ../src/static_mutex.cpp
 
+vc71-stlport/libboost_regex-vc71-mt-sp-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_31.pdb ../src/usinstances.cpp
+
 vc71-stlport/libboost_regex-vc71-mt-sp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -125,8 +128,8 @@ libboost_regex-vc71-mt-sp-1_31_clean :
 	del vc71-stlport\libboost_regex-vc71-mt-sp-1_31\*.exp
 	del vc71-stlport\libboost_regex-vc71-mt-sp-1_31\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-sp-1_31.lib : vc71-stlport/libboost_regex-vc71-mt-sp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sp-1_31.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-sp-1_31.lib : vc71-stlport/libboost_regex-vc71-mt-sp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sp-1_31.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_31/winstances.obj
 
 ########################################################
 #
@@ -166,6 +169,9 @@ vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_traits_defaults.obj: ../src/regex_
 vc71-stlport/boost_regex-vc71-mt-p-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_31.pdb ../src/static_mutex.cpp
 
+vc71-stlport/boost_regex-vc71-mt-p-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_31.pdb ../src/usinstances.cpp
+
 vc71-stlport/boost_regex-vc71-mt-p-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /I$(STLPORT_PATH)\stlport /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -187,8 +193,8 @@ boost_regex-vc71-mt-p-1_31_clean :
 	del vc71-stlport\boost_regex-vc71-mt-p-1_31\*.exp
 	del vc71-stlport\boost_regex-vc71-mt-p-1_31\*.pch
 
-./vc71-stlport/boost_regex-vc71-mt-p-1_31.lib : vc71-stlport/boost_regex-vc71-mt-p-1_31/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71-stlport/boost_regex-vc71-mt-p-1_31.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-p-1_31.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-p-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71-stlport/boost_regex-vc71-mt-p-1_31/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/winstances.obj
+./vc71-stlport/boost_regex-vc71-mt-p-1_31.lib : vc71-stlport/boost_regex-vc71-mt-p-1_31/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/usinstances.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71-stlport/boost_regex-vc71-mt-p-1_31.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-p-1_31.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-p-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71-stlport/boost_regex-vc71-mt-p-1_31/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/usinstances.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_31/winstances.obj
 
 ########################################################
 #
@@ -228,6 +234,9 @@ vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_traits_defaults.obj: ../src/reg
 vc71-stlport/libboost_regex-vc71-mt-p-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_31.pdb ../src/static_mutex.cpp
 
+vc71-stlport/libboost_regex-vc71-mt-p-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_31.pdb ../src/usinstances.cpp
+
 vc71-stlport/libboost_regex-vc71-mt-p-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -249,8 +258,8 @@ libboost_regex-vc71-mt-p-1_31_clean :
 	del vc71-stlport\libboost_regex-vc71-mt-p-1_31\*.exp
 	del vc71-stlport\libboost_regex-vc71-mt-p-1_31\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-p-1_31.lib : vc71-stlport/libboost_regex-vc71-mt-p-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-p-1_31.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-p-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-p-1_31.lib : vc71-stlport/libboost_regex-vc71-mt-p-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-p-1_31.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-p-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_31/winstances.obj
 
 ########################################################
 #
@@ -290,6 +299,9 @@ vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_traits_defaults.obj: ../src/rege
 vc71-stlport/boost_regex-vc71-mt-gdp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_31.pdb ../src/static_mutex.cpp
 
+vc71-stlport/boost_regex-vc71-mt-gdp-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_31.pdb ../src/usinstances.cpp
+
 vc71-stlport/boost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_DYN_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -311,8 +323,8 @@ boost_regex-vc71-mt-gdp-1_31_clean :
 	del vc71-stlport\boost_regex-vc71-mt-gdp-1_31\*.exp
 	del vc71-stlport\boost_regex-vc71-mt-gdp-1_31\*.pch
 
-./vc71-stlport/boost_regex-vc71-mt-gdp-1_31.lib : vc71-stlport/boost_regex-vc71-mt-gdp-1_31/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71-stlport/boost_regex-vc71-mt-gdp-1_31.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-gdp-1_31.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-gdp-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71-stlport/boost_regex-vc71-mt-gdp-1_31/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/winstances.obj
+./vc71-stlport/boost_regex-vc71-mt-gdp-1_31.lib : vc71-stlport/boost_regex-vc71-mt-gdp-1_31/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/usinstances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71-stlport/boost_regex-vc71-mt-gdp-1_31.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-gdp-1_31.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-gdp-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71-stlport/boost_regex-vc71-mt-gdp-1_31/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/usinstances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_31/winstances.obj
 
 ########################################################
 #
@@ -352,6 +364,9 @@ vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_traits_defaults.obj: ../src/
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.pdb ../src/static_mutex.cpp
 
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.pdb ../src/usinstances.cpp
+
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I..\..\..\ /D__STL_DEBUG /D_STLP_DEBUG /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -373,8 +388,8 @@ libboost_regex-vc71-mt-sgdp-1_31_clean :
 	del vc71-stlport\libboost_regex-vc71-mt-sgdp-1_31\*.exp
 	del vc71-stlport\libboost_regex-vc71-mt-sgdp-1_31\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.lib : vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.lib : vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_31/winstances.obj
 
 ########################################################
 #
@@ -414,6 +429,9 @@ vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_traits_defaults.obj: ../src/r
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_31.pdb ../src/static_mutex.cpp
 
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_31.pdb ../src/usinstances.cpp
+
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I$(STLPORT_PATH)\stlport /I../../../ /DBOOST_REGEX_STATIC_LINK /D__STL_DEBUG /D_STLP_DEBUG /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -435,6 +453,6 @@ libboost_regex-vc71-mt-gdp-1_31_clean :
 	del vc71-stlport\libboost_regex-vc71-mt-gdp-1_31\*.exp
 	del vc71-stlport\libboost_regex-vc71-mt-gdp-1_31\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31.lib : vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-gdp-1_31.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-gdp-1_31.lib : vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-gdp-1_31.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_31/winstances.obj
 
diff --git a/build/vc71.mak b/build/vc71.mak
index 25a06c9f..1cdb339a 100644
--- a/build/vc71.mak
+++ b/build/vc71.mak
@@ -36,7 +36,7 @@ NULL=nul
 !ENDIF
 
 
-ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+ALL_HEADER= ../../../boost/regex/concepts.hpp ../../../boost/regex/config.hpp ../../../boost/regex/mfc.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/static_mutex.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/basic_regex_creator.hpp ../../../boost/regex/v4/basic_regex_parser.hpp ../../../boost/regex/v4/c_regex_traits.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cpp_regex_traits.hpp ../../../boost/regex/v4/cregex.hpp ../../../boost/regex/v4/error_type.hpp ../../../boost/regex/v4/fileiter.hpp ../../../boost/regex/v4/instances.hpp ../../../boost/regex/v4/iterator_category.hpp ../../../boost/regex/v4/iterator_traits.hpp ../../../boost/regex/v4/match_flags.hpp ../../../boost/regex/v4/match_results.hpp ../../../boost/regex/v4/mem_block_cache.hpp ../../../boost/regex/v4/perl_matcher.hpp ../../../boost/regex/v4/perl_matcher_common.hpp ../../../boost/regex/v4/perl_matcher_non_recursive.hpp ../../../boost/regex/v4/perl_matcher_recursive.hpp ../../../boost/regex/v4/primary_transform.hpp ../../../boost/regex/v4/protected_call.hpp ../../../boost/regex/v4/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_cstring.hpp ../../../boost/regex/v4/regex_format.hpp ../../../boost/regex/v4/regex_fwd.hpp ../../../boost/regex/v4/regex_grep.hpp ../../../boost/regex/v4/regex_iterator.hpp ../../../boost/regex/v4/regex_kmp.hpp ../../../boost/regex/v4/regex_match.hpp ../../../boost/regex/v4/regex_merge.hpp ../../../boost/regex/v4/regex_raw_buffer.hpp ../../../boost/regex/v4/regex_replace.hpp ../../../boost/regex/v4/regex_search.hpp ../../../boost/regex/v4/regex_split.hpp ../../../boost/regex/v4/regex_stack.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/regex_traits_defaults.hpp ../../../boost/regex/v4/regex_workaround.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/v4/syntax_type.hpp ../../../boost/regex/v4/w32_regex_traits.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc71-s-1_31_dir ./vc71/libboost_regex-vc71-s-1_31.lib libboost_regex-vc71-mt-s-1_31_dir ./vc71/libboost_regex-vc71-mt-s-1_31.lib libboost_regex-vc71-sgd-1_31_dir ./vc71/libboost_regex-vc71-sgd-1_31.lib libboost_regex-vc71-mt-sgd-1_31_dir ./vc71/libboost_regex-vc71-mt-sgd-1_31.lib boost_regex-vc71-mt-gd-1_31_dir ./vc71/boost_regex-vc71-mt-gd-1_31.lib boost_regex-vc71-mt-1_31_dir ./vc71/boost_regex-vc71-mt-1_31.lib libboost_regex-vc71-mt-1_31_dir ./vc71/libboost_regex-vc71-mt-1_31.lib libboost_regex-vc71-mt-gd-1_31_dir ./vc71/libboost_regex-vc71-mt-gd-1_31.lib
 
@@ -100,6 +100,9 @@ vc71/libboost_regex-vc71-s-1_31/regex_traits_defaults.obj: ../src/regex_traits_d
 vc71/libboost_regex-vc71-s-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_31/ -Fdvc71/libboost_regex-vc71-s-1_31.pdb ../src/static_mutex.cpp
 
+vc71/libboost_regex-vc71-s-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_31/ -Fdvc71/libboost_regex-vc71-s-1_31.pdb ../src/usinstances.cpp
+
 vc71/libboost_regex-vc71-s-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-s-1_31/ -Fdvc71/libboost_regex-vc71-s-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -121,8 +124,8 @@ libboost_regex-vc71-s-1_31_clean :
 	del vc71\libboost_regex-vc71-s-1_31\*.exp
 	del vc71\libboost_regex-vc71-s-1_31\*.pch
 
-./vc71/libboost_regex-vc71-s-1_31.lib : vc71/libboost_regex-vc71-s-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/cregex.obj vc71/libboost_regex-vc71-s-1_31/fileiter.obj vc71/libboost_regex-vc71-s-1_31/instances.obj vc71/libboost_regex-vc71-s-1_31/posix_api.obj vc71/libboost_regex-vc71-s-1_31/regex.obj vc71/libboost_regex-vc71-s-1_31/regex_debug.obj vc71/libboost_regex-vc71-s-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-s-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-s-1_31/static_mutex.obj vc71/libboost_regex-vc71-s-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_31/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-s-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-s-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/cregex.obj vc71/libboost_regex-vc71-s-1_31/fileiter.obj vc71/libboost_regex-vc71-s-1_31/instances.obj vc71/libboost_regex-vc71-s-1_31/posix_api.obj vc71/libboost_regex-vc71-s-1_31/regex.obj vc71/libboost_regex-vc71-s-1_31/regex_debug.obj vc71/libboost_regex-vc71-s-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-s-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-s-1_31/static_mutex.obj vc71/libboost_regex-vc71-s-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_31/winstances.obj
+./vc71/libboost_regex-vc71-s-1_31.lib : vc71/libboost_regex-vc71-s-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/cregex.obj vc71/libboost_regex-vc71-s-1_31/fileiter.obj vc71/libboost_regex-vc71-s-1_31/instances.obj vc71/libboost_regex-vc71-s-1_31/posix_api.obj vc71/libboost_regex-vc71-s-1_31/regex.obj vc71/libboost_regex-vc71-s-1_31/regex_debug.obj vc71/libboost_regex-vc71-s-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-s-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-s-1_31/static_mutex.obj vc71/libboost_regex-vc71-s-1_31/usinstances.obj vc71/libboost_regex-vc71-s-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_31/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-s-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-s-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/cregex.obj vc71/libboost_regex-vc71-s-1_31/fileiter.obj vc71/libboost_regex-vc71-s-1_31/instances.obj vc71/libboost_regex-vc71-s-1_31/posix_api.obj vc71/libboost_regex-vc71-s-1_31/regex.obj vc71/libboost_regex-vc71-s-1_31/regex_debug.obj vc71/libboost_regex-vc71-s-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-s-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-s-1_31/static_mutex.obj vc71/libboost_regex-vc71-s-1_31/usinstances.obj vc71/libboost_regex-vc71-s-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-s-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_31/winstances.obj
 
 ########################################################
 #
@@ -162,6 +165,9 @@ vc71/libboost_regex-vc71-mt-s-1_31/regex_traits_defaults.obj: ../src/regex_trait
 vc71/libboost_regex-vc71-mt-s-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_31/ -Fdvc71/libboost_regex-vc71-mt-s-1_31.pdb ../src/static_mutex.cpp
 
+vc71/libboost_regex-vc71-mt-s-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_31/ -Fdvc71/libboost_regex-vc71-mt-s-1_31.pdb ../src/usinstances.cpp
+
 vc71/libboost_regex-vc71-mt-s-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MT /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /D_MT /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_31/ -Fdvc71/libboost_regex-vc71-mt-s-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -183,8 +189,8 @@ libboost_regex-vc71-mt-s-1_31_clean :
 	del vc71\libboost_regex-vc71-mt-s-1_31\*.exp
 	del vc71\libboost_regex-vc71-mt-s-1_31\*.pch
 
-./vc71/libboost_regex-vc71-mt-s-1_31.lib : vc71/libboost_regex-vc71-mt-s-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/cregex.obj vc71/libboost_regex-vc71-mt-s-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_31/instances.obj vc71/libboost_regex-vc71-mt-s-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_31/regex.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-s-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-s-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_31/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-s-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-s-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/cregex.obj vc71/libboost_regex-vc71-mt-s-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_31/instances.obj vc71/libboost_regex-vc71-mt-s-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_31/regex.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-s-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-s-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_31/winstances.obj
+./vc71/libboost_regex-vc71-mt-s-1_31.lib : vc71/libboost_regex-vc71-mt-s-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/cregex.obj vc71/libboost_regex-vc71-mt-s-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_31/instances.obj vc71/libboost_regex-vc71-mt-s-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_31/regex.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-s-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-s-1_31/usinstances.obj vc71/libboost_regex-vc71-mt-s-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_31/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-s-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-s-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/cregex.obj vc71/libboost_regex-vc71-mt-s-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_31/instances.obj vc71/libboost_regex-vc71-mt-s-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_31/regex.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-s-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-s-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-s-1_31/usinstances.obj vc71/libboost_regex-vc71-mt-s-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_31/winstances.obj
 
 ########################################################
 #
@@ -224,6 +230,9 @@ vc71/libboost_regex-vc71-sgd-1_31/regex_traits_defaults.obj: ../src/regex_traits
 vc71/libboost_regex-vc71-sgd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_31/ -Fdvc71/libboost_regex-vc71-sgd-1_31.pdb ../src/static_mutex.cpp
 
+vc71/libboost_regex-vc71-sgd-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_31/ -Fdvc71/libboost_regex-vc71-sgd-1_31.pdb ../src/usinstances.cpp
+
 vc71/libboost_regex-vc71-sgd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c  $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_31/ -Fdvc71/libboost_regex-vc71-sgd-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -245,8 +254,8 @@ libboost_regex-vc71-sgd-1_31_clean :
 	del vc71\libboost_regex-vc71-sgd-1_31\*.exp
 	del vc71\libboost_regex-vc71-sgd-1_31\*.pch
 
-./vc71/libboost_regex-vc71-sgd-1_31.lib : vc71/libboost_regex-vc71-sgd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/cregex.obj vc71/libboost_regex-vc71-sgd-1_31/fileiter.obj vc71/libboost_regex-vc71-sgd-1_31/instances.obj vc71/libboost_regex-vc71-sgd-1_31/posix_api.obj vc71/libboost_regex-vc71-sgd-1_31/regex.obj vc71/libboost_regex-vc71-sgd-1_31/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-sgd-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-sgd-1_31/static_mutex.obj vc71/libboost_regex-vc71-sgd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_31/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-sgd-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-sgd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/cregex.obj vc71/libboost_regex-vc71-sgd-1_31/fileiter.obj vc71/libboost_regex-vc71-sgd-1_31/instances.obj vc71/libboost_regex-vc71-sgd-1_31/posix_api.obj vc71/libboost_regex-vc71-sgd-1_31/regex.obj vc71/libboost_regex-vc71-sgd-1_31/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-sgd-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-sgd-1_31/static_mutex.obj vc71/libboost_regex-vc71-sgd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_31/winstances.obj
+./vc71/libboost_regex-vc71-sgd-1_31.lib : vc71/libboost_regex-vc71-sgd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/cregex.obj vc71/libboost_regex-vc71-sgd-1_31/fileiter.obj vc71/libboost_regex-vc71-sgd-1_31/instances.obj vc71/libboost_regex-vc71-sgd-1_31/posix_api.obj vc71/libboost_regex-vc71-sgd-1_31/regex.obj vc71/libboost_regex-vc71-sgd-1_31/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-sgd-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-sgd-1_31/static_mutex.obj vc71/libboost_regex-vc71-sgd-1_31/usinstances.obj vc71/libboost_regex-vc71-sgd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_31/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-sgd-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-sgd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/cregex.obj vc71/libboost_regex-vc71-sgd-1_31/fileiter.obj vc71/libboost_regex-vc71-sgd-1_31/instances.obj vc71/libboost_regex-vc71-sgd-1_31/posix_api.obj vc71/libboost_regex-vc71-sgd-1_31/regex.obj vc71/libboost_regex-vc71-sgd-1_31/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-sgd-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-sgd-1_31/static_mutex.obj vc71/libboost_regex-vc71-sgd-1_31/usinstances.obj vc71/libboost_regex-vc71-sgd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_31/winstances.obj
 
 ########################################################
 #
@@ -286,6 +295,9 @@ vc71/libboost_regex-vc71-mt-sgd-1_31/regex_traits_defaults.obj: ../src/regex_tra
 vc71/libboost_regex-vc71-mt-sgd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_31/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_31.pdb ../src/static_mutex.cpp
 
+vc71/libboost_regex-vc71-mt-sgd-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_31/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_31.pdb ../src/usinstances.cpp
+
 vc71/libboost_regex-vc71-mt-sgd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MTd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_MT /D_DEBUG /D_MBCS /D_LIB /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_31/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -307,8 +319,8 @@ libboost_regex-vc71-mt-sgd-1_31_clean :
 	del vc71\libboost_regex-vc71-mt-sgd-1_31\*.exp
 	del vc71\libboost_regex-vc71-mt-sgd-1_31\*.pch
 
-./vc71/libboost_regex-vc71-mt-sgd-1_31.lib : vc71/libboost_regex-vc71-mt-sgd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_31/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-sgd-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_31/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-sgd-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-sgd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_31/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-sgd-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_31/winstances.obj
+./vc71/libboost_regex-vc71-mt-sgd-1_31.lib : vc71/libboost_regex-vc71-mt-sgd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_31/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-sgd-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/usinstances.obj vc71/libboost_regex-vc71-mt-sgd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_31/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-sgd-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-sgd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_31/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-sgd-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-sgd-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-sgd-1_31/usinstances.obj vc71/libboost_regex-vc71-mt-sgd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_31/winstances.obj
 
 ########################################################
 #
@@ -348,6 +360,9 @@ vc71/boost_regex-vc71-mt-gd-1_31/regex_traits_defaults.obj: ../src/regex_traits_
 vc71/boost_regex-vc71-mt-gd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_31/ -Fdvc71/boost_regex-vc71-mt-gd-1_31.pdb ../src/static_mutex.cpp
 
+vc71/boost_regex-vc71-mt-gd-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_31/ -Fdvc71/boost_regex-vc71-mt-gd-1_31.pdb ../src/usinstances.cpp
+
 vc71/boost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /D_DEBUG /DBOOST_REGEX_DYN_LINK /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_31/ -Fdvc71/boost_regex-vc71-mt-gd-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -369,8 +384,8 @@ boost_regex-vc71-mt-gd-1_31_clean :
 	del vc71\boost_regex-vc71-mt-gd-1_31\*.exp
 	del vc71\boost_regex-vc71-mt-gd-1_31\*.pch
 
-./vc71/boost_regex-vc71-mt-gd-1_31.lib : vc71/boost_regex-vc71-mt-gd-1_31/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/cregex.obj vc71/boost_regex-vc71-mt-gd-1_31/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_31/instances.obj vc71/boost_regex-vc71-mt-gd-1_31/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_31/regex.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-gd-1_31/static_mutex.obj vc71/boost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/wc_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71/boost_regex-vc71-mt-gd-1_31.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-gd-1_31.dll" /implib:"vc71/boost_regex-vc71-mt-gd-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71/boost_regex-vc71-mt-gd-1_31/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/cregex.obj vc71/boost_regex-vc71-mt-gd-1_31/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_31/instances.obj vc71/boost_regex-vc71-mt-gd-1_31/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_31/regex.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-gd-1_31/static_mutex.obj vc71/boost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/wc_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_31/winstances.obj
+./vc71/boost_regex-vc71-mt-gd-1_31.lib : vc71/boost_regex-vc71-mt-gd-1_31/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/cregex.obj vc71/boost_regex-vc71-mt-gd-1_31/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_31/instances.obj vc71/boost_regex-vc71-mt-gd-1_31/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_31/regex.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-gd-1_31/static_mutex.obj vc71/boost_regex-vc71-mt-gd-1_31/usinstances.obj vc71/boost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/wc_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71/boost_regex-vc71-mt-gd-1_31.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-gd-1_31.dll" /implib:"vc71/boost_regex-vc71-mt-gd-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71/boost_regex-vc71-mt-gd-1_31/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/cregex.obj vc71/boost_regex-vc71-mt-gd-1_31/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_31/instances.obj vc71/boost_regex-vc71-mt-gd-1_31/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_31/regex.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-gd-1_31/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-gd-1_31/static_mutex.obj vc71/boost_regex-vc71-mt-gd-1_31/usinstances.obj vc71/boost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/wc_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_31/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_31/winstances.obj
 
 ########################################################
 #
@@ -410,6 +425,9 @@ vc71/boost_regex-vc71-mt-1_31/regex_traits_defaults.obj: ../src/regex_traits_def
 vc71/boost_regex-vc71-mt-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_31/ -Fdvc71/boost_regex-vc71-mt-1_31.pdb ../src/static_mutex.cpp
 
+vc71/boost_regex-vc71-mt-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_31/ -Fdvc71/boost_regex-vc71-mt-1_31.pdb ../src/usinstances.cpp
+
 vc71/boost_regex-vc71-mt-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_DYN_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/boost_regex-vc71-mt-1_31/ -Fdvc71/boost_regex-vc71-mt-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -431,8 +449,8 @@ boost_regex-vc71-mt-1_31_clean :
 	del vc71\boost_regex-vc71-mt-1_31\*.exp
 	del vc71\boost_regex-vc71-mt-1_31\*.pch
 
-./vc71/boost_regex-vc71-mt-1_31.lib : vc71/boost_regex-vc71-mt-1_31/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/cregex.obj vc71/boost_regex-vc71-mt-1_31/fileiter.obj vc71/boost_regex-vc71-mt-1_31/instances.obj vc71/boost_regex-vc71-mt-1_31/posix_api.obj vc71/boost_regex-vc71-mt-1_31/regex.obj vc71/boost_regex-vc71-mt-1_31/regex_debug.obj vc71/boost_regex-vc71-mt-1_31/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-1_31/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-1_31/static_mutex.obj vc71/boost_regex-vc71-mt-1_31/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/wc_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_31/winstances.obj
-	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71/boost_regex-vc71-mt-1_31.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-1_31.dll" /implib:"vc71/boost_regex-vc71-mt-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71/boost_regex-vc71-mt-1_31/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/cregex.obj vc71/boost_regex-vc71-mt-1_31/fileiter.obj vc71/boost_regex-vc71-mt-1_31/instances.obj vc71/boost_regex-vc71-mt-1_31/posix_api.obj vc71/boost_regex-vc71-mt-1_31/regex.obj vc71/boost_regex-vc71-mt-1_31/regex_debug.obj vc71/boost_regex-vc71-mt-1_31/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-1_31/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-1_31/static_mutex.obj vc71/boost_regex-vc71-mt-1_31/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/wc_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_31/winstances.obj
+./vc71/boost_regex-vc71-mt-1_31.lib : vc71/boost_regex-vc71-mt-1_31/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/cregex.obj vc71/boost_regex-vc71-mt-1_31/fileiter.obj vc71/boost_regex-vc71-mt-1_31/instances.obj vc71/boost_regex-vc71-mt-1_31/posix_api.obj vc71/boost_regex-vc71-mt-1_31/regex.obj vc71/boost_regex-vc71-mt-1_31/regex_debug.obj vc71/boost_regex-vc71-mt-1_31/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-1_31/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-1_31/static_mutex.obj vc71/boost_regex-vc71-mt-1_31/usinstances.obj vc71/boost_regex-vc71-mt-1_31/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/wc_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_31/winstances.obj
+	link kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"vc71/boost_regex-vc71-mt-1_31.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-1_31.dll" /implib:"vc71/boost_regex-vc71-mt-1_31.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71/boost_regex-vc71-mt-1_31/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/cregex.obj vc71/boost_regex-vc71-mt-1_31/fileiter.obj vc71/boost_regex-vc71-mt-1_31/instances.obj vc71/boost_regex-vc71-mt-1_31/posix_api.obj vc71/boost_regex-vc71-mt-1_31/regex.obj vc71/boost_regex-vc71-mt-1_31/regex_debug.obj vc71/boost_regex-vc71-mt-1_31/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-1_31/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-1_31/static_mutex.obj vc71/boost_regex-vc71-mt-1_31/usinstances.obj vc71/boost_regex-vc71-mt-1_31/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/wc_regex_traits.obj vc71/boost_regex-vc71-mt-1_31/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_31/winstances.obj
 
 ########################################################
 #
@@ -472,6 +490,9 @@ vc71/libboost_regex-vc71-mt-1_31/regex_traits_defaults.obj: ../src/regex_traits_
 vc71/libboost_regex-vc71-mt-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_31/ -Fdvc71/libboost_regex-vc71-mt-1_31.pdb ../src/static_mutex.cpp
 
+vc71/libboost_regex-vc71-mt-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_31/ -Fdvc71/libboost_regex-vc71-mt-1_31.pdb ../src/usinstances.cpp
+
 vc71/libboost_regex-vc71-mt-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MD /W3 /GX /O2 /GB /GF /Gy /I../../../ /DBOOST_REGEX_STATIC_LINK /DNDEBUG /DWIN32 /D_WINDOWS /D_MBCS /D_USRDLL /FD /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_31/ -Fdvc71/libboost_regex-vc71-mt-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -493,8 +514,8 @@ libboost_regex-vc71-mt-1_31_clean :
 	del vc71\libboost_regex-vc71-mt-1_31\*.exp
 	del vc71\libboost_regex-vc71-mt-1_31\*.pch
 
-./vc71/libboost_regex-vc71-mt-1_31.lib : vc71/libboost_regex-vc71-mt-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/cregex.obj vc71/libboost_regex-vc71-mt-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-1_31/instances.obj vc71/libboost_regex-vc71-mt-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-1_31/regex.obj vc71/libboost_regex-vc71-mt-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_31/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/cregex.obj vc71/libboost_regex-vc71-mt-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-1_31/instances.obj vc71/libboost_regex-vc71-mt-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-1_31/regex.obj vc71/libboost_regex-vc71-mt-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_31/winstances.obj
+./vc71/libboost_regex-vc71-mt-1_31.lib : vc71/libboost_regex-vc71-mt-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/cregex.obj vc71/libboost_regex-vc71-mt-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-1_31/instances.obj vc71/libboost_regex-vc71-mt-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-1_31/regex.obj vc71/libboost_regex-vc71-mt-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-1_31/usinstances.obj vc71/libboost_regex-vc71-mt-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_31/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/cregex.obj vc71/libboost_regex-vc71-mt-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-1_31/instances.obj vc71/libboost_regex-vc71-mt-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-1_31/regex.obj vc71/libboost_regex-vc71-mt-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-1_31/usinstances.obj vc71/libboost_regex-vc71-mt-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_31/winstances.obj
 
 ########################################################
 #
@@ -534,6 +555,9 @@ vc71/libboost_regex-vc71-mt-gd-1_31/regex_traits_defaults.obj: ../src/regex_trai
 vc71/libboost_regex-vc71-mt-gd-1_31/static_mutex.obj: ../src/static_mutex.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_31/ -Fdvc71/libboost_regex-vc71-mt-gd-1_31.pdb ../src/static_mutex.cpp
 
+vc71/libboost_regex-vc71-mt-gd-1_31/usinstances.obj: ../src/usinstances.cpp $(ALL_HEADER)
+	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_31/ -Fdvc71/libboost_regex-vc71-mt-gd-1_31.pdb ../src/usinstances.cpp
+
 vc71/libboost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	cl $(INCLUDES) /nologo /MDd /W3 /Gm /GX /Zi /Od /I../../../ /DBOOST_REGEX_STATIC_LINK /D_DEBUG /DWIN32 /D_WINDOWS /D_MBCS /DUSRDLL /FD /GX /RTC1 /Zc:wchar_t /c $(CXXFLAGS) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_31/ -Fdvc71/libboost_regex-vc71-mt-gd-1_31.pdb ../src/w32_regex_traits.cpp
 
@@ -555,6 +579,6 @@ libboost_regex-vc71-mt-gd-1_31_clean :
 	del vc71\libboost_regex-vc71-mt-gd-1_31\*.exp
 	del vc71\libboost_regex-vc71-mt-gd-1_31\*.pch
 
-./vc71/libboost_regex-vc71-mt-gd-1_31.lib : vc71/libboost_regex-vc71-mt-gd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_31/instances.obj vc71/libboost_regex-vc71-mt-gd-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-gd-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_31/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-gd-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-gd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_31/instances.obj vc71/libboost_regex-vc71-mt-gd-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-gd-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_31/winstances.obj
+./vc71/libboost_regex-vc71-mt-gd-1_31.lib : vc71/libboost_regex-vc71-mt-gd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_31/instances.obj vc71/libboost_regex-vc71-mt-gd-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-gd-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-gd-1_31/usinstances.obj vc71/libboost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_31/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-gd-1_31.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-gd-1_31/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_31/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_31/instances.obj vc71/libboost_regex-vc71-mt-gd-1_31/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-gd-1_31/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-gd-1_31/static_mutex.obj vc71/libboost_regex-vc71-mt-gd-1_31/usinstances.obj vc71/libboost_regex-vc71-mt-gd-1_31/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_31/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_31/winstances.obj
 
diff --git a/doc/Attic/basic_regex.html b/doc/Attic/basic_regex.html
index 0a35289f..ea2276c7 100644
--- a/doc/Attic/basic_regex.html
+++ b/doc/Attic/basic_regex.html
@@ -143,33 +143,33 @@ class basic_regex {
    void <A href="#m13">swap</A>(basic_regex&amp;) throw();
 };
 
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o4">operator</A> == (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o5">operator</A> != (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o7">operator</A> &lt; (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o8">operator</A> &lt;= (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o9">operator</A> &gt;= (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o10">operator</A> &gt; (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool <A href="#o4">operator</A> == (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool <A href="#o5">operator</A> != (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool <A href="#o7">operator</A> &lt; (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                 const basic_regex&lt;charT, traits&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool <A href="#o8">operator</A> &lt;= (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool <A href="#o9">operator</A> &gt;= (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool <A href="#o10">operator</A> &gt; (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                 const basic_regex&lt;charT, traits&gt;&amp; rhs);
 
-template &lt;class charT, class io_traits, class re_traits, class Allocator&gt;
+template &lt;class charT, class io_traits, class re_traits&gt;
 basic_ostream&lt;charT, io_traits&gt;&amp;
    <A href="#o11">operator</A> &lt;&lt; (basic_ostream&lt;charT, io_traits&gt;&amp; os,
-                const basic_regex&lt;charT, re_traits, Allocator&gt;&amp; e);
+                const basic_regex&lt;charT, re_traits&gt;&amp; e);
 
-template &lt;class charT, class traits, class Allocator&gt;
-void <A href="#o12">swap</A>(basic_regex&lt;charT, traits, Allocator&gt;&amp; e1,
-          basic_regex&lt;charT, traits, Allocator&gt;&amp; e2);
+template &lt;class charT, class traits&gt;
+void <A href="#o12">swap</A>(basic_regex&lt;charT, traits&gt;&amp; e1,
+          basic_regex&lt;charT, traits&gt;&amp; e2);
 
 typedef basic_regex&lt;char&gt; regex;
 typedef basic_regex&lt;wchar_t&gt; wregex;
@@ -831,62 +831,62 @@ void swap(basic_regex&amp; e) throw();
          please note that these are likely to be removed from the standard library 
          proposal, so use with care if you are writing portable code.</P>
       <pre><A name=o4></A>
-template &lt;class charT, class traits, class Allocator&gt;
-bool operator == (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool operator == (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
 </pre>
       <p><b>Effects:</b> Returns <code>lhs.compare(rhs) == 0</code>.</p>
       <pre><A name=o5></A>
-template &lt;class charT, class traits, class Allocator&gt;
-bool operator != (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool operator != (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
 </pre>
       <p><b>Effects:</b> Returns <code>lhs.compare(rhs) != 0</code>.</p>
       <pre><A name=o7></A>
-template &lt;class charT, class traits, class Allocator&gt;
-bool operator &lt; (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool operator &lt; (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                 const basic_regex&lt;charT, traits&gt;&amp; rhs);
 </pre>
       <p><b>Effects:</b> Returns <code>lhs.compare(rhs) &lt; 0</code>.</p>
       <pre><A name=o8></A>
-template &lt;class charT, class traits, class Allocator&gt;
-bool operator &lt;= (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool operator &lt;= (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
 </pre>
       <p><b>Effects:</b> Returns <code>lhs.compare(rhs) &lt;= 0</code>.</p>
       <pre><A name=o9></A>
-template &lt;class charT, class traits, class Allocator&gt;
-bool operator &gt;= (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool operator &gt;= (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
 </pre>
       <p><b>Effects:</b> Returns <code>lhs.compare(rhs) &gt;= 0</code>.</p>
       <pre><A name=o10></A>
-template &lt;class charT, class traits, class Allocator&gt;
-bool operator &gt; (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool operator &gt; (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                 const basic_regex&lt;charT, traits&gt;&amp; rhs);
 </pre>
       <p><b>Effects:</b> Returns <code>lhs.compare(rhs) &gt; 0</code>.</p>
       <h5>basic_regex inserter.</h5>
       <P>The basic_regex stream inserter is provided on an experimental basis, and 
          outputs the textual representation of the expression to the stream:</P>
       <pre><A name=o11></A>
-template &lt;class charT, class io_traits, class re_traits, class Allocator&gt;
+template &lt;class charT, class io_traits, class re_traits&gt;
 basic_ostream&lt;charT, io_traits&gt;&amp;
    operator &lt;&lt; (basic_ostream&lt;charT, io_traits&gt;&amp; os
-                const basic_regex&lt;charT, re_traits, Allocator&gt;&amp; e);
+                const basic_regex&lt;charT, re_traits&gt;&amp; e);
 </pre>
       <p><b>Effects:</b> Returns (os &lt;&lt; e.str()).</p>
       <h5>basic_regex non-member swap</h5>
       <pre><A name=o12></A>
-template &lt;class charT, class traits, class Allocator&gt;
-void swap(basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-          basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+void swap(basic_regex&lt;charT, traits&gt;&amp; lhs,
+          basic_regex&lt;charT, traits&gt;&amp; rhs);
 </pre>
       <p><b>Effects:</b> calls <code>lhs.swap(rhs)</code>.</p>
       <hr>
-      <p>Revised 
+      <p>Revised 7 Aug 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24&nbsp;June 2004&nbsp; 
+         2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
             <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
diff --git a/doc/Attic/introduction.html b/doc/Attic/introduction.html
index 9b5441c3..bd13bd31 100644
--- a/doc/Attic/introduction.html
+++ b/doc/Attic/introduction.html
@@ -42,8 +42,7 @@
       <pre><B>namespace </B>boost{
 
 <B>template</B> &lt;<B>class</B> charT, 
-<B>          class</B> traits = regex_traits&lt;charT&gt;, 
-          <B>class</B> Allocator = std::allocator&lt;charT&gt; &gt;
+<B>          class</B> traits = regex_traits&lt;charT&gt; &gt;
 <B>class</B> basic_regex;
 
 <B>typedef</B> basic_regex&lt;<B>char</B>&gt; regex;
diff --git a/doc/basic_regex.html b/doc/basic_regex.html
index 0a35289f..ea2276c7 100644
--- a/doc/basic_regex.html
+++ b/doc/basic_regex.html
@@ -143,33 +143,33 @@ class basic_regex {
    void <A href="#m13">swap</A>(basic_regex&amp;) throw();
 };
 
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o4">operator</A> == (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o5">operator</A> != (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o7">operator</A> &lt; (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o8">operator</A> &lt;= (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o9">operator</A> &gt;= (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o10">operator</A> &gt; (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool <A href="#o4">operator</A> == (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool <A href="#o5">operator</A> != (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool <A href="#o7">operator</A> &lt; (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                 const basic_regex&lt;charT, traits&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool <A href="#o8">operator</A> &lt;= (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool <A href="#o9">operator</A> &gt;= (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool <A href="#o10">operator</A> &gt; (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                 const basic_regex&lt;charT, traits&gt;&amp; rhs);
 
-template &lt;class charT, class io_traits, class re_traits, class Allocator&gt;
+template &lt;class charT, class io_traits, class re_traits&gt;
 basic_ostream&lt;charT, io_traits&gt;&amp;
    <A href="#o11">operator</A> &lt;&lt; (basic_ostream&lt;charT, io_traits&gt;&amp; os,
-                const basic_regex&lt;charT, re_traits, Allocator&gt;&amp; e);
+                const basic_regex&lt;charT, re_traits&gt;&amp; e);
 
-template &lt;class charT, class traits, class Allocator&gt;
-void <A href="#o12">swap</A>(basic_regex&lt;charT, traits, Allocator&gt;&amp; e1,
-          basic_regex&lt;charT, traits, Allocator&gt;&amp; e2);
+template &lt;class charT, class traits&gt;
+void <A href="#o12">swap</A>(basic_regex&lt;charT, traits&gt;&amp; e1,
+          basic_regex&lt;charT, traits&gt;&amp; e2);
 
 typedef basic_regex&lt;char&gt; regex;
 typedef basic_regex&lt;wchar_t&gt; wregex;
@@ -831,62 +831,62 @@ void swap(basic_regex&amp; e) throw();
          please note that these are likely to be removed from the standard library 
          proposal, so use with care if you are writing portable code.</P>
       <pre><A name=o4></A>
-template &lt;class charT, class traits, class Allocator&gt;
-bool operator == (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool operator == (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
 </pre>
       <p><b>Effects:</b> Returns <code>lhs.compare(rhs) == 0</code>.</p>
       <pre><A name=o5></A>
-template &lt;class charT, class traits, class Allocator&gt;
-bool operator != (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool operator != (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
 </pre>
       <p><b>Effects:</b> Returns <code>lhs.compare(rhs) != 0</code>.</p>
       <pre><A name=o7></A>
-template &lt;class charT, class traits, class Allocator&gt;
-bool operator &lt; (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool operator &lt; (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                 const basic_regex&lt;charT, traits&gt;&amp; rhs);
 </pre>
       <p><b>Effects:</b> Returns <code>lhs.compare(rhs) &lt; 0</code>.</p>
       <pre><A name=o8></A>
-template &lt;class charT, class traits, class Allocator&gt;
-bool operator &lt;= (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool operator &lt;= (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
 </pre>
       <p><b>Effects:</b> Returns <code>lhs.compare(rhs) &lt;= 0</code>.</p>
       <pre><A name=o9></A>
-template &lt;class charT, class traits, class Allocator&gt;
-bool operator &gt;= (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool operator &gt;= (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                  const basic_regex&lt;charT, traits&gt;&amp; rhs);
 </pre>
       <p><b>Effects:</b> Returns <code>lhs.compare(rhs) &gt;= 0</code>.</p>
       <pre><A name=o10></A>
-template &lt;class charT, class traits, class Allocator&gt;
-bool operator &gt; (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+bool operator &gt; (const basic_regex&lt;charT, traits&gt;&amp; lhs,
+                 const basic_regex&lt;charT, traits&gt;&amp; rhs);
 </pre>
       <p><b>Effects:</b> Returns <code>lhs.compare(rhs) &gt; 0</code>.</p>
       <h5>basic_regex inserter.</h5>
       <P>The basic_regex stream inserter is provided on an experimental basis, and 
          outputs the textual representation of the expression to the stream:</P>
       <pre><A name=o11></A>
-template &lt;class charT, class io_traits, class re_traits, class Allocator&gt;
+template &lt;class charT, class io_traits, class re_traits&gt;
 basic_ostream&lt;charT, io_traits&gt;&amp;
    operator &lt;&lt; (basic_ostream&lt;charT, io_traits&gt;&amp; os
-                const basic_regex&lt;charT, re_traits, Allocator&gt;&amp; e);
+                const basic_regex&lt;charT, re_traits&gt;&amp; e);
 </pre>
       <p><b>Effects:</b> Returns (os &lt;&lt; e.str()).</p>
       <h5>basic_regex non-member swap</h5>
       <pre><A name=o12></A>
-template &lt;class charT, class traits, class Allocator&gt;
-void swap(basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-          basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+template &lt;class charT, class traits&gt;
+void swap(basic_regex&lt;charT, traits&gt;&amp; lhs,
+          basic_regex&lt;charT, traits&gt;&amp; rhs);
 </pre>
       <p><b>Effects:</b> calls <code>lhs.swap(rhs)</code>.</p>
       <hr>
-      <p>Revised 
+      <p>Revised 7 Aug 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24&nbsp;June 2004&nbsp; 
+         2004&nbsp; 
          <!--webbot bot="Timestamp" endspan i-checksum="39359" --></p>
       <p><i>© Copyright John Maddock&nbsp;1998- 
             <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
diff --git a/doc/introduction.html b/doc/introduction.html
index 9b5441c3..bd13bd31 100644
--- a/doc/introduction.html
+++ b/doc/introduction.html
@@ -42,8 +42,7 @@
       <pre><B>namespace </B>boost{
 
 <B>template</B> &lt;<B>class</B> charT, 
-<B>          class</B> traits = regex_traits&lt;charT&gt;, 
-          <B>class</B> Allocator = std::allocator&lt;charT&gt; &gt;
+<B>          class</B> traits = regex_traits&lt;charT&gt; &gt;
 <B>class</B> basic_regex;
 
 <B>typedef</B> basic_regex&lt;<B>char</B>&gt; regex;
diff --git a/include/boost/regex/config.hpp b/include/boost/regex/config.hpp
index 0f91e971..400dd739 100644
--- a/include/boost/regex/config.hpp
+++ b/include/boost/regex/config.hpp
@@ -69,6 +69,16 @@
 #define UNICODE
 #endif
 
+//
+// Fix for gcc prior to 3.4: std::ctype<wchar_t> doesn't allow
+// masks to be combined, for example:
+// std::use_facet<std::ctype<wchar_t> >.is(std::ctype_base::lower|std::ctype_base::upper, L'a');
+// returns *false*.
+//
+#ifdef __GLIBCPP__
+#  define BOOST_REGEX_BUGGY_CTYPE_FACET
+#endif
+
 //
 // If there isn't good enough wide character support then there will
 // be no wide character regular expressions:
@@ -127,13 +137,26 @@
  *
  ****************************************************************************/
 
-#ifdef __cplusplus
-#if defined(BOOST_MSVC) && (BOOST_MSVC >= 1300) && !defined(BOOST_REGEX_V3) && !(defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION))
-#  define BOOST_REGEX_HAS_SHORT_WCHAR_T
-namespace boost{ typedef __wchar_t regex_wchar_type; }
-#else
-namespace boost{ typedef wchar_t regex_wchar_type; }
-#endif
+//
+// define BOOST_REGEX_HAS_OTHER_WCHAR_T when wchar_t is a native type, but the users
+// code may be built with wchar_t as unsigned short: basically when we're building
+// with MSVC and the /Zc:wchar_t option we place some extra unsigned short versions
+// of the non-inline functions in the library, so that users can still link to the lib,
+// irrespective of whether their own code is built with /Zc:wchar_t.
+//
+#if defined(__cplusplus) && (defined(BOOST_MSVC) || defined(__ICL)) && !defined(BOOST_NO_INTRINSIC_WCHAR_T) && defined(BOOST_WINDOWS)
+#  define BOOST_REGEX_HAS_OTHER_WCHAR_T
+#  ifdef BOOST_MSVC
+#     pragma warning(push)
+#     pragma warning(disable : 4251 4231 4660)
+#  endif
+#  ifdef _DLL
+#     include <string>
+      extern template class __declspec(dllimport) std::basic_string<unsigned short>;
+#  endif
+#  ifdef BOOST_MSVC
+#     pragma warning(pop)
+#  endif
 #endif
 
 
diff --git a/include/boost/regex/config/borland.hpp b/include/boost/regex/config/borland.hpp
index 372aa0c4..f0c795d9 100644
--- a/include/boost/regex/config/borland.hpp
+++ b/include/boost/regex/config/borland.hpp
@@ -58,6 +58,15 @@
 #     endif
 #  endif
 
+#if __BORLANDC__ < 0x600
+//
+// string workarounds:
+//
+#include <cstring>
+#undef strcmp
+#undef strcpy
+#endif
+
 #endif
 
 
diff --git a/include/boost/regex/config/cstring.hpp b/include/boost/regex/config/cstring.hpp
deleted file mode 100644
index 3e09fc34..00000000
--- a/include/boost/regex/config/cstring.hpp
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr John Maddock
- *
- * Use, modification and distribution are subject to the 
- * Boost Software License, Version 1.0. (See accompanying file 
- * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- *
- */
- 
- /*
-  *   LOCATION:    see http://www.boost.org for most recent version.
-  *   FILE         boost/regex/config/cstring.hpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: regex narrow character string fixes.
-  */
-
-#ifndef BOOST_REGEX_CONFIG_CSTRING_HPP
-#define BOOST_REGEX_CONFIG_CSTRING_HPP
-
-#include <cstring>
-#include <cctype>
-#ifndef __sgi
-#ifdef __KCC
-#include <ios>
-#endif
-#include <boost/config.hpp>
-
-namespace std{
-
-#ifdef __BORLANDC__
-#pragma option push -w-8008 -w-8066 -w-8004
-#endif
-
-#ifdef BOOST_NO_STDC_NAMESPACE
-
-// Any function that is a macro is converted into an inline function:
-#ifdef memcmp
-inline int boost_memcmp(const void * p1, const void * p2, size_t s)
-{ return memcmp(p1, p2, s); }
-#undef memcmp
-inline int memcmp(const void * p1, const void * p2, size_t s)
-{ return boost_memcmp(p1, p2, s); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::memcmp;
-#endif
-
-#ifdef memcpy
-inline void *boost_memcpy(void * p1, const void *p2, size_t s)
-{ return memcpy(p1, p2, s); }
-#undef memcpy
-inline void *memcpy(void * p1, const void *p2, size_t s)
-{ return boost_memcpy(p1, p2, s); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::memcpy;
-#endif
-
-#ifdef memmove
-inline void *(memmove)(void *, const void *, size_t)
-{ return memmove(p1,p2,s); }
-#undef memmove
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::memmove;
-#endif
-
-#ifdef memset
-inline void *(boost_memset)(void *p, int a, size_t b)
-{ return memset(p,a,b); }
-#undef memset
-inline void *(memset)(void *p, int a, size_t b)
-{ return boost_memset(p,a,b); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::memset;
-#endif
-
-#ifdef strcat
-inline char *(boost_strcat)(char *p1, const char *p2)
-{ return strcat(p1,p2); }
-#undef strcat
-inline char *(strcat)(char *p1, const char *p2)
-{ return boost_strcat(p1,p2); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::strcat;
-#endif
-
-#ifdef strcmp
-inline int (boost_strcmp)(const char *p1, const char *p2)
-{ return strcmp(p1,p2); }
-#undef strcmp
-inline int (strcmp)(const char *p1, const char *p2)
-{ return boost_strcmp(p1,p2); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::strcmp;
-#endif
-
-#ifdef strcoll
-inline int (boost_strcoll) (const char *p1, const char *p2)
-{ return strcoll(p1,p2); }
-#undef strcoll
-inline int (strcoll) (const char *p1, const char *p2)
-{ return boost_strcoll(p1,p2); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::strcoll;
-#endif
-
-#ifdef strcpy
-inline char *(boost_strcpy)(char *p1, const char *p2)
-{ return strcpy(p1,p2); }
-#undef strcpy
-inline char *(strcpy)(char *p1, const char *p2)
-{ return boost_strcpy(p1,p2); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::strcpy;
-#endif
-
-#ifdef strlen
-inline size_t (boost_strlen)(const char *p)
-{ return strlen(p); }
-#undef strlen
-inline size_t (strlen)(const char *p)
-{ return boost_strlen(p); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::strlen;
-#endif
-
-#ifdef strxfrm
-inline size_t (boost_strxfrm)(char *p1, const char *p2, size_t s)
-{ return strxfrm(p1,p2,s); }
-#undef strxfrm
-inline size_t (strxfrm)(char *p1, const char *p2, size_t s)
-{ return boost_strxfrm(p1,p2,s); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::strxfrm;
-#endif
-
-#ifdef isalnum
-inline int (boost_isalnum)(int i)
-{ return isalnum(i); }
-#undef isalnum
-inline int (isalnum)(int i)
-{ return boost_isalnum(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::isalnum;
-#endif
-
-#ifdef isalpha
-inline int (boost_isalpha)(int i)
-{ return isalpha(i); }
-#undef isalpha
-inline int (isalpha)(int i)
-{ return boost_isalpha(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::isalpha;
-#endif
-
-#ifdef iscntrl
-inline int (boost_iscntrl)(int i)
-{ return iscntrl(i); }
-#undef iscntrl
-inline int (iscntrl)(int i)
-{ return boost_iscntrl(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::iscntrl;
-#endif
-
-#ifdef isdigit
-inline int (boost_isdigit)(int i)
-{ return isdigit(i); }
-#undef isdigit
-inline int (isdigit)(int i)
-{ return boost_isdigit(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::isdigit;
-#endif
-
-#ifdef isgraph
-inline int (boost_isgraph)(int i)
-{ return isgraph(i); }
-#undef isgraph
-inline int (isgraph)(int i)
-{ return boost_isgraph(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::isgraph;
-#endif
-
-#ifdef islower
-inline int (boost_islower)(int i)
-{ return islower(i); }
-#undef islower
-inline int (islower)(int i)
-{ return boost_islower(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::islower;
-#endif
-
-#ifdef isprint
-inline int (boost_isprint)(int i)
-{ return isprint(i); }
-#undef isprint
-inline int (isprint)(int i)
-{ return boost_isprint(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::isprint;
-#endif
-
-#ifdef ispunct
-inline int (boost_ispunct)(int i)
-{ return ispunct(i); }
-#undef ispunct
-inline int (ispunct)(int i)
-{ return boost_ispunct(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::ispunct;
-#endif
-
-#ifdef isspace
-inline int (isspace)(int i)
-{ return isspace(i); }
-#undef isspace
-inline int (boost_isspace)(int i)
-{ return boost_isspace(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::isspace;
-#endif
-
-#ifdef isupper
-inline int (isupper)(int i)
-{ return isupper(i); }
-#undef isupper
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::isupper;
-#endif
-
-#ifdef isxdigit
-inline int (isxdigit)(int i)
-{ return isxdigit(i); }
-#undef isxdigit
-inline int (boost_isxdigit)(int i)
-{ return boost_isxdigit(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::isxdigit;
-#endif
-
-#ifdef tolower
-inline int (boost_tolower)(int i)
-{ return tolower(i); }
-#undef tolower
-inline int (tolower)(int i)
-{ return boost_tolower(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::tolower;
-#endif
-
-#ifdef toupper
-inline int (boost_toupper)(int i)
-{ return toupper(i); }
-#undef toupper
-inline int (toupper)(int i)
-{ return boost_toupper(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::toupper;
-#endif
-
-#else
-
-#undef memcmp
-#undef memcpy
-#undef memmove
-#undef memset
-#undef strcat
-#undef strcmp
-#undef strcoll
-#undef strcpy
-#undef strlen
-#undef strxfrm
-#undef isalnum
-#undef isalpha
-#undef iscntrl
-#undef isdigit
-#undef isgraph
-#undef islower
-#undef isprint
-#undef ispunct
-#undef isspace
-#undef isupper
-#undef isxdigit
-#undef tolower
-#undef toupper
-
-#endif
-
-
-#ifdef __BORLANDC__
-#pragma option pop
-#endif
-
-} // namespace std
-
-#endif // __sgi
-
-#endif
-
diff --git a/include/boost/regex/mfc.hpp b/include/boost/regex/mfc.hpp
new file mode 100644
index 00000000..9907aca0
--- /dev/null
+++ b/include/boost/regex/mfc.hpp
@@ -0,0 +1,185 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr John Maddock
+ *
+ * Use, modification and distribution are subject to the 
+ * Boost Software License, Version 1.0. (See accompanying file 
+ * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         mfc.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Overloads and helpers for using MFC/ATL string types with Boost.Regex.
+  */
+
+#ifndef BOOST_REGEX_MFC_HPP
+#define BOOST_REGEX_MFC_HPP
+
+#include <atlsimpstr.h>
+#include <boost/regex.hpp>
+
+namespace boost{
+
+//
+// define the types used for TCHAR's:
+typedef basic_regex<TCHAR> tregex;
+typedef match_results<TCHAR const*> tmatch;
+typedef regex_iterator<TCHAR const*> tregex_iterator;
+typedef regex_token_iterator<TCHAR const*> tregex_token_iterator;
+
+#if _MSC_VER >= 1310
+#define SIMPLE_STRING_PARAM class B, bool b
+#define SIMPLE_STRING_ARG_LIST B, b
+#else
+#define SIMPLE_STRING_PARAM class B
+#define SIMPLE_STRING_ARG_LIST B
+#endif
+
+//
+// define regex creation functions:
+//
+template <SIMPLE_STRING_PARAM>
+inline basic_regex<B> 
+make_regex(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, ::boost::regex_constants::syntax_option_type f = boost::regex_constants::normal)
+{
+   basic_regex<B> result(s.GetString(), s.GetString() + s.GetLength(), f);
+   return result;
+}
+//
+// regex_match overloads:
+//
+template <SIMPLE_STRING_PARAM, class A, class T>
+inline bool regex_match(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
+                 match_results<const B*, A>& what,
+                 const basic_regex<B, T>& e,
+                 boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+{
+   return ::boost::regex_match(s.GetString(),
+                               s.GetString() + s.GetLength(),
+                               what,
+                               e,
+                               f);
+}
+
+template <SIMPLE_STRING_PARAM, class T>
+inline bool regex_match(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
+                 const basic_regex<B, T>& e,
+                 boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+{
+   return ::boost::regex_match(s.GetString(),
+                               s.GetString() + s.GetLength(),
+                               e,
+                               f);
+}
+//
+// regex_search overloads:
+//
+template <SIMPLE_STRING_PARAM, class A, class T>
+inline bool regex_search(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
+                 match_results<const B*, A>& what,
+                 const basic_regex<B, T>& e,
+                 boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+{
+   return ::boost::regex_search(s.GetString(),
+                               s.GetString() + s.GetLength(),
+                               what,
+                               e,
+                               f);
+}
+
+template <SIMPLE_STRING_PARAM, class T>
+inline bool regex_search(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
+                 const basic_regex<B, T>& e,
+                 boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+{
+   return ::boost::regex_search(s.GetString(),
+                               s.GetString() + s.GetLength(),
+                               e,
+                               f);
+}
+//
+// regex_iterator creation:
+//
+template <SIMPLE_STRING_PARAM>
+inline regex_iterator<B const*> 
+make_regex_iterator(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, const basic_regex<B>& e, ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+{
+   regex_iterator<B const*> result(s.GetString(), s.GetString() + s.GetLength(), e, f);
+   return result;
+}
+
+template <SIMPLE_STRING_PARAM>
+inline regex_token_iterator<B const*> 
+   make_regex_token_iterator(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, const basic_regex<B>& e, int sub = 0, ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+{
+   regex_token_iterator<B const*> result(s.GetString(), s.GetString() + s.GetLength(), e, sub, f);
+   return result;
+}
+
+template <SIMPLE_STRING_PARAM>
+inline regex_token_iterator<B const*> 
+make_regex_token_iterator(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, const basic_regex<B>& e, const std::vector<int>& subs, ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+{
+   regex_token_iterator<B const*> result(s.GetString(), s.GetString() + s.GetLength(), e, subs, f);
+   return result;
+}
+
+template <SIMPLE_STRING_PARAM, std::size_t N>
+inline regex_token_iterator<B const*> 
+make_regex_token_iterator(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, const basic_regex<B>& e, const int (& subs)[N], ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+{
+   regex_token_iterator<B const*> result(s.GetString(), s.GetString() + s.GetLength(), e, subs, f);
+   return result;
+}
+
+template <class OutputIterator, class BidirectionalIterator, class traits,
+          SIMPLE_STRING_PARAM>
+OutputIterator regex_replace(OutputIterator out,
+                           BidirectionalIterator first,
+                           BidirectionalIterator last,
+                           const basic_regex<B, traits>& e,
+                           const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& fmt,
+                           match_flag_type flags = match_default)
+{
+   return regex_replace(out, first, last, e, fmt.GetString(), flags);
+}
+
+namespace re_detail{
+
+template <SIMPLE_STRING_PARAM>
+class mfc_string_out_iterator
+{
+   ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>* out;
+public:
+   mfc_string_out_iterator(ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s) : out(&s) {}
+   mfc_string_out_iterator& operator++() { return *this; }
+   mfc_string_out_iterator& operator++(int) { return *this; }
+   mfc_string_out_iterator& operator*() { return *this; }
+   mfc_string_out_iterator& operator=(B v) 
+   { 
+      out->AppendChar(v); 
+      return *this; 
+   }
+};
+
+}
+
+template <class traits, SIMPLE_STRING_PARAM>
+ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST> regex_replace(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
+                            const basic_regex<B, traits>& e,
+                            const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& fmt,
+                            match_flag_type flags = match_default)
+{
+   ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST> result(s.GetManager());
+   re_detail::mfc_string_out_iterator<SIMPLE_STRING_ARG_LIST> i(result);
+   regex_replace(i, s.GetString(), s.GetString() + s.GetLength(), e, fmt.GetString(), flags);
+   return result;
+}
+
+} // namespace boost.
+
+#endif
diff --git a/include/boost/regex/v4/basic_regex_creator.hpp b/include/boost/regex/v4/basic_regex_creator.hpp
index 9683cdfd..99afb429 100644
--- a/include/boost/regex/v4/basic_regex_creator.hpp
+++ b/include/boost/regex/v4/basic_regex_creator.hpp
@@ -171,7 +171,7 @@ public:
    {
       return getoffset(addr, m_pdata->m_data.data());
    }
-   std::ptrdiff_t getoffset(void* addr, void* base)
+   std::ptrdiff_t getoffset(const void* addr, const void* base)
    {
       return static_cast<const char*>(addr) - static_cast<const char*>(base);
    }
@@ -328,7 +328,7 @@ template <class charT, class traits>
 inline re_syntax_base* basic_regex_creator<charT, traits>::append_set(
    const basic_char_set<charT, traits>& char_set)
 {
-   typedef mpl::bool_<sizeof(charT) == 1> truth_type;
+   typedef mpl::bool_< (sizeof(charT) == 1) > truth_type;
    return char_set.has_digraphs() 
       ? append_set(char_set, static_cast<mpl::false_*>(0))
       : append_set(char_set, static_cast<truth_type*>(0));
@@ -403,8 +403,10 @@ re_syntax_base* basic_regex_creator<charT, traits>::append_set(
       if(flags() & regex_constants::collate)
       {
          // we need to transform our range into sort keys:
-         s1 = this->m_traits.transform(&c1.first, (c1.second ? &c1.second +1 : &c1.second));
-         s2 = this->m_traits.transform(&c2.first, (c2.second ? &c2.second +1 : &c2.second));
+         charT a1[3] = { c1.first, c1.second, charT(0), };
+         charT a2[3] = { c2.first, c2.second, charT(0), };
+         s1 = this->m_traits.transform(a1, (a1[1] ? a1+2 : a1+1));
+         s2 = this->m_traits.transform(a2, (a2[1] ? a2+2 : a2+1));
       }
       else
       {
@@ -445,7 +447,7 @@ re_syntax_base* basic_regex_creator<charT, traits>::append_set(
       string_type s;
       if(first->second)
       {
-         charT cs[2] = { first->first, first->second, };
+         charT cs[3] = { first->first, first->second, charT(0), };
          s = m_traits.transform_primary(cs, cs+2);
       }
       else
@@ -506,8 +508,10 @@ re_syntax_base* basic_regex_creator<charT, traits>::append_set(
       if(flags() & regex_constants::collate)
       {
          // we need to transform our range into sort keys:
-         string_type s1 = this->m_traits.transform(&c1, &c1 +1);
-         string_type s2 = this->m_traits.transform(&c2, &c2 +1);
+         charT c3[2] = { c1, charT(0), };
+         string_type s1 = this->m_traits.transform(c3, c3+1);
+         c3[0] = c2;
+         string_type s2 = this->m_traits.transform(c3, c3+1);
          if(s1 > s2)
          {
             // Oops error:
@@ -515,8 +519,8 @@ re_syntax_base* basic_regex_creator<charT, traits>::append_set(
          }
          for(unsigned i = 0; i < (1u << CHAR_BIT); ++i)
          {
-            charT c3 = static_cast<charT>(i);
-            string_type s3 = this->m_traits.transform(&c3, &c3 +1);
+            charT c3[] = { static_cast<charT>(i), charT(0), };
+            string_type s3 = this->m_traits.transform(c3, c3 +1);
             if((s1 <= s3) && (s3 <= s2))
                result->_map[i] = true;
          }
@@ -565,8 +569,8 @@ re_syntax_base* basic_regex_creator<charT, traits>::append_set(
          return 0;  // invalid or unsupported equivalence class
       for(unsigned i = 0; i < (1u << CHAR_BIT); ++i)
       {
-         charT c(static_cast<charT>(i));
-         string_type s2 = this->m_traits.transform_primary(&c, &c+1);
+         charT c[2] = { (static_cast<charT>(i)), charT(0), };
+         string_type s2 = this->m_traits.transform_primary(c, c+1);
          if(s == s2)
             result->_map[i] = true;
       }
diff --git a/include/boost/regex/v4/basic_regex_parser.hpp b/include/boost/regex/v4/basic_regex_parser.hpp
index 824828d0..ed3d06b9 100644
--- a/include/boost/regex/v4/basic_regex_parser.hpp
+++ b/include/boost/regex/v4/basic_regex_parser.hpp
@@ -517,10 +517,10 @@ bool basic_regex_parser<charT, traits>::parse_match_any()
    ++m_position;
    static_cast<re_dot*>(
       this->append_state(syntax_element_wild, sizeof(re_dot))
-      )->mask = this->flags() & regbase::no_mod_s 
+      )->mask = static_cast<unsigned char>(this->flags() & regbase::no_mod_s 
       ? re_detail::force_not_newline 
          : this->flags() & regbase::mod_s ?
-            re_detail::force_newline : re_detail::dont_care;
+            re_detail::force_newline : re_detail::dont_care);
    return true;
 }
 
@@ -1134,6 +1134,25 @@ digraph<charT> basic_regex_parser<charT, traits>::get_next_set_literal(basic_cha
    return result;
 }
 
+//
+// does a value fit in the specified charT type?
+//
+template <class charT>
+bool valid_value(charT, int v, const mpl::true_&)
+{
+   return (v >> (sizeof(charT) * CHAR_BIT)) == 0;
+}
+template <class charT>
+bool valid_value(charT, int v, const mpl::false_&)
+{
+   return true; // v will alsways fit in a charT
+}
+template <class charT>
+bool valid_value(charT c, int v)
+{
+   return valid_value(c, v, mpl::bool_<(sizeof(charT) < sizeof(int))>());
+}
+
 template <class charT, class traits>
 charT basic_regex_parser<charT, traits>::unescape_character()
 {
@@ -1219,7 +1238,7 @@ charT basic_regex_parser<charT, traits>::unescape_character()
          std::ptrdiff_t len = (std::min)(static_cast<std::ptrdiff_t>(2), m_end - m_position);
          int i = this->m_traits.toi(m_position, m_position + len, 16);
          if((i < 0)
-            || (i >> (sizeof(charT) * CHAR_BIT)))
+            || !valid_value(charT(0), i))
          {
             fail(regex_constants::error_escape, m_position - m_base);
             return result;
diff --git a/include/boost/regex/v4/c_regex_traits.hpp b/include/boost/regex/v4/c_regex_traits.hpp
index 72004404..dc7e24a1 100644
--- a/include/boost/regex/v4/c_regex_traits.hpp
+++ b/include/boost/regex/v4/c_regex_traits.hpp
@@ -112,14 +112,14 @@ struct BOOST_REGEX_DECL c_regex_traits<wchar_t>
       return (std::towlower)(c); 
    }
 
-   string_type BOOST_REGEX_CALL transform(const wchar_t* p1, const wchar_t* p2) const;
-   string_type BOOST_REGEX_CALL transform_primary(const wchar_t* p1, const wchar_t* p2) const;
+   static string_type BOOST_REGEX_CALL transform(const wchar_t* p1, const wchar_t* p2);
+   static string_type BOOST_REGEX_CALL transform_primary(const wchar_t* p1, const wchar_t* p2);
 
-   char_class_type BOOST_REGEX_CALL lookup_classname(const wchar_t* p1, const wchar_t* p2) const;
-   string_type BOOST_REGEX_CALL lookup_collatename(const wchar_t* p1, const wchar_t* p2) const;
+   static char_class_type BOOST_REGEX_CALL lookup_classname(const wchar_t* p1, const wchar_t* p2);
+   static string_type BOOST_REGEX_CALL lookup_collatename(const wchar_t* p1, const wchar_t* p2);
 
-   bool BOOST_REGEX_CALL isctype(wchar_t, char_class_type) const;
-   int BOOST_REGEX_CALL value(wchar_t, int) const;
+   static bool BOOST_REGEX_CALL isctype(wchar_t, char_class_type);
+   static int BOOST_REGEX_CALL value(wchar_t, int);
 
    locale_type imbue(locale_type l)
    { return l; }
@@ -132,6 +132,57 @@ private:
    c_regex_traits& operator=(const c_regex_traits&);
 };
 
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+//
+// Provide an unsigned short version as well, so the user can link to this
+// no matter whether they build with /Zc:wchar_t or not (MSVC specific).
+//
+template<>
+struct BOOST_REGEX_DECL c_regex_traits<unsigned short>
+{
+   c_regex_traits(){}
+   typedef unsigned short char_type;
+   typedef std::size_t size_type;
+   typedef std::basic_string<unsigned short> string_type;
+   struct locale_type{};
+   typedef boost::uint32_t char_class_type;
+
+   static size_type length(const char_type* p) 
+   { 
+      return (std::wcslen)((const wchar_t*)p); 
+   }
+
+   unsigned short translate(unsigned short c) const 
+   { 
+      return c; 
+   }
+   unsigned short translate_nocase(unsigned short c) const 
+   { 
+      return (std::towlower)((wchar_t)c); 
+   }
+
+   static string_type BOOST_REGEX_CALL transform(const unsigned short* p1, const unsigned short* p2);
+   static string_type BOOST_REGEX_CALL transform_primary(const unsigned short* p1, const unsigned short* p2);
+
+   static char_class_type BOOST_REGEX_CALL lookup_classname(const unsigned short* p1, const unsigned short* p2);
+   static string_type BOOST_REGEX_CALL lookup_collatename(const unsigned short* p1, const unsigned short* p2);
+
+   static bool BOOST_REGEX_CALL isctype(unsigned short, char_class_type);
+   static int BOOST_REGEX_CALL value(unsigned short, int);
+
+   locale_type imbue(locale_type l)
+   { return l; }
+   locale_type getloc()const
+   { return locale_type(); }
+
+private:
+   // this type is not copyable:
+   c_regex_traits(const c_regex_traits&);
+   c_regex_traits& operator=(const c_regex_traits&);
+};
+
+#endif
+
 #endif // BOOST_NO_WREGEX
 
 }
diff --git a/include/boost/regex/v4/cpp_regex_traits.hpp b/include/boost/regex/v4/cpp_regex_traits.hpp
index 22107795..b3df768f 100644
--- a/include/boost/regex/v4/cpp_regex_traits.hpp
+++ b/include/boost/regex/v4/cpp_regex_traits.hpp
@@ -23,6 +23,9 @@
 
 #ifndef BOOST_NO_STD_LOCALE
 
+#ifndef BOOST_RE_PAT_EXCEPT_HPP
+#include <boost/regex/pattern_except.hpp>
+#endif
 #ifndef BOOST_REGEX_TRAITS_DEFAULTS_HPP_INCLUDED
 #include <boost/regex/v4/regex_traits_defaults.hpp>
 #endif
@@ -319,6 +322,27 @@ private:
    void init();
 };
 
+#ifdef BOOST_REGEX_BUGGY_CTYPE_FACET
+enum
+{
+   char_class_space=1<<0, 
+   char_class_print=1<<1, 
+   char_class_cntrl=1<<2, 
+   char_class_upper=1<<3, 
+   char_class_lower=1<<4,
+   char_class_alpha=1<<5, 
+   char_class_digit=1<<6, 
+   char_class_punct=1<<7, 
+   char_class_xdigit=1<<8,
+   char_class_alnum=char_class_alpha|char_class_digit, 
+   char_class_graph=char_class_alnum|char_class_punct,
+   char_class_blank=1<<9,
+   char_class_word=1<<10,
+   char_class_unicode=1<<11
+};
+
+#endif
+
 //
 // class cpp_regex_traits_implementation:
 // provides pimpl implementation for cpp_regex_traits.
@@ -329,6 +353,7 @@ class cpp_regex_traits_implementation : public cpp_regex_traits_char_layer<charT
 public:
    typedef typename cpp_regex_traits<charT>::char_class_type char_class_type;
    typedef typename std::ctype<charT>::mask                  native_mask_type;
+#ifndef BOOST_REGEX_BUGGY_CTYPE_FACET
    BOOST_STATIC_CONSTANT(char_class_type, mask_blank = 1u << 16);
    BOOST_STATIC_CONSTANT(char_class_type, mask_word = 1u << 17);
    BOOST_STATIC_CONSTANT(char_class_type, mask_unicode = 1u << 18);
@@ -361,7 +386,7 @@ public:
          | std::ctype<charT>::upper
          | std::ctype<charT>::xdigit);
 #endif
-
+#endif
    //BOOST_STATIC_ASSERT(0 == (mask_base & (mask_word | mask_unicode)));
 
 
@@ -391,10 +416,7 @@ public:
    }
    string_type lookup_collatename(const charT* p1, const charT* p2) const;
    string_type transform_primary(const charT* p1, const charT* p2) const;
-   string_type transform(const charT* p1, const charT* p2) const
-   {
-      return this->m_pcollate->transform(p1, p2);
-   }
+   string_type transform(const charT* p1, const charT* p2) const;
    re_detail::parser_buf<charT>   m_sbuf;            // buffer for parsing numbers.
    std::basic_istream<charT>      m_is;              // stream for parsing numbers.
 private:
@@ -407,8 +429,13 @@ private:
    // helpers:
    //
    char_class_type lookup_classname_imp(const charT* p1, const charT* p2) const;
+#ifdef BOOST_REGEX_BUGGY_CTYPE_FACET
+public:
+   bool isctype(charT c, char_class_type m)const;
+#endif
 };
 
+#ifndef BOOST_REGEX_BUGGY_CTYPE_FACET
 #if !defined(BOOST_NO_INCLASS_MEMBER_INITIALIZATION)
 
 template <class charT>
@@ -425,12 +452,23 @@ template <class charT>
 typename cpp_regex_traits_implementation<charT>::char_class_type const cpp_regex_traits_implementation<charT>::mask_base;
 #endif
 
+#endif
 #endif
 
 template <class charT>
 typename cpp_regex_traits_implementation<charT>::string_type 
    cpp_regex_traits_implementation<charT>::transform_primary(const charT* p1, const charT* p2) const
 {
+   //
+   // PRECONDITIONS:
+   //
+   // A bug in gcc 3.2 (and maybe other versions as well) treats
+   // p1 as a null terminated string, for efficiency reasons 
+   // we work around this elsewhere, but just assert here that
+   // we adhere to gcc's (buggy) preconditions...
+   //
+   BOOST_ASSERT(*p2 == 0);
+
    string_type result;
    //
    // swallowing all exceptions here is a bad idea
@@ -478,6 +516,50 @@ typename cpp_regex_traits_implementation<charT>::string_type
    return result;
 }
 
+template <class charT>
+typename cpp_regex_traits_implementation<charT>::string_type 
+   cpp_regex_traits_implementation<charT>::transform(const charT* p1, const charT* p2) const
+{
+   //
+   // PRECONDITIONS:
+   //
+   // A bug in gcc 3.2 (and maybe other versions as well) treats
+   // p1 as a null terminated string, for efficiency reasons 
+   // we work around this elsewhere, but just assert here that
+   // we adhere to gcc's (buggy) preconditions...
+   //
+   BOOST_ASSERT(*p2 == 0);
+   //
+   // swallowing all exceptions here is a bad idea
+   // however at least one std lib will always throw
+   // std::bad_alloc for certain arguments...
+   //
+   string_type result;
+   try{
+      result = this->m_pcollate->transform(p1, p2);
+      //
+      // Borland's STLPort version returns a NULL-terminated
+      // string that has garbage at the end - each call to
+      // std::collate<wchar_t>::transform returns a different string!
+      // So as a workaround, we'll truncate the string at the first NULL
+      // which _seems_ to work....
+#if BOOST_WORKAROUND(__BORLANDC__, < 0x600)
+      result.erase(result.find(charT(0)));
+#else
+      //
+      // some implementations (Dinkumware) append unnecessary trailing \0's:
+      while(result.size() && (charT(0) == *result.rbegin()))
+         result.erase(result.size() - 1);
+#endif
+      BOOST_ASSERT(result.find(charT(0)) == string_type::npos);
+   }
+   catch(...)
+   {
+   }
+   return result;
+}
+
+
 template <class charT>
 typename cpp_regex_traits_implementation<charT>::string_type 
    cpp_regex_traits_implementation<charT>::lookup_collatename(const charT* p1, const charT* p2) const
@@ -575,6 +657,7 @@ cpp_regex_traits_implementation<charT>::cpp_regex_traits_implementation(const st
       //
       // Custom class names:
       //
+#ifndef BOOST_REGEX_BUGGY_CTYPE_FACET
       static const char_class_type masks[] = 
       {
          std::ctype<charT>::alnum,
@@ -592,6 +675,25 @@ cpp_regex_traits_implementation<charT>::cpp_regex_traits_implementation(const st
          cpp_regex_traits_implementation<charT>::mask_word,
          cpp_regex_traits_implementation<charT>::mask_unicode,
       };
+#else
+      static const char_class_type masks[] = 
+      {
+         ::boost::re_detail::char_class_alnum,
+         ::boost::re_detail::char_class_alpha,
+         ::boost::re_detail::char_class_cntrl,
+         ::boost::re_detail::char_class_digit,
+         ::boost::re_detail::char_class_graph,
+         ::boost::re_detail::char_class_lower,
+         ::boost::re_detail::char_class_print,
+         ::boost::re_detail::char_class_punct,
+         ::boost::re_detail::char_class_space,
+         ::boost::re_detail::char_class_upper,
+         ::boost::re_detail::char_class_xdigit,
+         ::boost::re_detail::char_class_blank,
+         ::boost::re_detail::char_class_word,
+         ::boost::re_detail::char_class_unicode,
+      };
+#endif
       static const string_type null_string;
       for(unsigned int j = 0; j <= 13; ++j)
       {
@@ -611,6 +713,7 @@ template <class charT>
 typename cpp_regex_traits_implementation<charT>::char_class_type 
    cpp_regex_traits_implementation<charT>::lookup_classname_imp(const charT* p1, const charT* p2) const
 {
+#ifndef BOOST_REGEX_BUGGY_CTYPE_FACET
    static const char_class_type masks[] = 
    {
       0,
@@ -634,6 +737,31 @@ typename cpp_regex_traits_implementation<charT>::char_class_type
       std::ctype<char>::alnum | cpp_regex_traits_implementation<charT>::mask_word, 
       std::ctype<char>::xdigit,
    };
+#else
+   static const char_class_type masks[] = 
+   {
+      0,
+      ::boost::re_detail::char_class_alnum, 
+      ::boost::re_detail::char_class_alpha,
+      ::boost::re_detail::char_class_blank,
+      ::boost::re_detail::char_class_cntrl,
+      ::boost::re_detail::char_class_digit,
+      ::boost::re_detail::char_class_digit,
+      ::boost::re_detail::char_class_graph,
+      ::boost::re_detail::char_class_lower,
+      ::boost::re_detail::char_class_lower,
+      ::boost::re_detail::char_class_print,
+      ::boost::re_detail::char_class_punct,
+      ::boost::re_detail::char_class_space,
+      ::boost::re_detail::char_class_space,
+      ::boost::re_detail::char_class_upper,
+      ::boost::re_detail::char_class_unicode,
+      ::boost::re_detail::char_class_upper,
+      ::boost::re_detail::char_class_alnum | ::boost::re_detail::char_class_word, 
+      ::boost::re_detail::char_class_alnum | ::boost::re_detail::char_class_word, 
+      ::boost::re_detail::char_class_xdigit,
+   };
+#endif
    if(m_custom_class_names.size())
    {
       typedef typename std::map<std::basic_string<charT>, char_class_type>::const_iterator map_iter;
@@ -646,6 +774,26 @@ typename cpp_regex_traits_implementation<charT>::char_class_type
    return masks[id];
 }
 
+#ifdef BOOST_REGEX_BUGGY_CTYPE_FACET
+template <class charT>
+bool cpp_regex_traits_implementation<charT>::isctype(const charT c, char_class_type mask) const
+{
+   return
+      ((mask & ::boost::re_detail::char_class_space) && (m_pctype->is(std::ctype<charT>::space, c)))
+      || ((mask & ::boost::re_detail::char_class_print) && (m_pctype->is(std::ctype<charT>::print, c)))
+      || ((mask & ::boost::re_detail::char_class_cntrl) && (m_pctype->is(std::ctype<charT>::cntrl, c)))
+      || ((mask & ::boost::re_detail::char_class_upper) && (m_pctype->is(std::ctype<charT>::upper, c)))
+      || ((mask & ::boost::re_detail::char_class_lower) && (m_pctype->is(std::ctype<charT>::lower, c)))
+      || ((mask & ::boost::re_detail::char_class_alpha) && (m_pctype->is(std::ctype<charT>::alpha, c)))
+      || ((mask & ::boost::re_detail::char_class_digit) && (m_pctype->is(std::ctype<charT>::digit, c)))
+      || ((mask & ::boost::re_detail::char_class_punct) && (m_pctype->is(std::ctype<charT>::punct, c)))
+      || ((mask & ::boost::re_detail::char_class_xdigit) && (m_pctype->is(std::ctype<charT>::xdigit, c)))
+      || ((mask & ::boost::re_detail::char_class_blank) && (m_pctype->is(std::ctype<charT>::space, c)) && !::boost::re_detail::is_separator(c))
+      || ((mask & ::boost::re_detail::char_class_word) && (c == '_'))
+      || ((mask & ::boost::re_detail::char_class_unicode) && ::boost::re_detail::is_extended(c));
+}
+#endif
+
 
 template <class charT>
 boost::shared_ptr<cpp_regex_traits_implementation<charT> > create_cpp_regex_traits(const std::locale& l BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(charT))
@@ -707,23 +855,7 @@ public:
    }
    string_type transform(const charT* p1, const charT* p2) const
    {
-      //
-      // swallowing all exceptions here is a bad idea
-      // however at least one std lib will always throw
-      // std::bad_alloc for certain arguments...
-      //
-      string_type result;
-      try{
-         result = m_pimpl->m_pcollate->transform(p1, p2);
-         //
-         // some implementations append unnecessary trailing \0's:
-         while(result.size() && (charT(0) == *result.rbegin()))
-            result.erase(result.size() - 1);
-      }
-      catch(...)
-      {
-      }
-      return result;
+      return m_pimpl->transform(p1, p2);
    }
    string_type transform_primary(const charT* p1, const charT* p2) const
    {
@@ -739,6 +871,7 @@ public:
    }
    bool isctype(charT c, char_class_type f) const
    {
+#ifndef BOOST_REGEX_BUGGY_CTYPE_FACET
       typedef typename std::ctype<charT>::mask ctype_mask;
       if((f & re_detail::cpp_regex_traits_implementation<charT>::mask_base) 
          && (m_pimpl->m_pctype->is(
@@ -753,6 +886,9 @@ public:
          && !re_detail::is_separator(c))
          return true;
       return false;
+#else
+      return m_pimpl->isctype(c, f);
+#endif
    }
    int toi(const charT*& p1, const charT* p2, int radix)const;
    int value(charT c, int radix)const
diff --git a/include/boost/regex/v4/perl_matcher.hpp b/include/boost/regex/v4/perl_matcher.hpp
index ceb1d6c7..c8668157 100644
--- a/include/boost/regex/v4/perl_matcher.hpp
+++ b/include/boost/regex/v4/perl_matcher.hpp
@@ -166,7 +166,10 @@ iterator BOOST_REGEX_CALL re_is_set_member(iterator next,
          if((e.m_flags & regex_constants::collate) == 0)
             s1.assign(1, col);
          else
-            s1 = traits_inst.transform(&col, &col + 1);
+         {
+            charT a[2] = { col, charT(0), };
+            s1 = traits_inst.transform(a, a + 1);
+         }
          for(i = 0; i < set_->cranges; ++i)
          {
             if(STR_COMP(s1, p) >= 0)
@@ -191,7 +194,8 @@ iterator BOOST_REGEX_CALL re_is_set_member(iterator next,
       // try and match an equivalence class, NB only a single character can match
       if(set_->cequivalents)
       {
-         s1 = traits_inst.transform_primary(&col, &col +1);
+         charT a[2] = { col, charT(0), };
+         s1 = traits_inst.transform_primary(a, a +1);
          for(i = 0; i < set_->cequivalents; ++i)
          {
             if(STR_COMP(s1, p) == 0)
@@ -350,7 +354,7 @@ private:
    bool match_backstep();
    bool match_assert_backref();
    bool match_toggle_case();
-   bool backtrack_till_match(unsigned count);
+   bool backtrack_till_match(std::size_t count);
 
    // find procs stored in s_find_vtable:
    bool find_restart_any();
diff --git a/include/boost/regex/v4/perl_matcher_common.hpp b/include/boost/regex/v4/perl_matcher_common.hpp
index b281ee6f..74c41da8 100644
--- a/include/boost/regex/v4/perl_matcher_common.hpp
+++ b/include/boost/regex/v4/perl_matcher_common.hpp
@@ -74,7 +74,7 @@ perl_matcher<BidiIterator, Allocator, traits>::perl_matcher(BidiIterator first,
    const char_type w = static_cast<char_type>('w');
    m_word_mask = traits_inst.lookup_classname(&w, &w+1);
    // find bitmask to use for matching '.':
-   match_any_mask = (f & match_not_dot_newline) ? re_detail::test_not_newline : re_detail::test_newline;
+   match_any_mask = static_cast<unsigned char>((f & match_not_dot_newline) ? re_detail::test_not_newline : re_detail::test_newline);
 }
 
 template <class BidiIterator, class Allocator, class traits>
diff --git a/include/boost/regex/v4/perl_matcher_recursive.hpp b/include/boost/regex/v4/perl_matcher_recursive.hpp
index df42c686..e3830df0 100644
--- a/include/boost/regex/v4/perl_matcher_recursive.hpp
+++ b/include/boost/regex/v4/perl_matcher_recursive.hpp
@@ -436,10 +436,17 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_fast()
    // start by working out how much we can skip:
    //
    const re_repeat* rep = static_cast<const re_repeat*>(pstate);
-   unsigned count = (std::min)(static_cast<unsigned>(::boost::re_detail::distance(position, last)), (rep->greedy ? rep->max : rep->min));
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4267)
+#endif
+   std::size_t count = (std::min)(static_cast<std::size_t>(::boost::re_detail::distance(position, last)), static_cast<std::size_t>(rep->greedy ? rep->max : rep->min));
    if(rep->min > count)
       return false;  // not enough text left to match
    std::advance(position, count);
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
    if((rep->leading) && (count < rep->max) && (rep->greedy))
       restart = position;
    if(rep->greedy)
@@ -740,7 +747,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_long_set_repeat()
 }
 
 template <class BidiIterator, class Allocator, class traits>
-bool perl_matcher<BidiIterator, Allocator, traits>::backtrack_till_match(unsigned count)
+bool perl_matcher<BidiIterator, Allocator, traits>::backtrack_till_match(std::size_t count)
 {
 #ifdef BOOST_MSVC
 #pragma warning(push)
diff --git a/include/boost/regex/v4/regex.hpp b/include/boost/regex/v4/regex.hpp
index dc39f9a6..e88461dc 100644
--- a/include/boost/regex/v4/regex.hpp
+++ b/include/boost/regex/v4/regex.hpp
@@ -107,6 +107,18 @@
 #endif
 #endif
 
+#if !defined(BOOST_NO_WREGEX) && defined(BOOST_REGEX_HAS_OTHER_WCHAR_T)
+#define BOOST_REGEX_CHAR_T unsigned short
+#ifdef BOOST_REGEX_US_INSTANTIATE
+#  define BOOST_REGEX_INSTANTIATE
+#endif
+#include <boost/regex/v4/instances.hpp>
+#undef BOOST_REGEX_CHAR_T
+#ifdef BOOST_REGEX_INSTANTIATE
+#  undef BOOST_REGEX_INSTANTIATE
+#endif
+#endif
+
 
 namespace boost{
 #ifdef BOOST_REGEX_NO_FWD
diff --git a/include/boost/regex/v4/regex_format.hpp b/include/boost/regex/v4/regex_format.hpp
index 372338e4..e0c086d9 100644
--- a/include/boost/regex/v4/regex_format.hpp
+++ b/include/boost/regex/v4/regex_format.hpp
@@ -108,6 +108,9 @@ private:
    const char_type* m_end;       // format string end
    match_flag_type m_flags;      // format flags to use
    output_state    m_state;      // what to do with the next character
+private:
+   basic_regex_formatter(const basic_regex_formatter&);
+   basic_regex_formatter& operator=(const basic_regex_formatter&);
 };
 
 template <class OutputIterator, class Results, class traits>
diff --git a/include/boost/regex/v4/regex_iterator.hpp b/include/boost/regex/v4/regex_iterator.hpp
index 29c7fbd8..67e600c9 100644
--- a/include/boost/regex/v4/regex_iterator.hpp
+++ b/include/boost/regex/v4/regex_iterator.hpp
@@ -68,6 +68,8 @@ public:
          what.set_base(base);
       return result;
    }
+private:
+   regex_iterator_implementation& operator=(const regex_iterator_implementation&);
 };
 
 template <class BidirectionalIterator, 
diff --git a/include/boost/regex/v4/regex_token_iterator.hpp b/include/boost/regex/v4/regex_token_iterator.hpp
index e3674a38..36d837b0 100644
--- a/include/boost/regex/v4/regex_token_iterator.hpp
+++ b/include/boost/regex/v4/regex_token_iterator.hpp
@@ -152,6 +152,8 @@ public:
       }
       return false;
    }
+private:
+   regex_token_iterator_implementation& operator=(const regex_token_iterator_implementation&);
 };
 
 template <class BidirectionalIterator, 
diff --git a/include/boost/regex/v4/regex_traits.hpp b/include/boost/regex/v4/regex_traits.hpp
index a19b092b..4d9b50f3 100644
--- a/include/boost/regex/v4/regex_traits.hpp
+++ b/include/boost/regex/v4/regex_traits.hpp
@@ -31,6 +31,9 @@
 #ifndef BOOST_REGEX_ERROR_TYPE_HPP
 #include <boost/regex/v4/error_type.hpp>
 #endif
+#ifndef BOOST_REGEX_TRAITS_DEFAULTS_HPP_INCLUDED
+#include <boost/regex/v4/regex_traits_defaults.hpp>
+#endif
 #ifndef BOOST_NO_STD_LOCALE
 #  ifndef BOOST_CPP_REGEX_TRAITS_HPP_INCLUDED
 #     include <boost/regex/v4/cpp_regex_traits.hpp>
@@ -156,6 +159,10 @@ struct regex_traits_wrapper
                ::boost::re_detail::has_boost_extensions_tag<BaseT>::value
             >::type
 {
+   regex_traits_wrapper(){}
+private:
+   regex_traits_wrapper(const regex_traits_wrapper&);
+   regex_traits_wrapper& operator=(const regex_traits_wrapper&);
 };
 
 } // namespace boost
diff --git a/include/boost/regex/v4/regex_traits_defaults.hpp b/include/boost/regex/v4/regex_traits_defaults.hpp
index 904c0620..a31b1308 100644
--- a/include/boost/regex/v4/regex_traits_defaults.hpp
+++ b/include/boost/regex/v4/regex_traits_defaults.hpp
@@ -250,6 +250,7 @@ int global_value(charT c)
 template <class charT, class traits>
 int global_toi(const charT*& p1, const charT* p2, int radix, const traits& t)
 {
+   (void)t; // warning suppression
    int next_value = t.value(*p1, radix);
    if((p1 == p2) || (next_value < 0) || (next_value >= radix))
       return -1;
diff --git a/include/boost/regex/v4/regex_workaround.hpp b/include/boost/regex/v4/regex_workaround.hpp
index 22564519..9c9d7465 100644
--- a/include/boost/regex/v4/regex_workaround.hpp
+++ b/include/boost/regex/v4/regex_workaround.hpp
@@ -31,7 +31,7 @@
 #include <iosfwd>
 #include <vector>
 #include <map>
-#include <limits>
+#include <boost/limits.hpp>
 #include <boost/assert.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/throw_exception.hpp>
diff --git a/include/boost/regex/v4/w32_regex_traits.hpp b/include/boost/regex/v4/w32_regex_traits.hpp
index 39a2d3b7..cdbfbe5e 100644
--- a/include/boost/regex/v4/w32_regex_traits.hpp
+++ b/include/boost/regex/v4/w32_regex_traits.hpp
@@ -61,23 +61,38 @@ BOOST_REGEX_DECL lcid_type BOOST_REGEX_CALL w32_get_default_locale();
 BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_lower(char, lcid_type);
 #ifndef BOOST_NO_WREGEX
 BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_lower(wchar_t, lcid_type);
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_lower(unsigned short ca, lcid_type id);
+#endif
 #endif
 BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_upper(char, lcid_type);
 #ifndef BOOST_NO_WREGEX
 BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_upper(wchar_t, lcid_type);
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_upper(unsigned short ca, lcid_type id);
+#endif
 #endif
 BOOST_REGEX_DECL cat_type BOOST_REGEX_CALL w32_cat_open(const std::string& name);
 BOOST_REGEX_DECL std::string BOOST_REGEX_CALL w32_cat_get(const cat_type& cat, lcid_type id, int i, const std::string& def);
 #ifndef BOOST_NO_WREGEX
 BOOST_REGEX_DECL std::wstring BOOST_REGEX_CALL w32_cat_get(const cat_type& cat, lcid_type id, int i, const std::wstring& def);
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL std::basic_string<unsigned short> BOOST_REGEX_CALL w32_cat_get(const cat_type& cat, lcid_type, int i, const std::basic_string<unsigned short>& def);
+#endif
 #endif
 BOOST_REGEX_DECL std::string BOOST_REGEX_CALL w32_transform(lcid_type id, const char* p1, const char* p2);
 #ifndef BOOST_NO_WREGEX
 BOOST_REGEX_DECL std::wstring BOOST_REGEX_CALL w32_transform(lcid_type id, const wchar_t* p1, const wchar_t* p2);
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL std::basic_string<unsigned short> BOOST_REGEX_CALL w32_transform(lcid_type id, const unsigned short* p1, const unsigned short* p2);
+#endif
 #endif
 BOOST_REGEX_DECL char BOOST_REGEX_CALL w32_tolower(char c, lcid_type);
 #ifndef BOOST_NO_WREGEX
 BOOST_REGEX_DECL wchar_t BOOST_REGEX_CALL w32_tolower(wchar_t c, lcid_type);
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL unsigned short BOOST_REGEX_CALL w32_tolower(unsigned short c, lcid_type id);
+#endif
 #endif
 BOOST_REGEX_DECL char BOOST_REGEX_CALL w32_toupper(char c, lcid_type);
 #ifndef BOOST_NO_WREGEX
@@ -86,6 +101,9 @@ BOOST_REGEX_DECL wchar_t BOOST_REGEX_CALL w32_toupper(wchar_t c, lcid_type);
 BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is(lcid_type, boost::uint32_t mask, char c);
 #ifndef BOOST_NO_WREGEX
 BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is(lcid_type, boost::uint32_t mask, wchar_t c);
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is(lcid_type id, boost::uint32_t m, unsigned short c);
+#endif
 #endif
 //
 // class w32_regex_traits_base:
diff --git a/src/cpp_regex_traits.cpp b/src/cpp_regex_traits.cpp
index 98840c6a..7ed0be7d 100644
--- a/src/cpp_regex_traits.cpp
+++ b/src/cpp_regex_traits.cpp
@@ -17,6 +17,8 @@
   */
 
 #define BOOST_REGEX_SOURCE
+#include <boost/config.hpp>
+#ifndef BOOST_NO_STD_LOCALE
 #include <boost/regex/regex_traits.hpp>
 #include <boost/regex/pattern_except.hpp>
 
@@ -107,3 +109,5 @@ void cpp_regex_traits_char_layer<char>::init()
 
 } // re_detail
 } // boost
+#endif
+
diff --git a/src/regex_traits_defaults.cpp b/src/regex_traits_defaults.cpp
index 522f6a57..402c8820 100644
--- a/src/regex_traits_defaults.cpp
+++ b/src/regex_traits_defaults.cpp
@@ -258,12 +258,12 @@ BOOST_REGEX_DECL std::string BOOST_REGEX_CALL lookup_default_collate_name(const
 
 BOOST_REGEX_DECL char BOOST_REGEX_CALL global_lower(char c)
 {
-   return (std::tolower)(c);
+   return static_cast<char>((std::tolower)(c));
 }
 
 BOOST_REGEX_DECL char BOOST_REGEX_CALL global_upper(char c)
 {
-   return (std::toupper)(c);
+   return static_cast<char>((std::toupper)(c));
 }
 #ifndef BOOST_NO_WREGEX
 BOOST_REGEX_DECL wchar_t BOOST_REGEX_CALL global_lower(wchar_t c)
@@ -275,6 +275,18 @@ BOOST_REGEX_DECL wchar_t BOOST_REGEX_CALL global_upper(wchar_t c)
 {
    return (std::towupper)(c);
 }
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL unsigned short BOOST_REGEX_CALL global_lower(unsigned short c)
+{
+   return (std::towlower)(c);
+}
+
+BOOST_REGEX_DECL unsigned short BOOST_REGEX_CALL global_upper(unsigned short c)
+{
+   return (std::towupper)(c);
+}
+#endif
+
 #endif
 
 BOOST_REGEX_DECL regex_constants::escape_syntax_type BOOST_REGEX_CALL get_default_escape_syntax_type(char c)
diff --git a/src/usinstances.cpp b/src/usinstances.cpp
new file mode 100644
index 00000000..b8d0bd27
--- /dev/null
+++ b/src/usinstances.cpp
@@ -0,0 +1,50 @@
+/*
+ *
+ * Copyright (c) 1998-2002
+ * Dr John Maddock
+ *
+ * Use, modification and distribution are subject to the 
+ * Boost Software License, Version 1.0. (See accompanying file 
+ * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE:        winstances.cpp
+  *   VERSION:     see <boost/version.hpp>
+  *   DESCRIPTION: regex unsigned short template instances (MSVC only).
+  */
+
+#define BOOST_REGEX_SOURCE
+
+#include <boost/regex/config.hpp>
+
+#if !defined(BOOST_NO_WREGEX) && defined(BOOST_REGEX_HAS_OTHER_WCHAR_T) && !defined(BOOST_REGEX_NO_EXTERNAL_TEMPLATES)
+#define BOOST_REGEX_US_INSTANTIATE
+
+#ifdef _DLL_CPPLIB
+namespace std{
+template _CRTIMP2 bool __cdecl operator==(
+	const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&,
+	const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&);
+template _CRTIMP2 bool __cdecl operator==(
+	const unsigned short *,
+	const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&);
+template _CRTIMP2 bool __cdecl operator==(
+	const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&,
+	const unsigned short *);
+template _CRTIMP2 bool __cdecl operator<(
+	const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&,
+	const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&);
+template _CRTIMP2 bool __cdecl operator>(
+	const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&,
+	const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&);
+}
+#endif
+
+
+#include <boost/regex.hpp>
+
+#endif
+
diff --git a/src/w32_regex_traits.cpp b/src/w32_regex_traits.cpp
index a292a595..fb7c2da2 100644
--- a/src/w32_regex_traits.cpp
+++ b/src/w32_regex_traits.cpp
@@ -130,6 +130,16 @@ BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_lower(wchar_t c, lcid_type id)
       return true;
    return false;
 }
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_lower(unsigned short ca, lcid_type id)
+{
+   WORD mask;
+   wchar_t c = ca;
+   if(::GetStringTypeExW(id, CT_CTYPE1, &c, 1, &mask) && (mask & C1_LOWER))
+      return true;
+   return false;
+}
+#endif
 
 BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_upper(char c, lcid_type id)
 {
@@ -146,6 +156,16 @@ BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_upper(wchar_t c, lcid_type id)
       return true;
    return false;
 }
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_upper(unsigned short ca, lcid_type id)
+{
+   WORD mask;
+   wchar_t c = ca;
+   if(::GetStringTypeExW(id, CT_CTYPE1, &c, 1, &mask) && (mask & C1_UPPER))
+      return true;
+   return false;
+}
+#endif
 
 void free_module(void* mod)
 {
@@ -188,6 +208,22 @@ BOOST_REGEX_DECL std::wstring BOOST_REGEX_CALL w32_cat_get(const cat_type& cat,
    }
    return std::wstring(buf);
 }
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL std::basic_string<unsigned short> BOOST_REGEX_CALL w32_cat_get(const cat_type& cat, lcid_type, int i, const std::basic_string<unsigned short>& def)
+{
+   unsigned short buf[256];
+   if(0 == ::LoadStringW(
+      static_cast<HMODULE>(cat.get()),
+      i,
+      (LPWSTR)buf,
+      256
+   ))
+   {
+      return def;
+   }
+   return std::basic_string<unsigned short>(buf);
+}
+#endif
 #endif
 BOOST_REGEX_DECL std::string BOOST_REGEX_CALL w32_transform(lcid_type id, const char* p1, const char* p2)
 {
@@ -252,6 +288,40 @@ BOOST_REGEX_DECL std::wstring BOOST_REGEX_CALL w32_transform(lcid_type id, const
       r2.append(1, static_cast<wchar_t>(static_cast<unsigned char>(result[i])));
    return r2;
 }
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL std::basic_string<unsigned short> BOOST_REGEX_CALL w32_transform(lcid_type id, const unsigned short* p1, const unsigned short* p2)
+{
+   int bytes = ::LCMapStringW(
+      id,       // locale identifier
+      LCMAP_SORTKEY,  // mapping transformation type
+      (LPCWSTR)p1,  // source string
+      p2 - p1,        // number of characters in source string
+      0,  // destination buffer
+      0        // size of destination buffer
+      );
+   if(!bytes)
+      return std::basic_string<unsigned short>(p1, p2);
+   std::string result(++bytes, '\0');
+   bytes = ::LCMapStringW(
+      id,       // locale identifier
+      LCMAP_SORTKEY,  // mapping transformation type
+      (LPCWSTR)p1,  // source string
+      p2 - p1,        // number of characters in source string
+      reinterpret_cast<wchar_t*>(&*result.begin()),  // destination buffer *of bytes*
+      bytes        // size of destination buffer
+      );
+   if(bytes > static_cast<int>(result.size()))
+      return std::basic_string<unsigned short>(p1, p2);
+   while(result.size() && result[result.size()-1] == L'\0')
+   {
+      result.erase(result.size()-1);
+   }
+   std::basic_string<unsigned short> r2;
+   for(std::string::size_type i = 0; i < result.size(); ++i)
+      r2.append(1, static_cast<unsigned short>(static_cast<unsigned char>(result[i])));
+   return r2;
+}
+#endif
 #endif
 BOOST_REGEX_DECL char BOOST_REGEX_CALL w32_tolower(char c, lcid_type id)
 {
@@ -283,6 +353,22 @@ BOOST_REGEX_DECL wchar_t BOOST_REGEX_CALL w32_tolower(wchar_t c, lcid_type id)
       return c;
    return result[0];
 }
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL unsigned short BOOST_REGEX_CALL w32_tolower(unsigned short c, lcid_type id)
+{
+   wchar_t result[2];
+   int b = ::LCMapStringW(
+      id,       // locale identifier
+      LCMAP_LOWERCASE,  // mapping transformation type
+      (wchar_t const*)&c,  // source string
+      1,        // number of characters in source string
+      result,  // destination buffer
+      1);        // size of destination buffer
+   if(b == 0)
+      return c;
+   return result[0];
+}
+#endif
 #endif
 BOOST_REGEX_DECL char BOOST_REGEX_CALL w32_toupper(char c, lcid_type id)
 {
@@ -314,6 +400,22 @@ BOOST_REGEX_DECL wchar_t BOOST_REGEX_CALL w32_toupper(wchar_t c, lcid_type id)
       return c;
    return result[0];
 }
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL unsigned short BOOST_REGEX_CALL w32_toupper(unsigned short c, lcid_type id)
+{
+   wchar_t result[2];
+   int b = ::LCMapStringW(
+      id,       // locale identifier
+      LCMAP_UPPERCASE,  // mapping transformation type
+      (wchar_t const*)&c,  // source string
+      1,        // number of characters in source string
+      result,  // destination buffer
+      1);        // size of destination buffer
+   if(b == 0)
+      return c;
+   return result[0];
+}
+#endif
 #endif
 BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is(lcid_type id, boost::uint32_t m, char c)
 {
@@ -337,6 +439,19 @@ BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is(lcid_type id, boost::uint32_t m, w
       return true;
    return false;
 }
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is(lcid_type id, boost::uint32_t m, unsigned short c)
+{
+   WORD mask;
+   if(::GetStringTypeExW(id, CT_CTYPE1, (wchar_t const*)&c, 1, &mask) && (mask & m & w32_regex_traits_implementation<wchar_t>::mask_base))
+      return true;
+   if((m & w32_regex_traits_implementation<wchar_t>::mask_word) && (c == '_'))
+      return true;
+   if((m & w32_regex_traits_implementation<wchar_t>::mask_unicode) && (c > 0xff))
+      return true;
+   return false;
+}
+#endif
 #endif
 
 } // re_detail
diff --git a/src/wc_regex_traits.cpp b/src/wc_regex_traits.cpp
index 079dcf9b..33de4477 100644
--- a/src/wc_regex_traits.cpp
+++ b/src/wc_regex_traits.cpp
@@ -37,7 +37,7 @@ namespace std{
 
 namespace boost{
 
-c_regex_traits<wchar_t>::string_type BOOST_REGEX_CALL c_regex_traits<wchar_t>::transform(const wchar_t* p1, const wchar_t* p2) const
+c_regex_traits<wchar_t>::string_type BOOST_REGEX_CALL c_regex_traits<wchar_t>::transform(const wchar_t* p1, const wchar_t* p2) 
 { 
    std::size_t r;
    std::size_t s = 10;
@@ -52,10 +52,10 @@ c_regex_traits<wchar_t>::string_type BOOST_REGEX_CALL c_regex_traits<wchar_t>::t
    return result; 
 }
 
-c_regex_traits<wchar_t>::string_type BOOST_REGEX_CALL c_regex_traits<wchar_t>::transform_primary(const wchar_t* p1, const wchar_t* p2) const
+c_regex_traits<wchar_t>::string_type BOOST_REGEX_CALL c_regex_traits<wchar_t>::transform_primary(const wchar_t* p1, const wchar_t* p2) 
 {
    static wchar_t s_delim;
-   static const int s_collate_type = ::boost::re_detail::find_sort_syntax(this, &s_delim);
+   static const int s_collate_type = ::boost::re_detail::find_sort_syntax(static_cast<const c_regex_traits<wchar_t>*>(0), &s_delim);
    std::wstring result;
    //
    // What we do here depends upon the format of the sort key returned by
@@ -70,19 +70,19 @@ c_regex_traits<wchar_t>::string_type BOOST_REGEX_CALL c_regex_traits<wchar_t>::t
          result.assign(p1, p2);
          for(std::wstring::size_type i = 0; i < result.size(); ++i)
             result[i] = (std::towlower)(result[i]);
-         result = this->transform(&*result.begin(), &*result.begin() + result.size());
+         result = c_regex_traits<wchar_t>::transform(&*result.begin(), &*result.begin() + result.size());
          break;
       }
    case ::boost::re_detail::sort_fixed:
       {
          // get a regular sort key, and then truncate it:
-         result = this->transform(&*result.begin(), &*result.begin() + result.size());
+         result = c_regex_traits<wchar_t>::transform(&*result.begin(), &*result.begin() + result.size());
          result.erase(s_delim);
          break;
       }
    case ::boost::re_detail::sort_delim:
          // get a regular sort key, and then truncate everything after the delim:
-         result = this->transform(&*result.begin(), &*result.begin() + result.size());
+         result = c_regex_traits<wchar_t>::transform(&*result.begin(), &*result.begin() + result.size());
          std::size_t i;
          for(i = 0; i < result.size(); ++i)
          {
@@ -113,7 +113,7 @@ enum
    char_class_unicode=1<<11
 };
 
-c_regex_traits<wchar_t>::char_class_type BOOST_REGEX_CALL c_regex_traits<wchar_t>::lookup_classname(const wchar_t* p1, const wchar_t* p2) const
+c_regex_traits<wchar_t>::char_class_type BOOST_REGEX_CALL c_regex_traits<wchar_t>::lookup_classname(const wchar_t* p1, const wchar_t* p2) 
 {
    static const char_class_type masks[] = 
    {
@@ -151,7 +151,7 @@ c_regex_traits<wchar_t>::char_class_type BOOST_REGEX_CALL c_regex_traits<wchar_t
    return masks[id+1];
 }
 
-bool BOOST_REGEX_CALL c_regex_traits<wchar_t>::isctype(wchar_t c, char_class_type mask) const
+bool BOOST_REGEX_CALL c_regex_traits<wchar_t>::isctype(wchar_t c, char_class_type mask) 
 {
    return
       ((mask & char_class_space) && (std::iswspace)(c))
@@ -168,7 +168,7 @@ bool BOOST_REGEX_CALL c_regex_traits<wchar_t>::isctype(wchar_t c, char_class_typ
       || ((mask & char_class_unicode) && (c & ~static_cast<wchar_t>(0xff)));
 }
 
-c_regex_traits<wchar_t>::string_type BOOST_REGEX_CALL c_regex_traits<wchar_t>::lookup_collatename(const wchar_t* p1, const wchar_t* p2) const
+c_regex_traits<wchar_t>::string_type BOOST_REGEX_CALL c_regex_traits<wchar_t>::lookup_collatename(const wchar_t* p1, const wchar_t* p2) 
 {
 #if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
                && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)\
@@ -203,7 +203,7 @@ c_regex_traits<wchar_t>::string_type BOOST_REGEX_CALL c_regex_traits<wchar_t>::l
    return string_type();
 }
 
-int BOOST_REGEX_CALL c_regex_traits<wchar_t>::value(wchar_t c, int radix) const
+int BOOST_REGEX_CALL c_regex_traits<wchar_t>::value(wchar_t c, int radix) 
 {
 #ifdef __BORLANDC__
    // workaround for broken wcstol:
@@ -218,6 +218,42 @@ int BOOST_REGEX_CALL c_regex_traits<wchar_t>::value(wchar_t c, int radix) const
    return result;
 }
 
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+c_regex_traits<unsigned short>::string_type BOOST_REGEX_CALL c_regex_traits<unsigned short>::transform(const unsigned short* p1, const unsigned short* p2)
+{
+   std::wstring result = c_regex_traits<wchar_t>::transform((const wchar_t*)p1, (const wchar_t*)p2);
+   return string_type(result.begin(), result.end());
+}
+
+c_regex_traits<unsigned short>::string_type BOOST_REGEX_CALL c_regex_traits<unsigned short>::transform_primary(const unsigned short* p1, const unsigned short* p2)
+{
+   std::wstring result = c_regex_traits<wchar_t>::transform_primary((const wchar_t*)p1, (const wchar_t*)p2);
+   return string_type(result.begin(), result.end());
+}
+
+c_regex_traits<unsigned short>::char_class_type BOOST_REGEX_CALL c_regex_traits<unsigned short>::lookup_classname(const unsigned short* p1, const unsigned short* p2)
+{
+   return c_regex_traits<wchar_t>::lookup_classname((const wchar_t*)p1, (const wchar_t*)p2);
+}
+
+c_regex_traits<unsigned short>::string_type BOOST_REGEX_CALL c_regex_traits<unsigned short>::lookup_collatename(const unsigned short* p1, const unsigned short* p2)
+{
+   std::wstring result = c_regex_traits<wchar_t>::lookup_collatename((const wchar_t*)p1, (const wchar_t*)p2);
+   return string_type(result.begin(), result.end());
+}
+
+bool BOOST_REGEX_CALL c_regex_traits<unsigned short>::isctype(unsigned short c, char_class_type m)
+{
+   return c_regex_traits<wchar_t>::isctype(c, m);
+}
+
+int BOOST_REGEX_CALL c_regex_traits<unsigned short>::value(unsigned short c, int radix)
+{
+   return c_regex_traits<wchar_t>::value(c, radix);
+}
+
+#endif
+
 }
 
 #endif // BOOST_NO_WREGEX
diff --git a/test/Jamfile b/test/Jamfile
index 7a16e13f..d24f08a0 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -17,6 +17,7 @@ test_deprecated.cpp
 test_escapes.cpp
 test_grep.cpp
 test_locale.cpp
+test_mfc.cpp
 test_non_greedy_repeats.cpp
 test_perl_ex.cpp
 test_replace.cpp
diff --git a/test/captures/Jamfile b/test/captures/Jamfile
index 4817028d..35126aa5 100644
--- a/test/captures/Jamfile
+++ b/test/captures/Jamfile
@@ -17,7 +17,8 @@ EX_SOURCES =
    w32_regex_traits.cpp
    wc_regex_traits.cpp
    wide_posix_api.cpp
-   winstances.cpp ;
+   winstances.cpp
+   usinstances.cpp ;
        
 lib boost_regex_extra : ../../src/$(EX_SOURCES) <template>../../build/regex-options
     : 
diff --git a/test/regress/bc55.mak b/test/regress/bc55.mak
deleted file mode 100644
index 7729f8a5..00000000
--- a/test/regress/bc55.mak
+++ /dev/null
@@ -1,144 +0,0 @@
-
-# very basic makefile for regress
-#
-# Borland C++ tools
-#
-# BCROOT defines the root directory of your bcb install
-#
-!ifndef BCROOT
-BCROOT=$(MAKEDIR)\..
-!endif
-#
-# sources to compile for each test:
-#
-SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
-
-BCC32   = $(BCROOT)\bin\Bcc32.exe 
-TLINK32 = $(BCROOT)\bin\ILink32.exe
-
-IDE_LinkFLAGS32 =  -L$(BCROOT)\LIB
-LINKOPTS= -ap -Tpe -x
-CFLAGS= -O2 -tWC -DSTRICT; -Vx -Ve -w-inl -w-aus -w-csu -w-eff -w-rch -I$(BCROOT)\include;..\..\..\..\; -L..\..\..\..\stage\lib -L..\..\build\bcb5
-
-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 r1lm.exe r2lm.exe r3lm.exe r4lm.exe r5lm.exe r6lm.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 single threaded 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 dll multi-threaded version....
-	r1lm tests.txt test1252.txt
-	r2lm tests.txt
-	r3lm tests.txt
-	r4lm tests.txt test1252.txt
-	r5lm tests.txt
-	r6lm tests.txt
-
-
-r1.exe : tests.cpp regress.cpp parse.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er1.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp regress.cpp parse.cpp
-
-r2.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er2.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er3.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er4.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er5.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er6.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-	
-
-r1m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er1m.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er2m.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er3m.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er4m.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er5m.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er6m.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er1l.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er2l.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er3l.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er4l.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er5l.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er6l.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er1lm.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er2lm.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er3lm.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er4lm.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er5lm.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er6lm.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/regress/bcb4.mak b/test/regress/bcb4.mak
deleted file mode 100644
index 19179d37..00000000
--- a/test/regress/bcb4.mak
+++ /dev/null
@@ -1,194 +0,0 @@
-
-# very basic makefile for regress
-#
-# Borland C++ tools
-#
-# BCROOT defines the root directory of your bcb install
-#
-!ifndef BCROOT
-BCROOT=$(MAKEDIR)\..
-!endif
-
-BCC32   = $(BCROOT)\bin\Bcc32.exe 
-TLINK32 = $(BCROOT)\bin\ILink32.exe
-#
-# sources to compile for each test:
-#
-SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
-
-IDE_LinkFLAGS32 =  -L$(BCROOT)\LIB
-LINKOPTS= -ap -Tpe -x
-CFLAGS= -O2 -tWC -DSTRICT; -Vx -Ve -w-inl -w-aus -w-csu -w-eff -w-rch -I$(BCROOT)\include;..\..\..\..\; -L..\..\build\bcb4
-
-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 r1v.exe r2v.exe r3v.exe r4v.exe r5v.exe r6v.exe r1l.exe r2l.exe r3l.exe r4l.exe r5l.exe r6l.exe r1lm.exe r2lm.exe r3lm.exe r4lm.exe r5lm.exe r6lm.exe r1lv.exe r2lv.exe r3lv.exe r4lv.exe r5lv.exe r6lv.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 static VCL version....
-	r1v tests.txt test1252.txt
-	r2v tests.txt
-	r3v tests.txt
-	r4v tests.txt test1252.txt
-	r5v tests.txt
-	r6v tests.txt
-	echo testing dll single threaded 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 dll multi-threaded version....
-	r1lm tests.txt test1252.txt
-	r2lm tests.txt
-	r3lm tests.txt
-	r4lm tests.txt test1252.txt
-	r5lm tests.txt
-	r6lm tests.txt
-	echo testing dll VCL version....
-	r1lv tests.txt test1252.txt
-	r2lv tests.txt
-	r3lv tests.txt
-	r4lv tests.txt test1252.txt
-	r5lv tests.txt
-	r6lv tests.txt
-
-
-r1.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er1.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er2.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er3.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er4.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er5.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er6.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-	
-
-r1m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er1m.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er2m.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er3m.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er4m.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er5m.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er6m.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er1v.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er2v.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er3v.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er4v.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er5v.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er6v.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er1l.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er2l.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er3l.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er4l.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er5l.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er6l.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er1lm.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er2lm.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er3lm.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er4lm.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er5lm.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er6lm.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er1lv.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er2lv.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er3lv.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er4lv.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er5lv.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er6lv.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/regress/bcb5.mak b/test/regress/bcb5.mak
deleted file mode 100644
index 7ed4bd71..00000000
--- a/test/regress/bcb5.mak
+++ /dev/null
@@ -1,196 +0,0 @@
-
-# very basic makefile for regress
-#
-# Borland C++ tools
-#
-# BCROOT defines the root directory of your bcb install
-#
-!ifndef BCROOT
-BCROOT=$(MAKEDIR)\..
-!endif
-#
-# sources to compile for each test:
-#
-SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
-
-BCC32   = $(BCROOT)\bin\Bcc32.exe 
-TLINK32 = $(BCROOT)\bin\ILink32.exe
-
-IDE_LinkFLAGS32 =  -L$(BCROOT)\LIB
-LINKOPTS= -ap -Tpe -x
-CFLAGS= -O2 -tWC -DSTRICT; -Vx -Ve -w-inl -w-aus -w-csu -w-eff -w-rch -I$(BCROOT)\include;..\..\..\..\; -L..\..\..\..\stage\lib -L..\..\build\bcb5 $(CXXFLAGS)
-
-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 r1v.exe r2v.exe r3v.exe r4v.exe r5v.exe r6v.exe r1l.exe r2l.exe r3l.exe r4l.exe r5l.exe r6l.exe r1lm.exe r2lm.exe r3lm.exe r4lm.exe r5lm.exe r6lm.exe r1lv.exe r2lv.exe r3lv.exe r4lv.exe r5lv.exe r6lv.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 static VCL version....
-	r1v tests.txt test1252.txt
-	r2v tests.txt
-	r3v tests.txt
-	r4v tests.txt test1252.txt
-	r5v tests.txt
-	r6v tests.txt
-	echo testing dll single threaded 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 dll multi-threaded version....
-	r1lm tests.txt test1252.txt
-	r2lm tests.txt
-	r3lm tests.txt
-	r4lm tests.txt test1252.txt
-	r5lm tests.txt
-	r6lm tests.txt
-	echo testing dll VCL version....
-	r1lv tests.txt test1252.txt
-	r2lv tests.txt
-	r3lv tests.txt
-	r4lv tests.txt test1252.txt
-	r5lv tests.txt
-	r6lv tests.txt
-
-
-r1.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er1.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er2.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er3.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er4.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er5.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er6.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-	
-
-r1m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er1m.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er2m.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er3m.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er4m.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er5m.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er6m.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er1v.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er2v.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er3v.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er4v.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er5v.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er6v.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er1l.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er2l.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er3l.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er4l.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er5l.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er6l.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er1lm.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er2lm.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er3lm.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er4lm.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er5lm.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er6lm.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er1lv.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er2lv.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er3lv.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er4lv.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er5lv.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er6lv.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/regress/bcb6.mak b/test/regress/bcb6.mak
index c466728b..cc7ef6fa 100644
--- a/test/regress/bcb6.mak
+++ b/test/regress/bcb6.mak
@@ -11,7 +11,7 @@ BCROOT=$(MAKEDIR)\..
 #
 # sources to compile for each test:
 #
-SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=*.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 BCC32   = $(BCROOT)\bin\Bcc32.exe 
 TLINK32 = $(BCROOT)\bin\ILink32.exe
@@ -204,5 +204,6 @@ r6lv.exe : $(SOURCES)
 
 
 
+
 
 
diff --git a/test/regress/gcc.mak b/test/regress/gcc.mak
index 9309ff0d..6e2f4c11 100644
--- a/test/regress/gcc.mak
+++ b/test/regress/gcc.mak
@@ -7,7 +7,7 @@ CXX= g++ $(INCLUDES) -L../../../../stage/lib -I../../../../ -I./ $(CXXFLAGS) -L.
 #
 # sources to compile for each test:
 #
-SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=*.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 total : gcc_regress
 	export LD_LIBRARY_PATH="../../build/gcc:$LD_LIBRARY_PATH" && ./gcc_regress tests.txt
@@ -63,5 +63,6 @@ debug : $(SOURCES)
 
 
 
+
 
 
diff --git a/test/regress/main.cpp b/test/regress/main.cpp
index 8d320502..509dbeaf 100644
--- a/test/regress/main.cpp
+++ b/test/regress/main.cpp
@@ -22,7 +22,7 @@
 
 int error_count = 0;
 
-int cpp_main(int argc, char * argv[])
+int cpp_main(int /*argc*/, char * /*argv*/[])
 {
    basic_tests();
    test_simple_repeats();
diff --git a/test/regress/sunpro.mak b/test/regress/sunpro.mak
index 9ac427e7..0127da62 100644
--- a/test/regress/sunpro.mak
+++ b/test/regress/sunpro.mak
@@ -8,7 +8,7 @@ CXX= CC $(INCLUDES) -I../../../../ -I./ $(CXXFLAGS) -L../../../../stage/lib -L..
 #
 # sources to compile for each test:
 #
-SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=*.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 total : r rm r/regress rm/regress rs rms rs/regress rms/regress rw rmw rw/regress rmw/regress rsw rmsw rsw/regress rmsw/regress
 	echo testsing narrow character versions:
@@ -134,5 +134,6 @@ clean:
 
 
 
+
 
 
diff --git a/test/regress/test.hpp b/test/regress/test.hpp
index 229893f5..f3ae6b72 100644
--- a/test/regress/test.hpp
+++ b/test/regress/test.hpp
@@ -1,3 +1,20 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr John Maddock
+ *
+ * Use, modification and distribution are subject to the 
+ * Boost Software License, Version 1.0. (See accompanying file 
+ * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         test.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Macros for test cases.
+  */
 
 
 #ifndef BOOST_REGEX_REGRESS_TEST_HPP
@@ -7,6 +24,7 @@
 #include "test_regex_search.hpp"
 #include "test_regex_replace.hpp"
 #include "test_deprecated.hpp"
+#include "test_mfc.hpp"
 #include "test_locale.hpp"
 
 
@@ -45,6 +63,12 @@ void test(const charT& c, const tagT& tag)
       && (test_locale::c_locale_state() == test_locale::test_no_locale)
       &&(test_locale::cpp_locale_state() == test_locale::test_no_locale))
       test_deprecated(c, tag);
+   // test MFC/ATL wrappers:
+   test_info<charT>::set_typename("MFC/ATL interfaces");
+   if((test_locale::win_locale_state() == test_locale::test_no_locale)
+      && (test_locale::c_locale_state() == test_locale::test_no_locale)
+      &&(test_locale::cpp_locale_state() == test_locale::test_no_locale))
+      test_mfc(c, tag);
 }
 
 //
@@ -111,6 +135,12 @@ const int* make_array(int first, ...);
    TEST_REGEX_SEARCH_N(s, f, t, m, a);\
    TEST_REGEX_SEARCH_W(BOOST_JOIN(L, s), f, BOOST_JOIN(L, t), m, a)
 
+#if (defined(__GNUC__) && (__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))
+#define TEST_REGEX_SEARCH_L(s, f, t, m, a) TEST_REGEX_SEARCH_W(BOOST_JOIN(L, s), f, BOOST_JOIN(L, t), m, a)
+#else
+#define TEST_REGEX_SEARCH_L(s, f, t, m, a) TEST_REGEX_SEARCH(s, f, t, m, a)
+#endif
+
 //
 // define macros for testing regex replaces:
 //
diff --git a/test/regress/test_alt.cpp b/test/regress/test_alt.cpp
index b3bad655..01d7b2a9 100644
--- a/test/regress/test_alt.cpp
+++ b/test/regress/test_alt.cpp
@@ -11,6 +11,10 @@
 
 #include "test.hpp"
 
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
 void test_alt()
 {
    using namespace boost::regex_constants;
diff --git a/test/regress/test_anchors.cpp b/test/regress/test_anchors.cpp
index 8aff5f36..86dc67e3 100644
--- a/test/regress/test_anchors.cpp
+++ b/test/regress/test_anchors.cpp
@@ -11,6 +11,10 @@
 
 #include "test.hpp"
 
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
 void test_anchors()
 {
    // line anchors:
diff --git a/test/regress/test_asserts.cpp b/test/regress/test_asserts.cpp
index b4b35324..0e657950 100644
--- a/test/regress/test_asserts.cpp
+++ b/test/regress/test_asserts.cpp
@@ -11,6 +11,10 @@
 
 #include "test.hpp"
 
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
 void test_forward_lookahead_asserts()
 {
    //
diff --git a/test/regress/test_backrefs.cpp b/test/regress/test_backrefs.cpp
index 71e8fcbb..1a397896 100644
--- a/test/regress/test_backrefs.cpp
+++ b/test/regress/test_backrefs.cpp
@@ -11,6 +11,10 @@
 
 #include "test.hpp"
 
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
 void test_backrefs()
 {
    using namespace boost::regex_constants;
diff --git a/test/regress/test_deprecated.cpp b/test/regress/test_deprecated.cpp
index 9f1e6370..ae23df9d 100644
--- a/test/regress/test_deprecated.cpp
+++ b/test/regress/test_deprecated.cpp
@@ -19,6 +19,10 @@
 #include "test.hpp"
 #include <boost/cregex.hpp>
 
+#ifdef BOOST_MSVC
+#pragma warning(disable:4267)
+#endif
+
 int get_posix_compile_options(boost::regex_constants::syntax_option_type opts)
 {
    using namespace boost;
diff --git a/test/regress/test_escapes.cpp b/test/regress/test_escapes.cpp
index 45793071..61b441d2 100644
--- a/test/regress/test_escapes.cpp
+++ b/test/regress/test_escapes.cpp
@@ -11,6 +11,10 @@
 
 #include "test.hpp"
 
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
 void test_character_escapes()
 {
    using namespace boost::regex_constants;
diff --git a/test/regress/test_grep.cpp b/test/regress/test_grep.cpp
index 0b47e347..54dd62d7 100644
--- a/test/regress/test_grep.cpp
+++ b/test/regress/test_grep.cpp
@@ -11,6 +11,10 @@
 
 #include "test.hpp"
 
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
 void test_grep()
 {
    //
diff --git a/test/regress/test_locale.cpp b/test/regress/test_locale.cpp
index 9ab7f1d7..93e0bd77 100644
--- a/test/regress/test_locale.cpp
+++ b/test/regress/test_locale.cpp
@@ -11,10 +11,19 @@
 
 #include "test.hpp"
 #include <clocale>
-#ifndef BOOST_DISABLE_WIN32
+#if defined(BOOST_WINDOWS) && !defined(BOOST_DISABLE_WIN32)
+#include <boost/scoped_array.hpp>
 #include <windows.h>
 #endif
 
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
+#ifdef BOOST_NO_STDC_NAMESPACE
+namespace std{ using ::setlocale; }
+#endif
+
 test_locale::test_locale(const char* c_name, boost::uint32_t lcid)
 {
    // back up C locale and then set it's new name:
@@ -23,29 +32,69 @@ test_locale::test_locale(const char* c_name, boost::uint32_t lcid)
    if(std::setlocale(LC_ALL, c_name))
    {
       s_c_locale = test_with_locale;
+      std::cout << "Testing the global C locale: " << c_name << std::endl;
    }
    else
+   {
       s_c_locale = no_test;
-
+      std::cout << "The global C locale: " << c_name << " is not available and will not be tested." << std::endl;
+   }
+#ifndef BOOST_NO_STD_LOCALE
    // back up the C++ locale and create the new one:
    m_old_cpp_locale = s_cpp_locale_inst;
    m_old_cpp_state = s_cpp_locale;
    try{
       s_cpp_locale_inst = std::locale(c_name);
       s_cpp_locale = test_with_locale;
+      std::cout << "Testing the C++ locale: " << c_name << std::endl;
    }catch(std::runtime_error const &)
    {
       s_cpp_locale = no_test;
+      std::cout << "The C++ locale: " << c_name << " is not available and will not be tested." << std::endl;
    }
+#else
+   s_cpp_locale = no_test;
+#endif
 
    // back up win locale and create the new one:
    m_old_win_locale = s_win_locale_inst;
    m_old_win_state = s_win_locale;
    s_win_locale_inst = lcid;
+#if defined(BOOST_WINDOWS) && !defined(BOOST_DISABLE_WIN32)
+   //
+   // Start by geting the printable name of the locale.
+   // We use this for debugging purposes only:
+   //
+   boost::scoped_array<char> p;
+   int r = ::GetLocaleInfoA(
+               lcid,               // locale identifier
+               LOCALE_SCOUNTRY,    // information type
+               0,                  // information buffer
+               0                   // size of buffer
+            );
+   p.reset(new char[r+1]);
+   r = ::GetLocaleInfoA(
+               lcid,               // locale identifier
+               LOCALE_SCOUNTRY,    // information type
+               p.get(),            // information buffer
+               r+1                 // size of buffer
+            );
+   //
+   // now see if locale is installed and behave accordingly:
+   //
    if(::IsValidLocale(lcid, LCID_INSTALLED))
+   {
       s_win_locale = test_with_locale;
+      std::cout << "Testing the Win32 locale: \"" << p.get() << "\" (0x" << std::hex << lcid << ")" << std::endl;
+   }
    else
+   {
       s_win_locale = no_test;
+      std::cout << "The Win32 locale: \"" << p.get() << "\" (0x" << std::hex << lcid << ") is not available and will not be tested." << std::endl;
+   }
+#else
+   s_win_locale = no_test;
+#endif
 }
 
 test_locale::~test_locale()
@@ -53,7 +102,9 @@ test_locale::~test_locale()
    // restore to previous state:
    std::setlocale(LC_ALL, m_old_c_locale.c_str());
    s_c_locale = m_old_c_state;
+#ifndef BOOST_NO_STD_LOCALE
    s_cpp_locale_inst = m_old_cpp_locale;
+#endif
    s_cpp_locale = m_old_cpp_state;
    s_win_locale_inst = m_old_win_locale;
    s_win_locale = m_old_win_state;
@@ -62,7 +113,9 @@ test_locale::~test_locale()
 int test_locale::s_c_locale = test_no_locale;
 int test_locale::s_cpp_locale = test_no_locale;
 int test_locale::s_win_locale = test_no_locale;
+#ifndef BOOST_NO_STD_LOCALE
 std::locale test_locale::s_cpp_locale_inst;
+#endif
 boost::uint32_t test_locale::s_win_locale_inst = 0;
 
 
@@ -71,24 +124,24 @@ void test_en_locale(const char* name, boost::uint32_t lcid)
    using namespace boost::regex_constants;
    errors_as_warnings w;
    test_locale l(name, lcid);
-   TEST_REGEX_SEARCH("[[:lower:]]+", perl, "Þßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ÷", match_default, make_array(1, 32, -2, -2));
-   TEST_REGEX_SEARCH("[[:upper:]]+", perl, "¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞß", match_default, make_array(1, 31, -2, -2));
-   TEST_REGEX_SEARCH("[[:punct:]]+", perl, "¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À", match_default, make_array(0, 31, -2, -2));
-   TEST_REGEX_SEARCH("[[:print:]]+", perl, "¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ", match_default, make_array(0, 94, -2, -2));
-   TEST_REGEX_SEARCH("[[:graph:]]+", perl, "¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ", match_default, make_array(0, 94, -2, -2));
-   TEST_REGEX_SEARCH("[[:word:]]+", perl, "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ", match_default, make_array(0, 61, -2, -2));
+   TEST_REGEX_SEARCH_L("[[:lower:]]+", perl, "Þßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ÷", match_default, make_array(1, 32, -2, -2));
+   TEST_REGEX_SEARCH_L("[[:upper:]]+", perl, "¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞß", match_default, make_array(1, 31, -2, -2));
+   TEST_REGEX_SEARCH_L("[[:punct:]]+", perl, "¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À", match_default, make_array(0, 31, -2, -2));
+   TEST_REGEX_SEARCH_L("[[:print:]]+", perl, "¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ", match_default, make_array(0, 94, -2, -2));
+   TEST_REGEX_SEARCH_L("[[:graph:]]+", perl, "¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ", match_default, make_array(0, 94, -2, -2));
+   TEST_REGEX_SEARCH_L("[[:word:]]+", perl, "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ", match_default, make_array(0, 61, -2, -2));
    // collation sensitive ranges:
 #if !BOOST_WORKAROUND(__BORLANDC__, < 0x600)
    // these tests are disabled for Borland C++: a bug in std::collate<wchar_t>
    // causes these tests to crash (pointer overrun in std::collate<wchar_t>::do_transform).
-   TEST_REGEX_SEARCH("[a-z]+", perl|collate, "ßàáâãäåçèéêëìíîïðñòóôõöøùúûü", match_default, make_array(0, 28, -2, -2));
-   TEST_REGEX_SEARCH("[a-z]+", perl|collate, "¿ÀÁÂÃÄÅÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜ", match_default, make_array(1, 28, -2, -2));
+   TEST_REGEX_SEARCH_L("[a-z]+", perl|collate, "ßàáâãäåçèéêëìíîïðñòóôõöøùúûü", match_default, make_array(0, 28, -2, -2));
+   TEST_REGEX_SEARCH_L("[a-z]+", perl|collate, "¿ÀÁÂÃÄÅÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜ", match_default, make_array(1, 28, -2, -2));
    // and equivalence classes:
-   TEST_REGEX_SEARCH("[[=a=]]+", perl, "aAàáâãäåÀÁÂÃÄÅ", match_default, make_array(0, 14, -2, -2));
+   TEST_REGEX_SEARCH_L("[[=a=]]+", perl, "aAàáâãäåÀÁÂÃÄÅ", match_default, make_array(0, 14, -2, -2));
    // case mapping:
-   TEST_REGEX_SEARCH("[A-Z]+", perl|icase|collate, "ßàáâãäåçèéêëìíîïðñòóôõöøùúûü", match_default, make_array(0, 28, -2, -2));
-   TEST_REGEX_SEARCH("[a-z]+", perl|icase|collate, "¿ÀÁÂÃÄÅÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜ", match_default, make_array(1, 28, -2, -2));
-   TEST_REGEX_SEARCH("ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝ", perl|icase, "ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ", match_default, make_array(1, 30, -2, -2));
+   TEST_REGEX_SEARCH_L("[A-Z]+", perl|icase|collate, "ßàáâãäåçèéêëìíîïðñòóôõöøùúûü", match_default, make_array(0, 28, -2, -2));
+   TEST_REGEX_SEARCH_L("[a-z]+", perl|icase|collate, "¿ÀÁÂÃÄÅÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜ", match_default, make_array(1, 28, -2, -2));
+   TEST_REGEX_SEARCH_L("ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝ", perl|icase, "ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ", match_default, make_array(1, 30, -2, -2));
 #endif
 }
 
diff --git a/test/regress/test_locale.hpp b/test/regress/test_locale.hpp
index 050fc623..b3383c69 100644
--- a/test/regress/test_locale.hpp
+++ b/test/regress/test_locale.hpp
@@ -1,3 +1,20 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr John Maddock
+ *
+ * Use, modification and distribution are subject to the 
+ * Boost Software License, Version 1.0. (See accompanying file 
+ * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         test_locale.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Helper classes for testing locale-specific expressions.
+  */
 
 
 #ifndef BOOST_REGEX_REGRESS_TEST_LOCALE_HPP
@@ -29,11 +46,12 @@ public:
    {
       return s_win_locale;
    }
-
+#ifndef BOOST_NO_STD_LOCALE
    static std::locale cpp_locale()
    {
       return s_cpp_locale_inst;
    }
+#endif
    static boost::uint32_t win_locale()
    {
       return s_win_locale_inst;
@@ -45,13 +63,17 @@ private:
    static int s_cpp_locale;
    static int s_win_locale;
    // current locales:
+#ifndef BOOST_NO_STD_LOCALE
    static std::locale s_cpp_locale_inst;
+#endif
    static boost::uint32_t s_win_locale_inst;
 
    // backed up versions of the previous locales and their action state:
    std::string     m_old_c_locale;
    int             m_old_c_state;
+#ifndef BOOST_NO_STD_LOCALE
    std::locale     m_old_cpp_locale;
+#endif
    int             m_old_cpp_state;
    boost::uint32_t m_old_win_locale;
    int             m_old_win_state;
diff --git a/test/regress/test_mfc.cpp b/test/regress/test_mfc.cpp
new file mode 100644
index 00000000..39afcb66
--- /dev/null
+++ b/test/regress/test_mfc.cpp
@@ -0,0 +1,555 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr John Maddock
+ *
+ * Use, modification and distribution are subject to the 
+ * Boost Software License, Version 1.0. (See accompanying file 
+ * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         test_mfc.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Test code for MFC/ATL strings with Boost.Regex.
+  */
+
+//
+// We can only build this if we have ATL support:
+//
+#include <boost/config.hpp>
+
+#if (defined(BOOST_MSVC) || defined(__ICL)) && (_MSC_VER >= 1300)
+#  define TEST_MFC
+#endif
+
+#ifdef TEST_MFC
+
+#include <boost/regex/mfc.hpp>
+#include "test.hpp"
+#include "atlstr.h"
+
+#pragma warning(disable:4267)
+
+void test_mfc(const char&, const test_regex_search_tag&)
+{
+   const std::string& ss = test_info<char>::search_text();
+   const std::string& ss2 = test_info<char>::expression();
+   CAtlStringA s(ss.c_str(), ss.size());
+   CAtlStringA s2(ss2.c_str(), ss2.size());
+   boost::regex_constants::match_flag_type opts = test_info<char>::match_options();
+   const int* answer_table = test_info<char>::answer_table();
+   boost::regex r = boost::make_regex(s2, test_info<char>::syntax_options());
+   boost::cmatch what;
+   if(boost::regex_search(
+      s,
+      what,
+      r,
+      opts))
+   {
+      test_result(what, s.GetString(), answer_table);
+   }
+   else if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", char);
+   }
+   //
+   // regex_match tests:
+   //
+   if(answer_table[0] < 0)
+   {
+      if(boost::regex_match(s, r, opts))
+      {
+         BOOST_REGEX_TEST_ERROR("boost::regex_match found a match when it should not have done so.", char);
+      }
+   }
+   else
+   {
+      if((answer_table[0] > 0) && boost::regex_match(s, r, opts))
+      {
+         BOOST_REGEX_TEST_ERROR("boost::regex_match found a match when it should not have done so.", char);
+      }
+      else if((answer_table[0] == 0) && (answer_table[1] == static_cast<int>(ss.size())))
+      {
+         if(boost::regex_match(
+            s,
+            what,
+            r,
+            opts))
+         {
+            test_result(what, s.GetString(), answer_table);
+            if(!boost::regex_match(s, r, opts))
+            {
+               // we should have had a match but didn't:
+               BOOST_REGEX_TEST_ERROR("Expected match was not found.", char);
+            }
+         }
+         else if(answer_table[0] >= 0)
+         {
+            // we should have had a match but didn't:
+            BOOST_REGEX_TEST_ERROR("Expected match was not found.", char);
+         }
+      }
+   }
+   //
+   // test regex_iterator:
+   //
+   boost::cregex_iterator start(boost::make_regex_iterator(s, r, opts)), end;
+   boost::cregex_iterator copy(start);
+   while(start != end)
+   {
+      if(start != copy)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", char);
+      }
+      if(!(start == copy))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", char);
+      }
+      test_result(*start, s.GetString(), answer_table);
+      ++start;
+      ++copy;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", char);
+   }
+   //
+   // test regex_token_iterator:
+   //
+   typedef boost::regex_token_iterator<const char*> token_iterator;
+   answer_table = test_info<char>::answer_table();
+   //
+   // we start by testing sub-expression 0:
+   //
+   token_iterator tstart(boost::make_regex_token_iterator(s, r, 0, opts)), tend;
+   token_iterator tcopy(tstart);
+   while(tstart != tend)
+   {
+      if(tstart != tcopy)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", char);
+      }
+      if(!(tstart == tcopy))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", char);
+      }
+      test_sub_match(*tstart, s.GetString(), answer_table, 0);
+      ++tstart;
+      ++tcopy;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", char);
+   }
+   //
+   // and now field spitting:
+   //
+   token_iterator tstart2(boost::make_regex_token_iterator(s, r, -1, opts)), tend2;
+   token_iterator tcopy2(tstart2);
+   int last_end2 = 0;
+   answer_table = test_info<char>::answer_table();
+   while(tstart2 != tend2)
+   {
+      if(tstart2 != tcopy2)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", char);
+      }
+      if(!(tstart2 == tcopy2))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", char);
+      }
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4244)
+#endif
+      if(std::distance(s.GetString(), tstart2->first) != last_end2)
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Error in location of start of field split, found: " 
+            << std::distance(s.GetString(), tstart2->first)
+            << ", expected: "
+            << last_end2
+            << ".", char);
+      }
+      int expected_end = static_cast<int>(answer_table[0] < 0 ? s.GetLength() : answer_table[0]);
+      if(std::distance(s.GetString(), tstart2->second) != expected_end)
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Error in location of end2 of field split, found: "
+            << std::distance(s.GetString(), tstart2->second)
+            << ", expected: "
+            << expected_end
+            << ".", char);
+      }
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+      last_end2 = answer_table[1];
+      ++tstart2;
+      ++tcopy2;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", char);
+   }
+
+}
+
+void test_mfc(const wchar_t&, const test_regex_search_tag&)
+{
+   const std::wstring& ss = test_info<wchar_t>::search_text();
+   const std::wstring& ss2 = test_info<wchar_t>::expression();
+   CAtlStringW s(ss.c_str(), ss.size());
+   CAtlStringW s2(ss2.c_str(), ss2.size());
+   boost::regex_constants::match_flag_type opts = test_info<wchar_t>::match_options();
+   const int* answer_table = test_info<wchar_t>::answer_table();
+   boost::wregex r = boost::make_regex(s2, test_info<wchar_t>::syntax_options());
+   boost::wcmatch what;
+   if(boost::regex_search(
+      s,
+      what,
+      r,
+      opts))
+   {
+      test_result(what, s.GetString(), answer_table);
+   }
+   else if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", wchar_t);
+   }
+   //
+   // regex_match tests:
+   //
+   if(answer_table[0] < 0)
+   {
+      if(boost::regex_match(s, r, opts))
+      {
+         BOOST_REGEX_TEST_ERROR("boost::regex_match found a match when it should not have done so.", wchar_t);
+      }
+   }
+   else
+   {
+      if((answer_table[0] > 0) && boost::regex_match(s, r, opts))
+      {
+         BOOST_REGEX_TEST_ERROR("boost::regex_match found a match when it should not have done so.", wchar_t);
+      }
+      else if((answer_table[0] == 0) && (answer_table[1] == static_cast<int>(ss.size())))
+      {
+         if(boost::regex_match(
+            s,
+            what,
+            r,
+            opts))
+         {
+            test_result(what, s.GetString(), answer_table);
+            if(!boost::regex_match(s, r, opts))
+            {
+               // we should have had a match but didn't:
+               BOOST_REGEX_TEST_ERROR("Expected match was not found.", wchar_t);
+            }
+         }
+         else if(answer_table[0] >= 0)
+         {
+            // we should have had a match but didn't:
+            BOOST_REGEX_TEST_ERROR("Expected match was not found.", wchar_t);
+         }
+      }
+   }
+   //
+   // test regex_iterator:
+   //
+   boost::wcregex_iterator start(boost::make_regex_iterator(s, r, opts)), end;
+   boost::wcregex_iterator copy(start);
+   while(start != end)
+   {
+      if(start != copy)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", wchar_t);
+      }
+      if(!(start == copy))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", wchar_t);
+      }
+      test_result(*start, s.GetString(), answer_table);
+      ++start;
+      ++copy;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", wchar_t);
+   }
+   //
+   // test regex_token_iterator:
+   //
+   typedef boost::regex_token_iterator<const wchar_t*> token_iterator;
+   answer_table = test_info<wchar_t>::answer_table();
+   //
+   // we start by testing sub-expression 0:
+   //
+   token_iterator tstart(boost::make_regex_token_iterator(s, r, 0, opts)), tend;
+   token_iterator tcopy(tstart);
+   while(tstart != tend)
+   {
+      if(tstart != tcopy)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", wchar_t);
+      }
+      if(!(tstart == tcopy))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", wchar_t);
+      }
+      test_sub_match(*tstart, s.GetString(), answer_table, 0);
+      ++tstart;
+      ++tcopy;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", wchar_t);
+   }
+   //
+   // and now field spitting:
+   //
+   token_iterator tstart2(boost::make_regex_token_iterator(s, r, -1, opts)), tend2;
+   token_iterator tcopy2(tstart2);
+   int last_end2 = 0;
+   answer_table = test_info<wchar_t>::answer_table();
+   while(tstart2 != tend2)
+   {
+      if(tstart2 != tcopy2)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", wchar_t);
+      }
+      if(!(tstart2 == tcopy2))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", wchar_t);
+      }
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4244)
+#endif
+      if(std::distance(s.GetString(), tstart2->first) != last_end2)
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Error in location of start of field split, found: " 
+            << std::distance(s.GetString(), tstart2->first)
+            << ", expected: "
+            << last_end2
+            << ".", wchar_t);
+      }
+      int expected_end = static_cast<int>(answer_table[0] < 0 ? s.GetLength() : answer_table[0]);
+      if(std::distance(s.GetString(), tstart2->second) != expected_end)
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Error in location of end2 of field split, found: "
+            << std::distance(s.GetString(), tstart2->second)
+            << ", expected: "
+            << expected_end
+            << ".", wchar_t);
+      }
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+      last_end2 = answer_table[1];
+      ++tstart2;
+      ++tcopy2;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", wchar_t);
+   }
+
+}
+
+void test_mfc(const char&, const test_invalid_regex_tag&)
+{
+   std::string ss = test_info<char>::expression();
+   CAtlStringA s(ss.c_str(), ss.size());
+   bool have_catch = false;
+   try{
+      boost::regex e = boost::make_regex(s, test_info<char>::syntax_options());
+      if(e.error_code())
+         have_catch = true;
+   }
+   catch(const boost::bad_expression&)
+   {
+      have_catch = true;
+   }
+   catch(const std::runtime_error& r)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but a std::runtime_error instead: " << r.what(), char);
+   }
+   catch(const std::exception& r)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but a std::exception instead: " << r.what(), char);
+   }
+   catch(...)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but got an exception of unknown type instead", char);
+   }
+   if(!have_catch)
+   {
+      // oops expected exception was not thrown:
+      BOOST_REGEX_TEST_ERROR("Expected an exception, but didn't find one.", char);
+   }
+
+}
+
+void test_mfc(const wchar_t&, const test_invalid_regex_tag&)
+{
+   std::wstring ss = test_info<wchar_t>::expression();
+   CAtlStringW s(ss.c_str(), ss.size());
+   bool have_catch = false;
+   try{
+      boost::wregex e = boost::make_regex(s, test_info<wchar_t>::syntax_options());
+      if(e.error_code())
+         have_catch = true;
+   }
+   catch(const boost::bad_expression&)
+   {
+      have_catch = true;
+   }
+   catch(const std::runtime_error& r)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but a std::runtime_error instead: " << r.what(), wchar_t);
+   }
+   catch(const std::exception& r)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but a std::exception instead: " << r.what(), wchar_t);
+   }
+   catch(...)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but got an exception of unknown type instead", wchar_t);
+   }
+   if(!have_catch)
+   {
+      // oops expected exception was not thrown:
+      BOOST_REGEX_TEST_ERROR("Expected an exception, but didn't find one.", wchar_t);
+   }
+}
+
+void test_mfc(const char&, const test_regex_replace_tag&)
+{
+   const CStringA expression(test_info<char>::expression().c_str(), test_info<char>::expression().size());
+   boost::regex_constants::syntax_option_type syntax_options = test_info<char>::syntax_options();
+   try{
+      boost::regex r = boost::make_regex(expression, syntax_options);
+      if(r.status())
+      {
+         BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done, error code = " << r.status(), char);
+      }
+      const CStringA search_text(test_info<char>::search_text().c_str(), test_info<char>::search_text().size());
+      boost::regex_constants::match_flag_type opts = test_info<char>::match_options();
+      const CStringA format_string(test_info<char>::format_string().c_str(), test_info<char>::format_string().size());
+      const CStringA result_string(test_info<char>::result_string().c_str(), test_info<char>::result_string().size());
+
+      CStringA result = boost::regex_replace(search_text, r, format_string, opts);
+      if(result != result_string)
+      {
+         BOOST_REGEX_TEST_ERROR("regex_replace generated an incorrect string result", char);
+      }
+   }
+   catch(const boost::bad_expression& e)
+   {
+      BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done: " << e.what(), char);
+   }
+   catch(const std::runtime_error& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::runtime_error: " << r.what(), char);
+   }
+   catch(const std::exception& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::exception: " << r.what(), char);
+   }
+   catch(...)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected exception of unknown type", char);
+   }
+}
+
+void test_mfc(const wchar_t&, const test_regex_replace_tag&)
+{
+   const CStringW expression(test_info<wchar_t>::expression().c_str(), test_info<wchar_t>::expression().size());
+   boost::regex_constants::syntax_option_type syntax_options = test_info<wchar_t>::syntax_options();
+   try{
+      boost::wregex r = boost::make_regex(expression, syntax_options);
+      if(r.status())
+      {
+         BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done, error code = " << r.status(), wchar_t);
+      }
+      const CStringW search_text(test_info<wchar_t>::search_text().c_str(), test_info<wchar_t>::search_text().size());
+      boost::regex_constants::match_flag_type opts = test_info<wchar_t>::match_options();
+      const CStringW format_string(test_info<wchar_t>::format_string().c_str(), test_info<wchar_t>::format_string().size());
+      const CStringW result_string(test_info<wchar_t>::result_string().c_str(), test_info<wchar_t>::result_string().size());
+
+      CStringW result = boost::regex_replace(search_text, r, format_string, opts);
+      if(result != result_string)
+      {
+         BOOST_REGEX_TEST_ERROR("regex_replace generated an incorrect string result", wchar_t);
+      }
+   }
+   catch(const boost::bad_expression& e)
+   {
+      BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done: " << e.what(), wchar_t);
+   }
+   catch(const std::runtime_error& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::runtime_error: " << r.what(), wchar_t);
+   }
+   catch(const std::exception& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::exception: " << r.what(), wchar_t);
+   }
+   catch(...)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected exception of unknown type", wchar_t);
+   }
+}
+
+#else
+
+#include "test.hpp"
+
+void test_mfc(const char&, const test_regex_search_tag&){}
+void test_mfc(const wchar_t&, const test_regex_search_tag&){}
+void test_mfc(const char&, const test_invalid_regex_tag&){}
+void test_mfc(const wchar_t&, const test_invalid_regex_tag&){}
+void test_mfc(const char&, const test_regex_replace_tag&){}
+void test_mfc(const wchar_t&, const test_regex_replace_tag&){}
+
+
+#endif
diff --git a/test/regress/test_mfc.hpp b/test/regress/test_mfc.hpp
new file mode 100644
index 00000000..80857364
--- /dev/null
+++ b/test/regress/test_mfc.hpp
@@ -0,0 +1,36 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr John Maddock
+ *
+ * Use, modification and distribution are subject to the 
+ * Boost Software License, Version 1.0. (See accompanying file 
+ * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ *
+ */
+
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         test_mfc.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: MFC/ATL test handlers.
+  */
+
+#ifndef TEST_MFC_HPP
+#define TEST_MFC_HPP
+
+template <class charT, class Tag>
+void test_mfc(const charT&, const Tag&)
+{
+   // do nothing
+}
+
+void test_mfc(const char&, const test_regex_search_tag&);
+void test_mfc(const wchar_t&, const test_regex_search_tag&);
+void test_mfc(const char&, const test_invalid_regex_tag&);
+void test_mfc(const wchar_t&, const test_invalid_regex_tag&);
+void test_mfc(const char&, const test_regex_replace_tag&);
+void test_mfc(const wchar_t&, const test_regex_replace_tag&);
+
+
+#endif
diff --git a/test/regress/test_non_greedy_repeats.cpp b/test/regress/test_non_greedy_repeats.cpp
index 6d40cc03..7a073c2f 100644
--- a/test/regress/test_non_greedy_repeats.cpp
+++ b/test/regress/test_non_greedy_repeats.cpp
@@ -11,6 +11,10 @@
 
 #include "test.hpp"
 
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
 void test_non_greedy_repeats()
 {
    //
diff --git a/test/regress/test_perl_ex.cpp b/test/regress/test_perl_ex.cpp
index 6aca6a7e..b3914371 100644
--- a/test/regress/test_perl_ex.cpp
+++ b/test/regress/test_perl_ex.cpp
@@ -11,6 +11,10 @@
 
 #include "test.hpp"
 
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
 void test_independent_subs()
 {
    using namespace boost::regex_constants;
diff --git a/test/regress/test_regex_search.hpp b/test/regress/test_regex_search.hpp
index 16930693..f3a1fd9e 100644
--- a/test/regress/test_regex_search.hpp
+++ b/test/regress/test_regex_search.hpp
@@ -110,6 +110,7 @@ void test_regex_iterator(boost::basic_regex<charT, traits>& r)
    const int* answer_table = test_info<charT>::answer_table();
    test_iterator start(search_text.begin(), search_text.end(), r, opts), end;
    test_iterator copy(start);
+   const_iterator last_end = search_text.begin();
    while(start != end)
    {
       if(start != copy)
@@ -121,10 +122,129 @@ void test_regex_iterator(boost::basic_regex<charT, traits>& r)
          BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", charT);
       }
       test_result(*start, search_text.begin(), answer_table);
+      // test $` and $' :
+      if(start->prefix().first != last_end)
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for start of $`", charT);
+      }
+      if(start->prefix().second != (*start)[0].first)
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for end of $`", charT);
+      }
+      if(start->prefix().matched != (start->prefix().first != start->prefix().second))
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for matched member of $`", charT);
+      }
+      if(start->suffix().first != (*start)[0].second)
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for start of $'", charT);
+      }
+      if(start->suffix().second != search_text.end())
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for end of $'", charT);
+      }
+      if(start->suffix().matched != (start->suffix().first != start->suffix().second))
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for matched member of $'", charT);
+      }
+      last_end = (*start)[0].second;
       ++start;
       ++copy;
       // move on the answer table to next set of answers;
-      while(*answer_table++ != -2){}
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", charT);
+   }
+}
+
+template<class charT, class traits>
+void test_regex_token_iterator(boost::basic_regex<charT, traits>& r)
+{
+   typedef typename std::basic_string<charT>::const_iterator const_iterator;
+   typedef boost::regex_token_iterator<const_iterator, charT, traits> test_iterator;
+   const std::basic_string<charT>& search_text = test_info<charT>::search_text();
+   boost::regex_constants::match_flag_type opts = test_info<charT>::match_options();
+   const int* answer_table = test_info<charT>::answer_table();
+   //
+   // we start by testing sub-expression 0:
+   //
+   test_iterator start(search_text.begin(), search_text.end(), r, 0, opts), end;
+   test_iterator copy(start);
+   while(start != end)
+   {
+      if(start != copy)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", charT);
+      }
+      if(!(start == copy))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", charT);
+      }
+      test_sub_match(*start, search_text.begin(), answer_table, 0);
+      ++start;
+      ++copy;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", charT);
+   }
+   //
+   // and now field spitting:
+   //
+   test_iterator start2(search_text.begin(), search_text.end(), r, -1, opts), end2;
+   test_iterator copy2(start2);
+   int last_end2 = 0;
+   answer_table = test_info<charT>::answer_table();
+   while(start2 != end2)
+   {
+      if(start2 != copy2)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", charT);
+      }
+      if(!(start2 == copy2))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", charT);
+      }
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4244)
+#endif
+      if(std::distance(search_text.begin(), start2->first) != last_end2)
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Error in location of start of field split, found: " 
+            << std::distance(search_text.begin(), start2->first)
+            << ", expected: "
+            << last_end2
+            << ".", charT);
+      }
+      int expected_end = static_cast<int>(answer_table[0] < 0 ? search_text.size() : answer_table[0]);
+      if(std::distance(search_text.begin(), start2->second) != expected_end)
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Error in location of end2 of field split, found: "
+            << std::distance(search_text.begin(), start2->second)
+            << ", expected: "
+            << expected_end
+            << ".", charT);
+      }
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+      last_end2 = answer_table[1];
+      ++start2;
+      ++copy2;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
    }
    if(answer_table[0] >= 0)
    {
@@ -145,7 +265,8 @@ struct grep_test_predicate
    {
       test_result(what, m_base, m_table);
       // move on the answer table to next set of answers;
-      while(*m_table++ != -2){}
+      if(*m_table != -2)
+         while(*m_table++ != -2){}
       return true;
    }
 private:
@@ -218,6 +339,7 @@ void test(boost::basic_regex<charT, traits>& r, const test_regex_search_tag&)
       }
       test_simple_search(r);
       test_regex_iterator(r);
+      test_regex_token_iterator(r);
       test_regex_grep(r);
       test_regex_match(r);
    }
diff --git a/test/regress/test_replace.cpp b/test/regress/test_replace.cpp
index c10c94f8..6ce95d2c 100644
--- a/test/regress/test_replace.cpp
+++ b/test/regress/test_replace.cpp
@@ -11,6 +11,10 @@
 
 #include "test.hpp"
 
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
 void test_replace()
 {
    using namespace boost::regex_constants;
diff --git a/test/regress/test_sets.cpp b/test/regress/test_sets.cpp
index e975a355..020f46b1 100644
--- a/test/regress/test_sets.cpp
+++ b/test/regress/test_sets.cpp
@@ -11,6 +11,10 @@
 
 #include "test.hpp"
 
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
 void test_sets()
 {
    using namespace boost::regex_constants;
@@ -117,6 +121,19 @@ void test_sets()
    TEST_REGEX_SEARCH("\\W", perl, "`", match_default, make_array(0, 1, -2, -2));
    TEST_REGEX_SEARCH("\\W", perl, "[", match_default, make_array(0, 1, -2, -2));
    TEST_REGEX_SEARCH("\\W", perl, "@", match_default, make_array(0, 1, -2, -2));
+
+   TEST_REGEX_SEARCH("[[:lower:]]", perl|icase, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:upper:]]", perl|icase, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:alpha:]]", perl|icase, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:alnum:]]", perl|icase, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:lower:]]", perl|icase, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:upper:]]", perl|icase, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:alpha:]]", perl|icase, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:alnum:]]", perl|icase, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:lower:][:upper:]]", perl, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:lower:][:upper:]]", perl, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:lower:][:alpha:]]", perl, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:lower:][:alpha:]]", perl, "a", match_default, make_array(0, 1, -2, -2));
 }
 
 void test_sets2()
diff --git a/test/regress/test_simple_repeats.cpp b/test/regress/test_simple_repeats.cpp
index 905d4a30..8c8efee9 100644
--- a/test/regress/test_simple_repeats.cpp
+++ b/test/regress/test_simple_repeats.cpp
@@ -11,6 +11,10 @@
 
 #include "test.hpp"
 
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
 void test_simple_repeats()
 {
    using namespace boost::regex_constants;
diff --git a/test/regress/test_tricky_cases.cpp b/test/regress/test_tricky_cases.cpp
index 31422b6b..cdcdb6f8 100644
--- a/test/regress/test_tricky_cases.cpp
+++ b/test/regress/test_tricky_cases.cpp
@@ -11,6 +11,10 @@
 
 #include "test.hpp"
 
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
 void test_tricky_cases()
 {
    using namespace boost::regex_constants;
diff --git a/test/regress/vc6-stlport.mak b/test/regress/vc6-stlport.mak
index 0dd6a515..858daf15 100644
--- a/test/regress/vc6-stlport.mak
+++ b/test/regress/vc6-stlport.mak
@@ -24,7 +24,7 @@ XLFLAGS=
 #
 # sources to compile for each test:
 #
-SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=*.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 !IF "$(MSVCDIR)" == ""
 !ERROR Variable MSVCDIR not set.
@@ -219,3 +219,4 @@ r6mdd.exe : $(SOURCES)
 
 
 
+
diff --git a/test/regress/vc6.mak b/test/regress/vc6.mak
index 8c0cab3e..5f450ac9 100644
--- a/test/regress/vc6.mak
+++ b/test/regress/vc6.mak
@@ -18,7 +18,7 @@ XLFLAGS=
 #
 # sources to compile for each test:
 #
-SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=*.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 CFLAGS= $(INCLUDES) /O2 /GB /GF /Gy -GX -GR -I..\..\..\..\ $(CXXFLAGS)
 
@@ -227,5 +227,6 @@ r6lmd.exe : $(SOURCES)
 
 
 
+
 
 
diff --git a/test/regress/vc7.mak b/test/regress/vc7.mak
index 7a1794f7..6a3d1e22 100644
--- a/test/regress/vc7.mak
+++ b/test/regress/vc7.mak
@@ -18,7 +18,7 @@ XLFLAGS=
 #
 # sources to compile for each test:
 #
-SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=*.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 CFLAGS= $(INCLUDES) /O2 /GB /GF /Gy -GX -GR -I..\..\..\..\ $(CXXFLAGS) /DBOOST_LIB_DIAGNOSTIC=1 /Zc:wchar_t
 
@@ -229,5 +229,6 @@ r6lmd.exe : $(SOURCES)
 
 
 
+
 
 
diff --git a/test/regress/vc71.mak b/test/regress/vc71.mak
index 008e97fa..0a4521c6 100644
--- a/test/regress/vc71.mak
+++ b/test/regress/vc71.mak
@@ -18,7 +18,7 @@ XLFLAGS=
 #
 # sources to compile for each test:
 #
-SOURCES=basic_tests.cpp main.cpp test_deprecated.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=*.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 CFLAGS= $(INCLUDES) /GB /GF /Gy -GX -GR -I..\..\..\..\ $(CXXFLAGS) /DBOOST_LIB_DIAGNOSTIC=1 /Zc:wchar_t
 
@@ -240,5 +240,6 @@ r6lmd.exe : $(SOURCES)
 
 
 
+