diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 854ad300..01b14e26 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -192,11 +192,19 @@ if [ check-icu-config ] if $(gHAS_ICU) { BOOST_REGEX_ICU_OPTS = "freebsd:/usr/local/include" ; - ICU_SEARCH_OPTS = "freebsd:/$(ICU_PATH)/lib" ; + ICU_SEARCH_OPTS = "freebsd:$(ICU_PATH)/lib" ; BOOST_REGEX_ICU_OPTS += "BOOST_HAS_ICU=1" ; + BOOST_REGEX_ICU_OPTS += "$(gICU_LIBS)" ; if $(ICU_PATH) { + # If ICU_PATH is specified on the command line, then it's + # relative to the current directory, while paths specified + # in a Jamfile are relative to that Jamfile. So, to + # avoid confusing the user if he's not running from + # libs/regex/build, explicitly root this. + ICU_PATH = [ path.native + [ path.root [ path.make $(ICU_PATH) ] [ path.pwd ] ] ] ; if $(ICU_PATH) != "/usr" && $(ICU_PATH) != "/usr/local" { BOOST_REGEX_ICU_OPTS += "$(ICU_PATH)/include" ; diff --git a/doc/history.qbk b/doc/history.qbk index 360f8922..d21de129 100644 --- a/doc/history.qbk +++ b/doc/history.qbk @@ -8,6 +8,27 @@ [section:history History] +New issues should be submitted at [@http:svn.boost.org svn.boost.org] - don't forget to include your +email address in the ticket! + +Currently open issues can be viewed [@https://svn.boost.org/trac/boost/query?status=assigned&status=new&status=reopened&component=regex&order=priority&col=id&col=summary&col=status&col=type&col=milestone&col=component here]. + +All issues including closed ones can be viewed [@https://svn.boost.org/trac/boost/query?status=assigned&status=closed&status=new&status=reopened&component=regex&order=priority&col=id&col=summary&col=status&col=type&col=milestone&col=component here]. + +[h4 Boost 1.42] + +* Added support for Functors rather than strings as format expressions. +* Improved error reporting when throwing exceptions to include better more relevant information. +* Fixed tickets +[@https://svn.boost.org/trac/boost/ticket/2802 #2802], +[@https://svn.boost.org/trac/boost/ticket/3425 #3425], +[@https://svn.boost.org/trac/boost/ticket/3507 #3507], +[@https://svn.boost.org/trac/boost/ticket/3546 #3546], +[@https://svn.boost.org/trac/boost/ticket/3631 #3631], +[@https://svn.boost.org/trac/boost/ticket/3632 #3632], +[@https://svn.boost.org/trac/boost/ticket/3715 #3715], +[@https://svn.boost.org/trac/boost/ticket/3718 #3718] + [h4 Boost 1.40] * Added support for many Perl 5.10 syntax elements including named diff --git a/doc/html/boost_regex/background_information.html b/doc/html/boost_regex/background_information.html index 76048eed..897462fa 100644 --- a/doc/html/boost_regex/background_information.html +++ b/doc/html/boost_regex/background_information.html @@ -1,6 +1,6 @@ - + Background Information @@ -47,7 +47,7 @@ -
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/background_information/acknowledgements.html b/doc/html/boost_regex/background_information/acknowledgements.html index 68565667..b326730e 100644 --- a/doc/html/boost_regex/background_information/acknowledgements.html +++ b/doc/html/boost_regex/background_information/acknowledgements.html @@ -1,6 +1,6 @@ - + Acknowledgements @@ -49,13 +49,13 @@

The following people have all contributed useful comments or fixes: Dave - Abrahams, Mike Allison, Edan Ayal, Jayashree Balasubramanian, Jan Bölsche, + Abrahams, Mike Allison, Edan Ayal, Jayashree Balasubramanian, Jan Bölsche, Beman Dawes, Paul Baxter, David Bergman, David Dennerline, Edward Diener, Peter Dimov, Robert Dunn, Fabio Forno, Tobias Gabrielsson, Rob Gillen, Marc Gregoire, Chris Hecker, Nick Hodapp, Jesse Jones, Martin Jost, Boris Krasnovskiy, Jan Hermelink, Max Leung, Wei-hao Lin, Jens Maurer, Richard Peters, Heiko Schmidt, Jason Shirk, Gerald Slacik, Scobie Smith, Mike Smyth, Alexander - Sokolovsky, Hervé Poirier, Michael Raykh, Marc Recht, Scott VanCamp, Bruno + Sokolovsky, Hervé Poirier, Michael Raykh, Marc Recht, Scott VanCamp, Bruno Voigt, Alexey Voinov, Jerry Waldorf, Rob Ward, Lealon Watts, John Wismar, Thomas Witt and Yuval Yosef.

@@ -74,7 +74,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/background_information/examples.html b/doc/html/boost_regex/background_information/examples.html index 39bd0df1..efdf6d1f 100644 --- a/doc/html/boost_regex/background_information/examples.html +++ b/doc/html/boost_regex/background_information/examples.html @@ -1,6 +1,6 @@ - + Test and Example Programs @@ -28,7 +28,7 @@ Example Programs
- + Test Programs
@@ -107,7 +107,7 @@ Files: captures_test.cpp.

- + Example programs
@@ -133,7 +133,7 @@ Files: regex_timer.cpp.

- + Code snippets
@@ -217,7 +217,7 @@ -
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/background_information/faq.html b/doc/html/boost_regex/background_information/faq.html index aded683f..686e6170 100644 --- a/doc/html/boost_regex/background_information/faq.html +++ b/doc/html/boost_regex/background_information/faq.html @@ -1,6 +1,6 @@ - + FAQ @@ -141,7 +141,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/background_information/futher.html b/doc/html/boost_regex/background_information/futher.html index 6ff56c4c..cec7a99d 100644 --- a/doc/html/boost_regex/background_information/futher.html +++ b/doc/html/boost_regex/background_information/futher.html @@ -1,6 +1,6 @@ - + References and Further Information @@ -62,7 +62,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/background_information/headers.html b/doc/html/boost_regex/background_information/headers.html index da1abfcc..70e0fa8e 100644 --- a/doc/html/boost_regex/background_information/headers.html +++ b/doc/html/boost_regex/background_information/headers.html @@ -1,6 +1,6 @@ - + Headers @@ -40,7 +40,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/background_information/history.html b/doc/html/boost_regex/background_information/history.html index 084381fc..e430c9de 100644 --- a/doc/html/boost_regex/background_information/history.html +++ b/doc/html/boost_regex/background_information/history.html @@ -1,6 +1,6 @@ - + History @@ -25,8 +25,42 @@
+

+ New issues should be submitted at svn.boost.org + - don't forget to include your email address in the ticket! +

+

+ Currently open issues can be viewed here. +

+

+ All issues including closed ones can be viewed here. +

+
+ + Boost + 1.42 +
+
    +
  • + Added support for Functors rather than strings as format expressions. +
    • +
  • + Improved error reporting when throwing exceptions to include better more + relevant information. +
    • +
  • + Fixed tickets #2802, + #3425, + #3507, + #3546, + #3631, + #3632, + #3715, + #3718 +
    • +
- + Boost 1.40
@@ -35,7 +69,7 @@ branch resets and recursive regular expressions.
- + Boost 1.38
@@ -62,7 +96,7 @@
- + Boost 1.34
@@ -85,7 +119,7 @@
- + Boost 1.33.1
@@ -155,7 +189,7 @@
- + Boost 1.33.0
@@ -210,7 +244,7 @@
- + Boost 1.32.1
@@ -218,7 +252,7 @@ Fixed bug in partial matches of bounded repeats of '.'.
- + Boost 1.31.0
@@ -256,7 +290,7 @@ - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + +
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/background_information/locale.html b/doc/html/boost_regex/background_information/locale.html index eb901bae..50137229 100644 --- a/doc/html/boost_regex/background_information/locale.html +++ b/doc/html/boost_regex/background_information/locale.html @@ -1,6 +1,6 @@ - + Localization @@ -58,7 +58,7 @@ There are three separate localization mechanisms supported by Boost.Regex:

- + Win32 localization model.
@@ -90,7 +90,7 @@ are treated as "unknown" graphic characters.

- + C localization model.
@@ -114,7 +114,7 @@ libraries including version 1 of this library.

- + C++ localization model.
@@ -151,7 +151,7 @@ in your code. The best way to ensure this is to add the #define to <boost/regex/user.hpp>.

- + Providing a message catalogue
@@ -1303,9 +1303,9 @@ "Unmatched \{"

      
@@ -1323,9 +1323,9 @@ "Invalid content of \{\}"

      
@@ -1343,9 +1343,9 @@ "Invalid range end"

      
@@ -1363,9 +1363,9 @@ "Memory exhausted"

      
@@ -1383,9 +1383,9 @@ "Invalid preceding regular expression"

      
@@ -1403,9 +1403,9 @@ "Premature end of regular expression"

      
@@ -1423,9 +1423,9 @@ "Regular expression too big"

      
@@ -1443,9 +1443,9 @@ "Unmatched ) or \)"

      
@@ -1463,9 +1463,9 @@ "Empty expression"

      
@@ -1483,9 +1483,9 @@ "Unknown error"

      
@@ -1775,7 +1775,7 @@ -
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/background_information/performance.html b/doc/html/boost_regex/background_information/performance.html index c3ab2735..a3870772 100644 --- a/doc/html/boost_regex/background_information/performance.html +++ b/doc/html/boost_regex/background_information/performance.html @@ -1,6 +1,6 @@ - + Performance @@ -46,7 +46,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/background_information/redist.html b/doc/html/boost_regex/background_information/redist.html index 6901b931..8a7cbc3a 100644 --- a/doc/html/boost_regex/background_information/redist.html +++ b/doc/html/boost_regex/background_information/redist.html @@ -1,6 +1,6 @@ - + Redistributables @@ -47,7 +47,7 @@
- @@ -296,7 +296,7 @@ Not supported.

- +
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/background_information/standards.html b/doc/html/boost_regex/background_information/standards.html index 31c09f0d..569cebd0 100644 --- a/doc/html/boost_regex/background_information/standards.html +++ b/doc/html/boost_regex/background_information/standards.html @@ -1,6 +1,6 @@ - + Standards Conformance @@ -28,7 +28,7 @@ Conformance
- + C++

@@ -36,7 +36,7 @@ Report on C++ Library Extensions.

- + ECMAScript / JavaScript
@@ -49,7 +49,7 @@ rather than a Unicode escape sequence; use \x{DDDD} for Unicode escape sequences.

- + Perl

@@ -62,7 +62,7 @@ (??{code}) Not implementable in a compiled strongly typed language.

- + POSIX

@@ -82,7 +82,7 @@ a custom traits class.

- + Unicode

@@ -209,7 +209,7 @@

Supported, note that at this level, case transformations are 1:1, many to many case folding operations are not supported (for example - "ß" to "SS"). + "ß" to "SS").

  
@@ -549,7 +549,7 @@ -
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/background_information/thread_safety.html b/doc/html/boost_regex/background_information/thread_safety.html index c67aa107..6b59e6d4 100644 --- a/doc/html/boost_regex/background_information/thread_safety.html +++ b/doc/html/boost_regex/background_information/thread_safety.html @@ -1,6 +1,6 @@ - + Thread Safety @@ -71,7 +71,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/captures.html b/doc/html/boost_regex/captures.html index c6345106..cb048500 100644 --- a/doc/html/boost_regex/captures.html +++ b/doc/html/boost_regex/captures.html @@ -1,6 +1,6 @@ - + Understanding Marked Sub-Expressions and Captures @@ -35,7 +35,7 @@ accessed.

- + Marked sub-expressions

@@ -218,7 +218,7 @@ output stream.

- + Unmatched Sub-Expressions

@@ -231,7 +231,7 @@ you can determine which sub-expressions matched by accessing the sub_match::matched data member.

- + Repeated Captures

@@ -369,7 +369,7 @@ Text: "now is the time for all good men to come to the aid of the party"

-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/configuration.html b/doc/html/boost_regex/configuration.html index 7b656e1a..16f93941 100644 --- a/doc/html/boost_regex/configuration.html +++ b/doc/html/boost_regex/configuration.html @@ -1,6 +1,6 @@ - + Configuration @@ -37,7 +37,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/configuration/algorithm.html b/doc/html/boost_regex/configuration/algorithm.html index ea8e4d80..76933bcb 100644 --- a/doc/html/boost_regex/configuration/algorithm.html +++ b/doc/html/boost_regex/configuration/algorithm.html @@ -1,6 +1,6 @@ - + Algorithm Selection @@ -79,7 +79,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/configuration/compiler.html b/doc/html/boost_regex/configuration/compiler.html index 62931099..a2a1b324 100644 --- a/doc/html/boost_regex/configuration/compiler.html +++ b/doc/html/boost_regex/configuration/compiler.html @@ -1,6 +1,6 @@ - + Compiler Setup @@ -36,7 +36,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/configuration/linkage.html b/doc/html/boost_regex/configuration/linkage.html index a6a5084d..c6e6f877 100644 --- a/doc/html/boost_regex/configuration/linkage.html +++ b/doc/html/boost_regex/configuration/linkage.html @@ -1,6 +1,6 @@ - + Linkage Options @@ -77,7 +77,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/configuration/locale.html b/doc/html/boost_regex/configuration/locale.html index bfcbe924..38cea49d 100644 --- a/doc/html/boost_regex/configuration/locale.html +++ b/doc/html/boost_regex/configuration/locale.html @@ -1,6 +1,6 @@ - + Locale and traits class selection @@ -95,7 +95,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/configuration/tuning.html b/doc/html/boost_regex/configuration/tuning.html index 400afa6d..0ff845a1 100644 --- a/doc/html/boost_regex/configuration/tuning.html +++ b/doc/html/boost_regex/configuration/tuning.html @@ -1,6 +1,6 @@ - + Algorithm Tuning @@ -140,7 +140,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/format.html b/doc/html/boost_regex/format.html index f046222f..3cb9149a 100644 --- a/doc/html/boost_regex/format.html +++ b/doc/html/boost_regex/format.html @@ -1,6 +1,6 @@ - + Search and Replace Format String Syntax @@ -48,7 +48,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/format/boost_format_syntax.html b/doc/html/boost_regex/format/boost_format_syntax.html index 90053a97..ed34904d 100644 --- a/doc/html/boost_regex/format/boost_format_syntax.html +++ b/doc/html/boost_regex/format/boost_format_syntax.html @@ -1,6 +1,6 @@ - + Boost-Extended Format String Syntax @@ -32,7 +32,7 @@ '$', '\', '(', ')', '?', and ':'.

- + Grouping

@@ -40,7 +40,7 @@ you want a to output literal parenthesis.

- + Conditionals

@@ -79,7 +79,7 @@ ?{NAME}true-expression:false-expression

- + Placeholder Sequences
@@ -319,7 +319,7 @@ as a literal.

- + Escape Sequences
@@ -547,7 +547,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/format/perl_format.html b/doc/html/boost_regex/format/perl_format.html index 616dd3fb..8330dca1 100644 --- a/doc/html/boost_regex/format/perl_format.html +++ b/doc/html/boost_regex/format/perl_format.html @@ -1,6 +1,6 @@ - + Perl Format String Syntax @@ -489,7 +489,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/format/sed_format.html b/doc/html/boost_regex/format/sed_format.html index c2f310d7..e721e1f9 100644 --- a/doc/html/boost_regex/format/sed_format.html +++ b/doc/html/boost_regex/format/sed_format.html @@ -1,6 +1,6 @@ - + Sed Format String Syntax @@ -235,7 +235,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/install.html b/doc/html/boost_regex/install.html index 3f61840d..3415b200 100644 --- a/doc/html/boost_regex/install.html +++ b/doc/html/boost_regex/install.html @@ -1,6 +1,6 @@ - + Building and Installing the Library @@ -49,7 +49,7 @@ file before you can use it, instructions for specific platforms are as follows:

- + Building with bjam

@@ -58,7 +58,7 @@ started guide for more information.

- + Building With Unicode and ICU Support
@@ -96,11 +96,11 @@ ICU you are using is binary compatible with the toolset you use to build Boost.

- + Building via makefiles
- + Borland C++ Builder:
- + GCC(2.95 and later)

@@ -302,7 +302,7 @@ see the config library documentation.

- + Sun Workshop 6.1

@@ -347,7 +347,7 @@ will build v9 variants of the regex library named libboost_regex_v9.a etc.

- + Makefiles for Other compilers
@@ -358,7 +358,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/introduction_and_overview.html b/doc/html/boost_regex/introduction_and_overview.html index 2ca40f79..ab4ae3dc 100644 --- a/doc/html/boost_regex/introduction_and_overview.html +++ b/doc/html/boost_regex/introduction_and_overview.html @@ -1,6 +1,6 @@ - + Introduction and Overview @@ -201,7 +201,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/partial_matches.html b/doc/html/boost_regex/partial_matches.html index a123ecb5..dd241efd 100644 --- a/doc/html/boost_regex/partial_matches.html +++ b/doc/html/boost_regex/partial_matches.html @@ -1,6 +1,6 @@ - + Partial Matches @@ -293,7 +293,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/ref.html b/doc/html/boost_regex/ref.html index 52ee39a7..f50f4040 100644 --- a/doc/html/boost_regex/ref.html +++ b/doc/html/boost_regex/ref.html @@ -1,6 +1,6 @@ - + Reference @@ -108,7 +108,7 @@
-
Copyright © 1998 -2007 John Maddock

+

Copyright © 1998 -2007 John Maddock

Distributed under 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)

diff --git a/doc/html/boost_regex/ref/bad_expression.html b/doc/html/boost_regex/ref/bad_expression.html index f4b5f922..29d38724 100644 --- a/doc/html/boost_regex/ref/bad_expression.html +++ b/doc/html/boost_regex/ref/bad_expression.html @@ -1,6 +1,6 @@ - + bad_expression @@ -27,7 +27,7 @@ bad_expression
- + Synopsis 
#include <boost/pattern_except.hpp>
@@ -54,7 +54,7 @@
 } // namespace boost
- + Description 
regex_error(const std::string& s, regex_constants::error_type err, std::ptrdiff_t pos);
@@ -89,7 +89,7 @@
 
 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/basic_regex.html b/doc/html/boost_regex/ref/basic_regex.html
index 30d3449c..4df255a6 100644
--- a/doc/html/boost_regex/ref/basic_regex.html
+++ b/doc/html/boost_regex/ref/basic_regex.html
@@ -1,6 +1,6 @@
 
 
-
+
 basic_regex
 
 
@@ -27,7 +27,7 @@
  basic_regex
 

 

-
+
         Synopsis
       

 
#include <boost/regex.hpp>
@@ -244,7 +244,7 @@
 } // namespace boost
 

 

-
+
         Description
       

 

@@ -327,7 +327,7 @@
         basic_regex.
       

 

-
Table 1. basic_regex default construction postconditions

+
Table 1. basic_regex default construction postconditions

 
@@ -407,7 +407,7 @@
         flags specified in f.
       

-
Table 2. Postconditions for basic_regex construction

+
Table 2. Postconditions for basic_regex construction

 

 
 

 
@@ -512,7 +512,7 @@
         specified in f.
       

-
Table 3. Postconditions for basic_regex construction

+
Table 3. Postconditions for basic_regex construction

 

 
 

 
@@ -616,7 +616,7 @@
         according the option flags specified in f.
       

-
Table 4. Postconditions for basic_regex construction

+
Table 4. Postconditions for basic_regex construction

 

 
 

 
@@ -727,7 +727,7 @@
         flags specified in f.
       

-
Table 5. Postconditions for basic_regex construction

+
Table 5. Postconditions for basic_regex construction

 

 
 

 
@@ -829,7 +829,7 @@
         flags specified in f.
       

-
Table 6. Postconditions for basic_regex construction

+
Table 6. Postconditions for basic_regex construction

 

 
 

 
@@ -1043,7 +1043,7 @@
         in f.
       

-
Table 7. Postconditions for basic_regex::assign

+
Table 7. Postconditions for basic_regex::assign

 

 
 

 
@@ -1319,7 +1319,7 @@
 

 
 

 

-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/concepts.html b/doc/html/boost_regex/ref/concepts.html
index 1ba9307e..3bb51add 100644
--- a/doc/html/boost_regex/ref/concepts.html
+++ b/doc/html/boost_regex/ref/concepts.html
@@ -1,6 +1,6 @@
 
 
-
+
 Concepts
 
 
@@ -36,7 +36,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/concepts/charT_concept.html b/doc/html/boost_regex/ref/concepts/charT_concept.html
index 8a8d6879..fa5d9a20 100644
--- a/doc/html/boost_regex/ref/concepts/charT_concept.html
+++ b/doc/html/boost_regex/ref/concepts/charT_concept.html
@@ -1,6 +1,6 @@
 
 
-
+
 charT Requirements
 
 
@@ -258,7 +258,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/concepts/iterator_concepts.html b/doc/html/boost_regex/ref/concepts/iterator_concepts.html
index 421ea25a..8abbbb52 100644
--- a/doc/html/boost_regex/ref/concepts/iterator_concepts.html
+++ b/doc/html/boost_regex/ref/concepts/iterator_concepts.html
@@ -1,6 +1,6 @@
 
 
-
+
 Iterator Requirements
 
 
@@ -33,7 +33,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/concepts/traits_concept.html b/doc/html/boost_regex/ref/concepts/traits_concept.html
index 3d051b83..bcd1870f 100644
--- a/doc/html/boost_regex/ref/concepts/traits_concept.html
+++ b/doc/html/boost_regex/ref/concepts/traits_concept.html
@@ -1,6 +1,6 @@
 
 
-
+
 Traits Class Requirements
 
 
@@ -34,7 +34,7 @@
           Boost-specific enhanced interface.
         

 

-
+
           Minimal
           requirements.
         

@@ -381,7 +381,7 @@
 

 

 

-
+
           Additional
           Optional Requirements
         

@@ -579,7 +579,7 @@
 
 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/deprecated_interfaces.html b/doc/html/boost_regex/ref/deprecated_interfaces.html
index 784d146a..187644c9 100644
--- a/doc/html/boost_regex/ref/deprecated_interfaces.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces.html
@@ -1,6 +1,6 @@
 
 
-
+
 Deprecated Interfaces
 
 
@@ -39,7 +39,7 @@
 

 
-
@@ -167,7 +157,7 @@
 

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/deprecated_interfaces/old_regex.html b/doc/html/boost_regex/ref/deprecated_interfaces/old_regex.html
index a79abdd6..1526d35f 100644
--- a/doc/html/boost_regex/ref/deprecated_interfaces/old_regex.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/old_regex.html
@@ -1,6 +1,6 @@
 
 
-
+
 High Level Class RegEx (Deprecated)
 
 
@@ -816,7 +816,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html b/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
index 8e482ee8..b4582aa5 100644
--- a/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
@@ -1,6 +1,6 @@
 
 
-
+
 regex_format (Deprecated)
 
 
@@ -34,7 +34,7 @@
           previous version of Boost.Regex and will not be further updated:
         

 

-
+
           Algorithm
           regex_format
         

@@ -46,15 +46,10 @@
           string, regex_format can
           be used for search and replace operations:
         

-
template <class OutputIterator, class iterator, class Allocator, class charT>
+
template <class OutputIterator, class iterator, class Allocator, class Formatter>
 OutputIterator regex_format(OutputIterator out,
                            const match_results<iterator, Allocator>& m,
-                           const charT* fmt,
-                           match_flag_type flags = 0);
-template <class OutputIterator, class iterator, class Allocator, class charT>
-OutputIterator regex_format(OutputIterator out,
-                           const match_results<iterator, Allocator>& m,
-                           const std::basic_string<charT>& fmt,
+                           Formatter fmt,
                            match_flag_type flags = 0);
 

 

@@ -71,16 +66,10 @@
             form, depending upon your compilers capabilities
           

 

-
template <class iterator, class Allocator, class charT>
+
template <class iterator, class Allocator, class Formatter>
 std::basic_string<charT> regex_format
                                  (const match_results<iterator, Allocator>& m, 
-                                 const charT* fmt,
-                                 match_flag_type flags = 0);
-
-template <class iterator, class Allocator, class charT>
-std::basic_string<charT> regex_format
-                                 (const match_results<iterator, Allocator>& m, 
-                                 const std::basic_string<charT>& fmt,
+                                 Formatter fmt,
                                  match_flag_type flags = 0);
 

 

@@ -133,13 +122,14 @@
 

 
                 

-                  const charT* fmt
+                  Formatter fmt
                 

                 		
 
                 

-                  A format string that determines how the match is transformed into
-                  the new string.
+                  Either a format string that determines how the match is transformed
+                  into the new string, or a functor that computes the new string
+                  from m - see match_results<>::format.
                 

                 		
 

 

-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/deprecated_interfaces/regex_grep.html b/doc/html/boost_regex/ref/deprecated_interfaces/regex_grep.html
index ae24f41c..a2fd8e50 100644
--- a/doc/html/boost_regex/ref/deprecated_interfaces/regex_grep.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/regex_grep.html
@@ -1,6 +1,6 @@
 
 
-
+
 regex_grep (Deprecated)
 
 
@@ -362,7 +362,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/deprecated_interfaces/regex_split.html b/doc/html/boost_regex/ref/deprecated_interfaces/regex_split.html
index 26643536..d4299f77 100644
--- a/doc/html/boost_regex/ref/deprecated_interfaces/regex_split.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/regex_split.html
@@ -1,6 +1,6 @@
 
 
-
+
 regex_split (deprecated)
 
 
@@ -149,7 +149,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/error_type.html b/doc/html/boost_regex/ref/error_type.html
index 331567be..847abbec 100644
--- a/doc/html/boost_regex/ref/error_type.html
+++ b/doc/html/boost_regex/ref/error_type.html
@@ -1,6 +1,6 @@
 
 
-
+
 error_type
 
 
@@ -27,7 +27,7 @@
  error_type
 

 

-
+
         Synopsis
       

 

@@ -57,7 +57,7 @@
 } // namespace boost
 
 

-
+
         Description
       

 

@@ -257,7 +257,7 @@
 
 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/match_flag_type.html b/doc/html/boost_regex/ref/match_flag_type.html
index 102543d0..54c13e4e 100644
--- a/doc/html/boost_regex/ref/match_flag_type.html
+++ b/doc/html/boost_regex/ref/match_flag_type.html
@@ -1,6 +1,6 @@
 
 
-
+
 match_flag_type
 
 
@@ -69,7 +69,7 @@
 } // namespace boost
 
 

-
+
         Description
       

 

@@ -478,7 +478,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/match_results.html b/doc/html/boost_regex/ref/match_results.html
index 6e8f7c0b..bb811b46 100644
--- a/doc/html/boost_regex/ref/match_results.html
+++ b/doc/html/boost_regex/ref/match_results.html
@@ -1,6 +1,6 @@
 
 
-
+
 match_results
 
 
@@ -27,7 +27,7 @@
  match_results
 

 

-
+
         Synopsis
       

 
#include <boost/regex.hpp>
@@ -132,11 +132,12 @@
    const_iterator begin() const;
    const_iterator end() const;
    // format:
-   template <class OutputIterator>
+   template <class OutputIterator, class Formatter>
    OutputIterator format(OutputIterator out,
-                        const string_type& fmt,
+                        Formatter fmt,
                         match_flag_type flags = format_default) const;
-   string_type format(const string_type& fmt,
+   template <class Formatter>
+   string_type format(Formatter fmt,
                      match_flag_type flags = format_default) const;
 
    allocator_type get_allocator() const;
@@ -166,7 +167,7 @@
          match_results<BidirectionalIterator, Allocator>& m2);
 

 

-
+
         Description
       

 

@@ -558,18 +559,32 @@
       

 

       

-
template <class OutputIterator>
+
template <class OutputIterator, class Formatter>
 OutputIterator format(OutputIterator out,
-                     const string_type& fmt,
-                     match_flag_type flags = format_default);
+                      Formatter fmt,
+                      match_flag_type flags = format_default);
 

 

         Requires: The type OutputIterator
         conforms to the Output Iterator requirements (C++ std 24.1.2).
       

 

-        Effects: Copies the character sequence
-        [fmt.begin(), fmt.end())
+        The type Formatter must be
+        either a pointer to a null-terminated string of type char_type[], or be a container of char_type's
+        (for example std::basic_string<char_type>)
+        or be a unary, binary or ternary functor that computes the replacement string
+        from a function call: either fmt(*this)
+        which must return a container of char_type's
+        to be used as the replacement text, or either fmt(*this,
+        out)
+        or fmt(*this, out, flags), both of which write the replacement text
+        to *out,
+        and then return the new OutputIterator position.
+      

+

+        Effects: If fmt
+        is either a null-terminated string, or a container of char_type's,
+        then copies the character sequence [fmt.begin(), fmt.end())
         to OutputIterator out.
         For each format specifier or escape sequence in fmt,
         replace that sequence with either the character(s) it represents, or the
@@ -578,6 +593,27 @@
         by default this is the format used by ECMA-262, ECMAScript Language Specification,
         Chapter 15 part 5.4.11 String.prototype.replace.
       

+

+        If fmt is a function object,
+        then depending on the number of arguments the function object accepts, it
+        will either:
+      

+
    
+
  • 
+          Call fmt(*this) and
+          copy the result to OutputIteratorout.
+        
    • 
+
  • 
+          Call fmt(*this, out).
+        
    • 
+
  • 
+          Call fmt(*this, out, flags).
+        
    • 
+

+

+        In all cases the new position of the OutputIterator
+        is returned.
+      

 

         See the format syntax guide for more information.
       

@@ -586,18 +622,57 @@
       

 

       

-
string_type format(const string_type& fmt,
-                  match_flag_type flags = format_default);
+
template <class Formatter>
+string_type format(Formatter fmt,
+                   match_flag_type flags = format_default);
 

 

-        Effects: Returns a copy of the string fmt.
-        For each format specifier or escape sequence in fmt,
-        replace that sequence with either the character(s) it represents, or the
-        sequence of characters within *this to which it refers. The bitmasks specified
-        in flags determines what format specifiers or escape sequences are recognized,
-        by default this is the format used by ECMA-262, ECMAScript Language Specification,
-        Chapter 15 part 5.4.11 String.prototype.replace.
+        Requires The type Formatter
+        must be either a pointer to a null-terminated string of type char_type[],
+        or be a container of char_type's
+        (for example std::basic_string<char_type>)
+        or be a unary, binary or ternary functor that computes the replacement string
+        from a function call: either fmt(*this)
+        which must return a container of char_type's
+        to be used as the replacement text, or either fmt(*this,
+        out)
+        or fmt(*this, out, flags), both of which write the replacement text
+        to *out,
+        and then return the new OutputIterator position.
       

+

+        Effects: If fmt
+        is either a null-terminated string, or a container of char_type's,
+        then copies the string fmt: For each format specifier
+        or escape sequence in fmt, replace that sequence with
+        either the character(s) it represents, or the sequence of characters within
+        *this
+        to which it refers. The bitmasks specified in flags determines what format
+        specifiers or escape sequences are recognized, by default this is the format
+        used by ECMA-262, ECMAScript Language Specification, Chapter 15 part 5.4.11
+        String.prototype.replace.
+      

+

+        If fmt is a function object,
+        then depending on the number of arguments the function object accepts, it
+        will either:
+      

+
    
+
  • 
+          Call fmt(*this) and
+          return the result.
+        
    • 
+
  • 
+          Call fmt(*this, unspecified-output-iterator), where unspecified-output-iterator
+          is an unspecified OutputIterator type used to copy the output to the string
+          result.
+        
    • 
+
  • 
+          Call fmt(*this, unspecified-output-iterator, flags), where unspecified-output-iterator
+          is an unspecified OutputIterator type used to copy the output to the string
+          result.
+        
    • 
+

 

         See the format syntax guide for more information.
       

@@ -715,7 +790,7 @@
 
 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/non_std_strings.html b/doc/html/boost_regex/ref/non_std_strings.html
index 4681e22b..84aa7342 100644
--- a/doc/html/boost_regex/ref/non_std_strings.html
+++ b/doc/html/boost_regex/ref/non_std_strings.html
@@ -1,6 +1,6 @@
 
 
-
+
 Interfacing With Non-Standard String Types
 
 
@@ -73,7 +73,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/non_std_strings/icu.html b/doc/html/boost_regex/ref/non_std_strings/icu.html
index c369d563..deda7716 100644
--- a/doc/html/boost_regex/ref/non_std_strings/icu.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu.html
@@ -1,6 +1,6 @@
 
 
-
+
 Working With Unicode and ICU String Types
 
 
@@ -40,7 +40,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/non_std_strings/icu/intro.html b/doc/html/boost_regex/ref/non_std_strings/icu/intro.html
index 69b659bf..c62de8c0 100644
--- a/doc/html/boost_regex/ref/non_std_strings/icu/intro.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/intro.html
@@ -1,6 +1,6 @@
 
 
-
+
 Introduction to using Regex with ICU
 
 
@@ -62,7 +62,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html
index 4ea31468..d3b3f4e9 100644
--- a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html
@@ -1,6 +1,6 @@
 
 
-
+
 Unicode Regular Expression Algorithms
 
 
@@ -43,7 +43,7 @@
             on to the "real" algorithm.
           

 

-
+
             u32regex_match
           

 

@@ -89,7 +89,7 @@
 }
 
 

-
+
             u32regex_search
           

 

@@ -128,7 +128,7 @@
 }
 
 

-
+
             u32regex_replace
           

 

@@ -166,7 +166,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html
index 892034a2..deeb7180 100644
--- a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html
@@ -1,6 +1,6 @@
 
 
-
+
 Unicode Aware Regex Iterators
 
 
@@ -28,7 +28,7 @@
           Unicode Aware Regex Iterators
 

 

-
+
             u32regex_iterator
           

 

@@ -115,18 +115,18 @@
 

             Calling
           

-
enumerate_currencies(" $100.23 or £198.12 ");

+
enumerate_currencies(" $100.23 or £198.12 ");

 

             Yields the output:
           

 
$100.23
-£198.12
+£198.12
 

 

             Provided of course that the input is encoded as UTF-8.
           

 

-
+
             u32regex_token_iterator
           

 

@@ -309,7 +309,7 @@
 
 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_types.html b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_types.html
index 6c64febb..6b6a598c 100644
--- a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_types.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_types.html
@@ -1,6 +1,6 @@
 
 
-
+
 Unicode regular expression types
 
 
@@ -118,7 +118,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings.html
index e31a7b9c..21c6965b 100644
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings.html
@@ -1,6 +1,6 @@
 
 
-
+
 Using Boost Regex With MFC Strings
 
 
@@ -42,7 +42,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html
index 6148023b..708ce212 100644
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html
@@ -1,6 +1,6 @@
 
 
-
+
 Overloaded Algorithms For MFC String Types
 
 
@@ -34,7 +34,7 @@
             here they are anyway:
           

 

-
+
             regex_match
           

 

@@ -82,7 +82,7 @@
 }
 
 

-
+
             regex_match
             (second overload)
           

@@ -110,7 +110,7 @@
 }      
 
 

-
+
             regex_search
           

 

@@ -149,7 +149,7 @@
 }      
 
 

-
+
             regex_search
             (second overload)
           

@@ -164,7 +164,7 @@
             + s.GetLength(), e, f);
           

 

-
+
             regex_replace
           

 

@@ -214,7 +214,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_intro.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_intro.html
index 9ccedc23..0e4c2c8a 100644
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_intro.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_intro.html
@@ -1,6 +1,6 @@
 
 
-
+
 Introduction to Boost.Regex and MFC Strings
 
 
@@ -51,7 +51,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html
index 54858bc8..9a932c01 100644
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html
@@ -1,6 +1,6 @@
 
 
-
+
 Iterating Over the Matches Within An MFC String
 
 
@@ -32,7 +32,7 @@
             an MFC/ATL string to a regex_iterator or regex_token_iterator:
           

 

-
+
             regex_iterator
             creation helper
           

@@ -68,7 +68,7 @@
 }
 
 

-
+
             regex_token_iterator
             creation helpers
           

@@ -136,7 +136,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_create.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_create.html
index 487a6ed0..9ac35706 100644
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_create.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_create.html
@@ -1,6 +1,6 @@
 
 
-
+
 Regular Expression Creation From an MFC String
 
 
@@ -43,7 +43,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_types.html b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_types.html
index 3cfa2cfc..fd9be6ac 100644
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_types.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_types.html
@@ -1,6 +1,6 @@
 
 
-
+
 Regex Types Used With MFC Strings
 
 
@@ -44,7 +44,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/posix.html b/doc/html/boost_regex/ref/posix.html
index 6424b99c..75ff2341 100644
--- a/doc/html/boost_regex/ref/posix.html
+++ b/doc/html/boost_regex/ref/posix.html
@@ -1,6 +1,6 @@
 
 
-
+
 POSIX Compatible C API's
 
 
@@ -165,7 +165,7 @@
 

       

 

-
+
         regcomp
       

 

@@ -379,7 +379,7 @@
 

       

 

-
+
         regerror
       

 

@@ -467,7 +467,7 @@
 

       

 

-
+
         regexec
       

 

@@ -537,7 +537,7 @@
 

       

 

-
+
         regfree
       

 

@@ -547,7 +547,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/regex_iterator.html b/doc/html/boost_regex/ref/regex_iterator.html
index 2a101c5e..4106df31 100644
--- a/doc/html/boost_regex/ref/regex_iterator.html
+++ b/doc/html/boost_regex/ref/regex_iterator.html
@@ -1,6 +1,6 @@
 
 
-
+
 regex_iterator
 
 
@@ -78,7 +78,7 @@
                           regex_constants::match_flag_type m = regex_constants::match_default);
 
 

-
+
         Description
       

 

@@ -436,7 +436,7 @@
         m.
       

 

-
+
         Examples
       

 

@@ -537,7 +537,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/regex_match.html b/doc/html/boost_regex/ref/regex_match.html
index 9b1a7108..49739dd2 100644
--- a/doc/html/boost_regex/ref/regex_match.html
+++ b/doc/html/boost_regex/ref/regex_match.html
@@ -1,6 +1,6 @@
 
 
-
+
 regex_match
 
 
@@ -80,7 +80,7 @@
                  match_flag_type flags = match_default);
 
 

-
+
         Description
       

 
template <class BidirectionalIterator, class Allocator, class charT, class traits>
@@ -360,7 +360,7 @@
         Effects: Returns the result of regex_match(s.begin(), s.end(), e, flags).
       

 

-
+
         Examples
       

 

@@ -400,7 +400,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/regex_replace.html b/doc/html/boost_regex/ref/regex_replace.html
index 70a65308..023842dc 100644
--- a/doc/html/boost_regex/ref/regex_replace.html
+++ b/doc/html/boost_regex/ref/regex_replace.html
@@ -1,6 +1,6 @@
 
 
-
+
 regex_replace
 
 
@@ -38,37 +38,40 @@
         set. If the flag format_first_only
         is set then only the first occurrence is replaced rather than all occurrences.
       

-
template <class OutputIterator, class BidirectionalIterator, class traits, class charT>
+
template <class OutputIterator, class BidirectionalIterator, class traits, class Formatter>
 OutputIterator regex_replace(OutputIterator out,
                              BidirectionalIterator first,
                              BidirectionalIterator last,
                              const basic_regex<charT, traits>& e,
-                             const basic_string<charT>& fmt,
+                             Formatter fmt,
                              match_flag_type flags = match_default);
 
-template <class traits, class charT>
+template <class traits, class Formatter>
 basic_string<charT> regex_replace(const basic_string<charT>& s,
                                   const basic_regex<charT, traits>& e,
-                                  const basic_string<charT>& fmt,
+                                  Formatter fmt,
                                   match_flag_type flags = match_default);
 

 

-
+
         Description
       

-
template <class OutputIterator, class BidirectionalIterator, class traits, class charT>
+
template <class OutputIterator, class BidirectionalIterator, class traits, class Formatter>
 OutputIterator regex_replace(OutputIterator out,
                              BidirectionalIterator first,
                              BidirectionalIterator last,
                              const basic_regex<charT, traits>& e,
-                             const basic_string<charT>& fmt,
+                             Formatter fmt,
                              match_flag_type flags = match_default);
 

 

         Enumerates all the occurences of expression e in the
         sequence [first, last), replacing each occurence with the string that results
         by merging the match found with the format string fmt,
-        and copies the resulting string to out.
+        and copies the resulting string to out. In the case
+        that fmt is a unary, binary or ternary function object,
+        then the character sequence generated by that object is copied unchanged
+        to the output when performing a substitution.
       

 

         If the flag format_no_copy
@@ -85,6 +88,21 @@
         along with the rules used for finding matches, are determined by the flags
         set in flags: see match_flag_type.
       

+

+        Requires The type Formatter
+        must be either a pointer to a null-terminated string of type char_type[],
+        or be a container of char_type's
+        (for example std::basic_string<char_type>)
+        or be a unary, binary or ternary functor that computes the replacement string
+        from a function call: either fmt(what)
+        which must return a container of char_type's
+        to be used as the replacement text, or either fmt(what,
+        out)
+        or fmt(what, out, flags), both of which write the replacement text
+        to *out,
+        and then return the new OutputIterator position. In each case what is the match_results object that represents
+        the match found.
+      

 

         Effects: Constructs an regex_iterator object:
       

@@ -150,12 +168,27 @@
 

         Returns: out.
       

-
template <class traits, class charT>
+
template <class traits, class Formatter>
 basic_string<charT> regex_replace(const basic_string<charT>& s,
                                   const basic_regex<charT, traits>& e,
-                                  const basic_string<charT>& fmt,
+                                  Formatter fmt,
                                   match_flag_type flags = match_default);
 

+

+        Requires The type Formatter
+        must be either a pointer to a null-terminated string of type char_type[],
+        or be a container of char_type's
+        (for example std::basic_string<char_type>)
+        or be a unary, binary or ternary functor that computes the replacement string
+        from a function call: either fmt(what)
+        which must return a container of char_type's
+        to be used as the replacement text, or either fmt(what,
+        out)
+        or fmt(what, out, flags), both of which write the replacement text
+        to *out,
+        and then return the new OutputIterator position. In each case what is the match_results object that represents
+        the match found.
+      

 

         Effects: Constructs an object basic_string<charT> result, calls regex_replace(back_inserter(result), s.begin(), s.end(), e,
         fmt,
@@ -163,7 +196,7 @@
         and then returns result.
       

 

-
+
         Examples
       

 

@@ -282,7 +315,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/regex_search.html b/doc/html/boost_regex/ref/regex_search.html
index 44faddee..e220f880 100644
--- a/doc/html/boost_regex/ref/regex_search.html
+++ b/doc/html/boost_regex/ref/regex_search.html
@@ -1,6 +1,6 @@
 
 
-
+
 regex_search
 
 
@@ -73,7 +73,7 @@
                   match_flag_type flags = match_default);
 
 

-
+
         Description
       

 
template <class BidirectionalIterator, class Allocator, class charT, class traits>
@@ -355,7 +355,7 @@
         Effects: Returns the result of regex_search(s.begin(), s.end(), e, flags).
       

 

-
+
         Examples
       

 

@@ -409,7 +409,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/regex_token_iterator.html b/doc/html/boost_regex/ref/regex_token_iterator.html
index 8728ee16..221fa365 100644
--- a/doc/html/boost_regex/ref/regex_token_iterator.html
+++ b/doc/html/boost_regex/ref/regex_token_iterator.html
@@ -1,6 +1,6 @@
 
 
-
+
 regex_token_iterator
 
 
@@ -136,7 +136,7 @@
          regex_constants::match_flag_type m = regex_constants::match_default);
 
 

-
+
         Description
       

 

@@ -383,7 +383,7 @@
         m.
       

 

-
+
         Examples
       

 

@@ -496,7 +496,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/regex_traits.html b/doc/html/boost_regex/ref/regex_traits.html
index cccf4917..13975b4d 100644
--- a/doc/html/boost_regex/ref/regex_traits.html
+++ b/doc/html/boost_regex/ref/regex_traits.html
@@ -1,6 +1,6 @@
 
 
-
+
 regex_traits
 
 
@@ -46,7 +46,7 @@
 } // namespace boost
 
 

-
+
         Description
       

 

@@ -92,7 +92,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/sub_match.html b/doc/html/boost_regex/ref/sub_match.html
index 999f0ce4..40d6dc4e 100644
--- a/doc/html/boost_regex/ref/sub_match.html
+++ b/doc/html/boost_regex/ref/sub_match.html
@@ -1,6 +1,6 @@
 
 
-
+
 sub_match
 
 
@@ -329,11 +329,11 @@
 } // namespace boost
 
 

-
+
         Description
       

 

-
+
         Members
       

 

@@ -473,7 +473,7 @@
         
 

 

-
+
         sub_match
         non-member operators
       

@@ -1008,7 +1008,7 @@
         + m2.str().
       

 

-
+
         Stream inserter
       

 

@@ -1024,7 +1024,7 @@
 
 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/syntax_option_type.html b/doc/html/boost_regex/ref/syntax_option_type.html
index c5a27483..5b329bc6 100644
--- a/doc/html/boost_regex/ref/syntax_option_type.html
+++ b/doc/html/boost_regex/ref/syntax_option_type.html
@@ -1,6 +1,6 @@
 
 
-
+
 syntax_option_type
 
 
@@ -43,7 +43,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_basic.html b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_basic.html
index b7d7d225..8f8a1a22 100644
--- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_basic.html
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_basic.html
@@ -1,6 +1,6 @@
 
 
-
+
 Options for POSIX Basic Regular Expressions
 
 
@@ -398,7 +398,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_extended.html b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_extended.html
index f0895bc2..24f17a47 100644
--- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_extended.html
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_extended.html
@@ -1,6 +1,6 @@
 
 
-
+
 Options for POSIX Extended Regular Expressions
 
 
@@ -353,7 +353,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_literal.html b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_literal.html
index ce3d6437..432bcc60 100644
--- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_literal.html
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_literal.html
@@ -1,6 +1,6 @@
 
 
-
+
 Options for Literal Strings
 
 
@@ -143,7 +143,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_overview.html b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_overview.html
index 0b3534fb..f0764f9c 100644
--- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_overview.html
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_overview.html
@@ -1,6 +1,6 @@
 
 
-
+
 Overview of syntax_option_type
 
 
@@ -60,7 +60,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_perl.html b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_perl.html
index b7f8f77a..d37ec816 100644
--- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_perl.html
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_perl.html
@@ -1,6 +1,6 @@
 
 
-
+
 Options for Perl Regular Expressions
 
 
@@ -413,7 +413,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_synopsis.html b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_synopsis.html
index 9168914b..2a6b3a85 100644
--- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_synopsis.html
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_synopsis.html
@@ -1,6 +1,6 @@
 
 
-
+
 syntax_option_type Synopsis
 
 
@@ -88,7 +88,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/syntax.html b/doc/html/boost_regex/syntax.html
index 7cc7ca4c..ad674f08 100644
--- a/doc/html/boost_regex/syntax.html
+++ b/doc/html/boost_regex/syntax.html
@@ -1,6 +1,6 @@
 
 
-
+
 Regular Expression Syntax
 
 
@@ -82,7 +82,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/syntax/basic_extended.html b/doc/html/boost_regex/syntax/basic_extended.html
index 6821fd0d..3283e7ca 100644
--- a/doc/html/boost_regex/syntax/basic_extended.html
+++ b/doc/html/boost_regex/syntax/basic_extended.html
@@ -1,6 +1,6 @@
 
 
-
+
 POSIX Extended Regular Expression Syntax
 
 
@@ -28,7 +28,7 @@
       Expression Syntax
 

 

-
+
         Synopsis
       

 

@@ -46,7 +46,7 @@
 

       

 

-
+
         POSIX
         Extended Syntax
       

@@ -56,7 +56,7 @@
       

 
.[{()\*+?|^$

 

-
+
         Wildcard:
       

 

@@ -74,7 +74,7 @@
         
 
 

-
+
         Anchors:
       

 

@@ -86,7 +86,7 @@
         of an expression, or the last character of a sub-expression.
       

 

-
+
         Marked
         sub-expressions:
       

@@ -98,7 +98,7 @@
         to by a back-reference.
       

 

-
+
         Repeats:
       

 

@@ -184,7 +184,7 @@ cab
         operator to be applied to.
       

 

-
+
         Back references:
       

 

@@ -214,7 +214,7 @@ cab
         

 

 

-
+
         Alternation
       

 

@@ -227,7 +227,7 @@ cab
         will match either of "abd" or "abef".
       

 

-
+
         Character
         sets:
       

@@ -240,7 +240,7 @@ cab
         A bracket expression may contain any combination of the following:
       

 

-
+
         Single
         characters:
       

@@ -249,7 +249,7 @@ cab
         or 'c'.
       

 

-
+
         Character
         ranges:
       

@@ -265,7 +265,7 @@ cab
         the code points of the characters only.
       

 

-
+
         Negation:
       

 

@@ -274,7 +274,7 @@ cab
         range a-c.
       

 

-
+
         Character
         classes:
       

@@ -284,7 +284,7 @@ cab
         character class names.
       

 

-
+
         Collating
         Elements:
       

@@ -312,7 +312,7 @@ cab
         matches a NUL character.
       

 

-
+
         Equivalence
         classes:
       

@@ -323,13 +323,13 @@ cab
         elements the name col may be a symbolic
         name. A primary sort key is one that ignores case, accentation, or
         locale-specific tailorings; so for example [[=a=]] matches
-        any of the characters: a, À, Á, Â, Ã, Ä, Å, A, à, á, â, ã, ä and å. Unfortunately implementation
+        any of the characters: a, À, Á, Â, Ã, Ä, Å, A, à, á, â, ã, ä and å. Unfortunately implementation
         of this is reliant on the platform's collation and localisation support;
         this feature can not be relied upon to work portably across all platforms,
         or even all locales on one platform.
       

 

-
+
         Combinations:
       

 

@@ -337,7 +337,7 @@ cab
         [[:digit:]a-c[.NUL.]].
       

 

-
+
         Escapes
       

 

@@ -363,7 +363,7 @@ cab
         extensions are also supported by Boost.Regex:
       

 

-
+
         Escapes
         matching a specific character
       

@@ -552,7 +552,7 @@ cab
 

 

 

-
+
         "Single
         character" character classes:
       

@@ -706,7 +706,7 @@ cab
 

 

 

-
+
         Character
         Properties
       

@@ -813,7 +813,7 @@ cab
         matches any "digit" character, as does \p{digit}.
       

 

-
+
         Word Boundaries
       

 

@@ -888,7 +888,7 @@ cab
 

 

 

-
+
         Buffer
         boundaries
       

@@ -979,7 +979,7 @@ cab
 

 

 

-
+
         Continuation
         Escape
       

@@ -991,7 +991,7 @@ cab
         match to start where the last one ended.
       

 

-
+
         Quoting
         escape
       

@@ -1005,7 +1005,7 @@ cab
 \*+aaa
 
 

-
+
         Unicode
         escapes
       

@@ -1056,7 +1056,7 @@ cab
 

 

 

-
+
         Any other
         escape
       

@@ -1065,7 +1065,7 @@ cab
         \@ matches a literal '@'.
       

 

-
+
         Operator
         precedence
       

@@ -1101,7 +1101,7 @@ cab
 
 
 

-
+
         What
         Gets Matched
       

@@ -1111,11 +1111,11 @@ cab
         rule.
       

 

-
+
         Variations
       

 

-
+
         Egrep
       

 

@@ -1136,7 +1136,7 @@ cab
         used with the -E option.
       

 

-
+
         awk
       

 

@@ -1150,7 +1150,7 @@ cab
         these by default anyway.
       

 

-
+
         Options
       

 

@@ -1163,7 +1163,7 @@ cab
         modify how the case and locale sensitivity are to be applied.
       

 

-
+
         References
       

 

@@ -1184,7 +1184,7 @@ cab
 
 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/syntax/basic_syntax.html b/doc/html/boost_regex/syntax/basic_syntax.html
index 0c6e6604..6a425a34 100644
--- a/doc/html/boost_regex/syntax/basic_syntax.html
+++ b/doc/html/boost_regex/syntax/basic_syntax.html
@@ -1,6 +1,6 @@
 
 
-
+
 POSIX Basic Regular Expression Syntax
 
 
@@ -28,7 +28,7 @@
       Expression Syntax
 

 

-
+
         Synopsis
       

 

@@ -45,7 +45,7 @@
 

       

 

-
+
         POSIX
         Basic Syntax
       

@@ -55,7 +55,7 @@
       

 
.[\*^$

 

-
+
         Wildcard:
       

 

@@ -73,7 +73,7 @@
         
 
 

-
+
         Anchors:
       

 

@@ -85,7 +85,7 @@
         of an expression, or the last character of a sub-expression.
       

 

-
+
         Marked
         sub-expressions:
       

@@ -97,7 +97,7 @@
         by a back-reference.
       

 

-
+
         Repeats:
       

 

@@ -155,7 +155,7 @@ aaaa
         to.
       

 

-
+
         Back references:
       

 

@@ -173,7 +173,7 @@ aaaa
       

 
aaabba

 

-
+
         Character
         sets:
       

@@ -186,7 +186,7 @@ aaaa
         A bracket expression may contain any combination of the following:
       

 

-
+
         Single
         characters:
       

@@ -195,7 +195,7 @@ aaaa
         or 'c'.
       

 

-
+
         Character
         ranges:
       

@@ -211,7 +211,7 @@ aaaa
         of the characters only.
       

 

-
+
         Negation:
       

 

@@ -220,7 +220,7 @@ aaaa
         range a-c.
       

 

-
+
         Character
         classes:
       

@@ -230,7 +230,7 @@ aaaa
         character class names.
       

 

-
+
         Collating
         Elements:
       

@@ -259,7 +259,7 @@ aaaa
         element names.
       

 

-
+
         Equivalence
         classes:
       

@@ -270,13 +270,13 @@ aaaa
         elements the name col may be a collating
         symbolic name. A primary sort key is one that ignores case, accentation,
         or locale-specific tailorings; so for example [[=a=]] matches
-        any of the characters: a, À, Á, Â, Ã, Ä, Å, A, à, á, â, ã, ä and å. Unfortunately implementation
+        any of the characters: a, À, Á, Â, Ã, Ä, Å, A, à, á, â, ã, ä and å. Unfortunately implementation
         of this is reliant on the platform's collation and localisation support;
         this feature can not be relied upon to work portably across all platforms,
         or even all locales on one platform.
       

 

-
+
         Combinations:
       

 

@@ -284,7 +284,7 @@ aaaa
         [[:digit:]a-c[.NUL.]].
       

 

-
+
         Escapes
       

 

@@ -299,7 +299,7 @@ aaaa
         will match either a literal '\' or a '^'.
       

 

-
+
         What Gets
         Matched
       

@@ -309,13 +309,13 @@ aaaa
         rule.
       

 

-
+
         Variations
       

 

       

 

-
+
         Grep
       

 

@@ -333,7 +333,7 @@ aaaa
         As its name suggests, this behavior is consistent with the Unix utility grep.
       

 

-
+
         emacs
       

 

@@ -613,7 +613,7 @@ aaaa
         leftmost-longest rule.
       

 

-
+
         Options
       

 

@@ -627,7 +627,7 @@ aaaa
         options modify how the case and locale sensitivity are to be applied.
       

 

-
+
         References
       

 

@@ -646,7 +646,7 @@ aaaa
 
 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/syntax/character_classes.html b/doc/html/boost_regex/syntax/character_classes.html
index 8611af01..947d2789 100644
--- a/doc/html/boost_regex/syntax/character_classes.html
+++ b/doc/html/boost_regex/syntax/character_classes.html
@@ -1,6 +1,6 @@
 
 
-
+
 Character Class Names
 
 
@@ -36,7 +36,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/syntax/character_classes/optional_char_class_names.html b/doc/html/boost_regex/syntax/character_classes/optional_char_class_names.html
index 0c689b93..980dc75b 100644
--- a/doc/html/boost_regex/syntax/character_classes/optional_char_class_names.html
+++ b/doc/html/boost_regex/syntax/character_classes/optional_char_class_names.html
@@ -1,6 +1,6 @@
 
 
-
+
 Character classes that are supported by Unicode Regular Expressions
 
 
@@ -533,7 +533,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/syntax/character_classes/std_char_clases.html b/doc/html/boost_regex/syntax/character_classes/std_char_clases.html
index f8ddd4c3..8b65197d 100644
--- a/doc/html/boost_regex/syntax/character_classes/std_char_clases.html
+++ b/doc/html/boost_regex/syntax/character_classes/std_char_clases.html
@@ -1,6 +1,6 @@
 
 
-
+
 Character Classes that are Always Supported
 
 
@@ -382,7 +382,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/syntax/collating_names.html b/doc/html/boost_regex/syntax/collating_names.html
index b3a8e1c2..c8f6f937 100644
--- a/doc/html/boost_regex/syntax/collating_names.html
+++ b/doc/html/boost_regex/syntax/collating_names.html
@@ -1,6 +1,6 @@
 
 
-
+
 Collating Names
 
 
@@ -36,7 +36,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/syntax/collating_names/digraphs.html b/doc/html/boost_regex/syntax/collating_names/digraphs.html
index 7affbae9..62866317 100644
--- a/doc/html/boost_regex/syntax/collating_names/digraphs.html
+++ b/doc/html/boost_regex/syntax/collating_names/digraphs.html
@@ -1,6 +1,6 @@
 
 
-
+
 Digraphs
 
 
@@ -47,7 +47,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/syntax/collating_names/named_unicode.html b/doc/html/boost_regex/syntax/collating_names/named_unicode.html
index acb51cb1..a73b2fb7 100644
--- a/doc/html/boost_regex/syntax/collating_names/named_unicode.html
+++ b/doc/html/boost_regex/syntax/collating_names/named_unicode.html
@@ -1,6 +1,6 @@
 
 
-
+
 Named Unicode Characters
 
 
@@ -40,7 +40,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/syntax/collating_names/posix_symbolic_names.html b/doc/html/boost_regex/syntax/collating_names/posix_symbolic_names.html
index 12bdded3..0846bf92 100644
--- a/doc/html/boost_regex/syntax/collating_names/posix_symbolic_names.html
+++ b/doc/html/boost_regex/syntax/collating_names/posix_symbolic_names.html
@@ -1,6 +1,6 @@
 
 
-
+
 POSIX Symbolic Names
 
 
@@ -971,7 +971,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/syntax/leftmost_longest_rule.html b/doc/html/boost_regex/syntax/leftmost_longest_rule.html
index 4ea80846..ecfbabba 100644
--- a/doc/html/boost_regex/syntax/leftmost_longest_rule.html
+++ b/doc/html/boost_regex/syntax/leftmost_longest_rule.html
@@ -1,6 +1,6 @@
 
 
-
+
 The Leftmost Longest Rule
 
 
@@ -65,7 +65,7 @@
 

 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/syntax/perl_syntax.html b/doc/html/boost_regex/syntax/perl_syntax.html
index cc7a368a..d8fe0ce2 100644
--- a/doc/html/boost_regex/syntax/perl_syntax.html
+++ b/doc/html/boost_regex/syntax/perl_syntax.html
@@ -1,6 +1,6 @@
 
 
-
+
 Perl Regular Expression Syntax
 
 
@@ -28,7 +28,7 @@
       Syntax
 

 

-
+
         Synopsis
       

 

@@ -43,7 +43,7 @@
 boost::regex e2(my_expression, boost::regex::perl|boost::regex::icase);
 
 

-
+
         Perl
         Regular Expression Syntax
       

@@ -53,7 +53,7 @@
       

 
.[{()\*+?|^$

 

-
+
         Wildcard
       

 

@@ -73,7 +73,7 @@
         
 
 

-
+
         Anchors
       

 

@@ -83,7 +83,7 @@
         A '$' character shall match the end of a line.
       

 

-
+
         Marked
         sub-expressions
       

@@ -94,7 +94,7 @@
         can also repeated, or referred to by a back-reference.
       

 

-
+
         Non-marking
         grouping
       

@@ -107,7 +107,7 @@
         without splitting out any separate sub-expressions.
       

 

-
+
         Repeats
       

 

@@ -188,7 +188,7 @@
         to be applied to.
       

 

-
+
         Non greedy
         repeats
       

@@ -218,7 +218,7 @@
         while consuming as little input as possible.
       

 

-
+
         Pocessive
         repeats
       

@@ -250,7 +250,7 @@
         while giving nothing back.
       

 

-
+
         Back references
       

 

@@ -360,7 +360,7 @@
         named "two".
       

 

-
+
         Alternation
       

 

@@ -387,7 +387,7 @@
         (?:abc)?? has exactly the same effect.
       

 

-
+
         Character sets
       

 

@@ -399,7 +399,7 @@
         A bracket expression may contain any combination of the following:
       

 

-
+
         Single characters
       

 

@@ -407,7 +407,7 @@
         'b', or 'c'.
       

 

-
+
         Character
         ranges
       

@@ -421,7 +421,7 @@
         sensitive.
       

 

-
+
         Negation
       

 

@@ -430,7 +430,7 @@
         matches any character that is not in the range a-c.
       

 

-
+
         Character
         classes
       

@@ -441,7 +441,7 @@
         class names.
       

 

-
+
         Collating
         Elements
       

@@ -463,7 +463,7 @@
         matches a \0 character.
       

 

-
+
         Equivalence
         classes
       

@@ -474,13 +474,13 @@
         may be a symbolic name.
         A primary sort key is one that ignores case, accentation, or locale-specific
         tailorings; so for example [[=a=]] matches
-        any of the characters: a, À, Á, Â, Ã, Ä, Å, A, à, á, â, ã, ä and å. Unfortunately implementation
+        any of the characters: a, À, Á, Â, Ã, Ä, Å, A, à, á, â, ã, ä and å. Unfortunately implementation
         of this is reliant on the platform's collation and localisation support;
         this feature can not be relied upon to work portably across all platforms,
         or even all locales on one platform.
       

 

-
+
         Escaped
         Characters
       

@@ -492,7 +492,7 @@
         is not a "word" character.
       

 

-
+
         Combinations
       

 

@@ -500,7 +500,7 @@
         [[:digit:]a-c[.NUL.]].
       

 

-
+
         Escapes
       

 

@@ -692,7 +692,7 @@
 

 

 

-
+
         "Single
         character" character classes:
       

@@ -894,7 +894,7 @@
 

 

 

-
+
         Character
         Properties
       

@@ -1002,7 +1002,7 @@
         as does \p{digit}.
       

 

-
+
         Word Boundaries
       

 

@@ -1021,7 +1021,7 @@
         \B Matches only when not at a word boundary.
       

 

-
+
         Buffer boundaries
       

 

@@ -1046,7 +1046,7 @@
         to the regular expression \n*\z
       

 

-
+
         Continuation
         Escape
       

@@ -1058,7 +1058,7 @@
         one ended.
       

 

-
+
         Quoting escape
       

 

@@ -1071,7 +1071,7 @@
 \*+aaa
 
 

-
+
         Unicode escapes
       

 

@@ -1081,7 +1081,7 @@
         followed by a sequence of zero or more combining characters.
       

 

-
+
         Matching
         Line Endings
       

@@ -1090,7 +1090,7 @@
         sequence, specifically it is identical to the expression (?>\x0D\x0A?|[\x0A-\x0C\x85\x{2028}\x{2029}]).
       

 

-
+
         Keeping
         back some text
       

@@ -1105,7 +1105,7 @@
         This can be used to simulate variable width lookbehind assertions.
       

 

-
+
         Any other
         escape
       

@@ -1114,7 +1114,7 @@
         \@ matches a literal '@'.
       

 

-
+
         Perl
         Extended Patterns
       

@@ -1123,7 +1123,7 @@
         (?.
       

 

-
+
         Named
         Subexpressions
       

@@ -1145,14 +1145,14 @@
         format string for search and replace operations, or in the match_results member functions.
       

 

-
+
         Comments
       

 

         (?# ... ) is treated as a comment, it's contents are ignored.
       

 

-
+
         Modifiers
       

 

@@ -1166,7 +1166,7 @@
         pattern only.
       

 

-
+
         Non-marking
         groups
       

@@ -1175,7 +1175,7 @@
         an additional sub-expression.
       

 

-
+
         Branch reset
       

 

@@ -1197,7 +1197,7 @@
 # 1            2         2  3        2     3     4
 
 

-
+
         Lookahead
       

 

@@ -1220,7 +1220,7 @@
         could be used to validate the password.
       

 

-
+
         Lookbehind
       

 

@@ -1234,7 +1234,7 @@
         (pattern must be of fixed length).
       

 

-
+
         Independent
         sub-expressions
       

@@ -1247,7 +1247,7 @@
         no match is found at all.
       

 

-
+
         Recursive
         Expressions
       

@@ -1271,7 +1271,7 @@
         to the next sub-expression to be declared.
       

 

-
+
         Conditional
         Expressions
       

@@ -1319,7 +1319,7 @@
         
 
 

-
+
         Operator
         precedence
       

@@ -1354,7 +1354,7 @@
         
 
 

-
+
         What gets
         matched
       

@@ -1529,7 +1529,7 @@
 

 

 

-
+
         Variations
       

 

@@ -1538,7 +1538,7 @@
         and JScript are all synonyms for perl.
       

 

-
+
         Options
       

 

@@ -1550,7 +1550,7 @@
         are to be applied.
       

 

-
+
         Pattern
         Modifiers
       

@@ -1562,7 +1562,7 @@
         and no_mod_s.
       

 

-
+
         References
       

 

@@ -1571,7 +1571,7 @@
 
 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/boost_regex/unicode.html b/doc/html/boost_regex/unicode.html
index 94b8709f..25441b93 100644
--- a/doc/html/boost_regex/unicode.html
+++ b/doc/html/boost_regex/unicode.html
@@ -1,6 +1,6 @@
 
 
-
+
 Unicode and Boost.Regex
 
 
@@ -30,7 +30,7 @@
       There are two ways to use Boost.Regex with Unicode strings:
     

 

-
+
       Rely on wchar_t
     

 

@@ -56,7 +56,7 @@
       
 

 

-
+
       Use
       a Unicode Aware Regular Expression Type.
     

@@ -71,7 +71,7 @@
 
 
-

 
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

         Distributed under 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)
       

diff --git a/doc/html/index.html b/doc/html/index.html
index cb420c49..64a7716c 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -1,6 +1,6 @@
 
 
-
+
 Boost.Regex
 
 
@@ -26,9 +26,9 @@
 

 John Maddock
 

-
Copyright © 1998 -2007 John Maddock

+
Copyright © 1998 -2007 John Maddock

 

-

+

         Distributed under 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)
       

@@ -196,7 +196,7 @@
   

 

 
-
+
Last revised: July 29, 2009 at 15:59:46 GMT
Last revised: December 05, 2009 at 12:09:47 GMT

 

 

 

diff --git a/doc/match_result.qbk b/doc/match_result.qbk
index 8e1ae788..680f868f 100644
--- a/doc/match_result.qbk
+++ b/doc/match_result.qbk
@@ -105,11 +105,12 @@ Class template `match_results` is most commonly used as one of the typedefs
       const_iterator ``[link boost_regex.match_results.begin begin]``() const;
       const_iterator ``[link boost_regex.match_results.end end]``() const;
       // format:
-      template 
+      template 
       OutputIterator ``[link boost_regex.match_results.format format]``(OutputIterator out,
-                           const string_type& fmt,
+                           Formatter fmt,
                            match_flag_type flags = format_default) const;
-      string_type ``[link boost_regex.match_results.format2 format]``(const string_type& fmt,
+      template 
+      string_type ``[link boost_regex.match_results.format2 format]``(Formatter fmt,
                         match_flag_type flags = format_default) const;
 
       allocator_type ``[link boost_regex.match_results.get_allocator get_allocator]``() const;
@@ -352,15 +353,25 @@ marked sub-expression matches stored in *this.
 [#boost_regex.match_results_format]
 [#boost_regex.match_results.format]
 
-   template 
+   template 
    OutputIterator format(OutputIterator out,
-                        const string_type& fmt,
-                        match_flag_type flags = format_default);
+                         Formatter fmt,
+                         match_flag_type flags = format_default);
 
 [*Requires]: The type `OutputIterator` conforms to the Output Iterator requirements 
 (C++ std 24.1.2).
 
-[*Effects]: Copies the character sequence `[fmt.begin(), fmt.end())` to 
+The type `Formatter` must be either a pointer to a null-terminated string
+of type `char_type[]`, or be a container of `char_type`'s (for example
+`std::basic_string`) or be a unary, binary or ternary functor
+that computes the replacement string from a function call: either 
+`fmt(*this)` which must return a container of `char_type`'s to be used as the
+replacement text, or either `fmt(*this, out)` or `fmt(*this, out, flags)`, both of
+which write the replacement text to `*out`, and then return the new
+OutputIterator position.
+
+[*Effects]: If `fmt` is either a null-terminated string, or a 
+container of `char_type`'s, then copies the character sequence `[fmt.begin(), fmt.end())` to 
 `OutputIterator` /out/. For each format specifier or escape sequence in 
 /fmt/, replace that sequence with either the character(s) it represents, 
 or the sequence of characters within `*this` to which it refers. 
@@ -369,6 +380,16 @@ escape sequences are recognized, by default this is the format used by
 ECMA-262, ECMAScript Language Specification, Chapter 15 part 
 5.4.11 String.prototype.replace.
 
+If `fmt` is a function object, then depending on the number of arguments
+the function object accepts, it will either:
+
+* Call `fmt(*this)` and copy the result to `OutputIterator`
+/out/.
+* Call `fmt(*this, out)`.
+* Call `fmt(*this, out, flags)`.
+
+In all cases the new position of the `OutputIterator` is returned.
+
 See the [link boost_regex.format format syntax guide for more information].
 
 [*Returns]: out.
@@ -376,10 +397,23 @@ See the [link boost_regex.format format syntax guide for more information].
 
 [#boost_regex.match_results.format2]
 
-   string_type format(const string_type& fmt,
-                     match_flag_type flags = format_default);
+   template 
+   string_type format(Formatter fmt,
+                      match_flag_type flags = format_default);
 
-[*Effects]: Returns a copy of the string /fmt/. For each format specifier or 
+[*Requires]
+The type `Formatter` must be either a pointer to a null-terminated string
+of type `char_type[]`, or be a container of `char_type`'s (for example
+`std::basic_string`) or be a unary, binary or ternary functor
+that computes the replacement string from a function call: either 
+`fmt(*this)` which must return a container of `char_type`'s to be used as the
+replacement text, or either `fmt(*this, out)` or `fmt(*this, out, flags)`, both of
+which write the replacement text to `*out`, and then return the new
+OutputIterator position.
+
+[*Effects]: 
+If `fmt` is either a null-terminated string, or a 
+container of `char_type`'s, then copies the string /fmt/: For each format specifier or 
 escape sequence in /fmt/, replace that sequence with either the 
 character(s) it represents, or the sequence of characters within `*this` to 
 which it refers. The bitmasks specified in flags determines what format 
@@ -387,6 +421,15 @@ specifiers or escape sequences are recognized, by default this is the format
 used by ECMA-262, ECMAScript Language Specification, Chapter 15 part 
 5.4.11 String.prototype.replace.
 
+If `fmt` is a function object, then depending on the number of arguments
+the function object accepts, it will either:
+
+* Call `fmt(*this)` and return the result.
+* Call `fmt(*this, unspecified-output-iterator)`, where `unspecified-output-iterator`
+is an unspecified OutputIterator type used to copy the output to the string result.
+* Call `fmt(*this, unspecified-output-iterator, flags)`, where `unspecified-output-iterator`
+is an unspecified OutputIterator type used to copy the output to the string result.
+
 See the [link boost_regex.format format syntax guide for more information].
 
 [#boost_regex.match_results.get_allocator]
diff --git a/doc/regex_format.qbk b/doc/regex_format.qbk
index e59549e1..d9e249ba 100644
--- a/doc/regex_format.qbk
+++ b/doc/regex_format.qbk
@@ -21,15 +21,10 @@ The algorithm `regex_format` takes the results of a match and creates a
 new string based upon a format string, `regex_format` can be used for 
 search and replace operations:
 
-   template 
+   template 
    OutputIterator regex_format(OutputIterator out,
                               const match_results& m,
-                              const charT* fmt,
-                              match_flag_type flags = 0);
-   template 
-   OutputIterator regex_format(OutputIterator out,
-                              const match_results& m,
-                              const std::basic_string& fmt,
+                              Formatter fmt,
                               match_flag_type flags = 0);
 
 The library also defines the following convenience variation of 
@@ -39,16 +34,10 @@ than outputting to an iterator.
 [note This version may not be available, or may be available in a more limited 
 form, depending upon your compilers capabilities]
 
-   template 
+   template 
    std::basic_string regex_format
                                     (const match_results& m, 
-                                    const charT* fmt,
-                                    match_flag_type flags = 0);
-
-   template 
-   std::basic_string regex_format
-                                    (const match_results& m, 
-                                    const std::basic_string& fmt,
+                                    Formatter fmt,
                                     match_flag_type flags = 0);
 
 Parameters to the main version of the function are passed as follows:
@@ -57,7 +46,7 @@ Parameters to the main version of the function are passed as follows:
 [[Parameter][Description]]
 [[`OutputIterator out`][An output iterator type, the output string is sent to this iterator. Typically this would be a std::ostream_iterator. 	 ]]
 [[`const match_results& m`][An instance of [match_results] obtained from one of the matching algorithms above, and denoting what matched. 	 ]]
-[[`const charT* fmt`][A format string that determines how the match is transformed into the new string. 	 ]]
+[[`Formatter fmt`][Either a format string that determines how the match is transformed into the new string, or a functor that computes the new string from /m/ - see [match_results_format]. 	 ]]
 [[`unsigned flags`][Optional flags which describe how the format string is to be interpreted. 	 ]]
 ]
 
diff --git a/doc/regex_replace.qbk b/doc/regex_replace.qbk
index 252397aa..58f88778 100644
--- a/doc/regex_replace.qbk
+++ b/doc/regex_replace.qbk
@@ -18,34 +18,37 @@ output unchanged only if the /flags/ parameter does not have the
 flag `format_no_copy` set. If the flag `format_first_only` is set then 
 only the first occurrence is replaced rather than all occurrences. 
 
-   template 
+   template 
    OutputIterator regex_replace(OutputIterator out,
                                 BidirectionalIterator first,
                                 BidirectionalIterator last,
                                 const basic_regex& e,
-                                const basic_string& fmt,
+                                Formatter fmt,
                                 match_flag_type flags = match_default);
 
-   template 
+   template 
    basic_string regex_replace(const basic_string& s,
                                      const basic_regex& e,
-                                     const basic_string& fmt,
+                                     Formatter fmt,
                                      match_flag_type flags = match_default);
 
 
 [h4 Description]
 
-   template 
+   template 
    OutputIterator regex_replace(OutputIterator out,
                                 BidirectionalIterator first,
                                 BidirectionalIterator last,
                                 const basic_regex& e,
-                                const basic_string& fmt,
+                                Formatter fmt,
                                 match_flag_type flags = match_default);
 
 Enumerates all the occurences of expression /e/ in the sequence \[first, last), 
 replacing each occurence with the string that results by merging the 
 match found with the format string /fmt/, and copies the resulting string to /out/. 
+In the case that /fmt/ is a unary, binary or ternary function object, then the
+character sequence generated by that object is copied unchanged to the output when performing
+a substitution.
 
 If the flag `format_no_copy` is set in /flags/ then unmatched sections of 
 text are not copied to output. 
@@ -57,6 +60,17 @@ The manner in which the format string /fmt/ is interpretted, along with the
 rules used for finding matches, are determined by the flags set in /flags/:
 see [match_flag_type].
 
+[*Requires]
+The type `Formatter` must be either a pointer to a null-terminated string
+of type `char_type[]`, or be a container of `char_type`'s (for example
+`std::basic_string`) or be a unary, binary or ternary functor
+that computes the replacement string from a function call: either 
+`fmt(what)` which must return a container of `char_type`'s to be used as the
+replacement text, or either `fmt(what, out)` or `fmt(what, out, flags)`, both of
+which write the replacement text to `*out`, and then return the new
+OutputIterator position.  In each case `what` is the [match_results] object
+that represents the match found.
+
 [*Effects]: Constructs an [regex_iterator] object:
 
    regex_iterator 
@@ -107,12 +121,23 @@ memory allocation (if Boost.Regex is configured in non-recursive mode).
 
 [*Returns]: out.
 
-   template 
+   template 
    basic_string regex_replace(const basic_string& s,
                                      const basic_regex& e,
-                                     const basic_string& fmt,
+                                     Formatter fmt,
                                      match_flag_type flags = match_default);
 
+[*Requires]
+The type `Formatter` must be either a pointer to a null-terminated string
+of type `char_type[]`, or be a container of `char_type`'s (for example
+`std::basic_string`) or be a unary, binary or ternary functor
+that computes the replacement string from a function call: either 
+`fmt(what)` which must return a container of `char_type`'s to be used as the
+replacement text, or either `fmt(what, out)` or `fmt(what, out, flags)`, both of
+which write the replacement text to `*out`, and then return the new
+OutputIterator position.  In each case `what` is the [match_results] object
+that represents the match found.
+
 [*Effects]: Constructs an object `basic_string result`, calls 
 `regex_replace(back_inserter(result), s.begin(), s.end(), e, fmt, flags)`, 
 and then returns `result`.
diff --git a/example/snippets/icu_example.cpp b/example/snippets/icu_example.cpp
index 8f4a41ed..7dbd5b84 100644
--- a/example/snippets/icu_example.cpp
+++ b/example/snippets/icu_example.cpp
@@ -28,7 +28,7 @@
 // Find out if *password* meets our password requirements,
 // as defined by the regular expression *requirements*.
 //
-bool is_valid_password(const UnicodeString& password, const UnicodeString& requirements)
+bool is_valid_password(const U_NAMESPACE_QUALIFIER UnicodeString& password, const U_NAMESPACE_QUALIFIER UnicodeString& requirements)
 {
    return boost::u32regex_match(password, boost::make_u32regex(requirements));
 }
@@ -52,7 +52,7 @@ std::string get_filename(const std::string& path)
    }
 }
 
-UnicodeString extract_greek(const UnicodeString& text)
+U_NAMESPACE_QUALIFIER UnicodeString extract_greek(const U_NAMESPACE_QUALIFIER UnicodeString& text)
 {
    // searches through some UTF-16 encoded text for a block encoded in Greek,
    // this expression is imperfect, but the best we can do for now - searching
@@ -62,7 +62,7 @@ UnicodeString extract_greek(const UnicodeString& text)
    if(boost::u32regex_search(text, what, r))
    {
       // extract $0 as a UnicodeString:
-      return UnicodeString(what[0].first, what.length(0));
+      return U_NAMESPACE_QUALIFIER UnicodeString(what[0].first, what.length(0));
    }
    else
    {
@@ -127,7 +127,7 @@ void enumerate_currencies2(const std::string& text)
 const boost::u32regex e = boost::make_u32regex("\\A(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})\\z");
 const char* human_format = "$1-$2-$3-$4";
 
-UnicodeString human_readable_card_number(const UnicodeString& s)
+U_NAMESPACE_QUALIFIER UnicodeString human_readable_card_number(const U_NAMESPACE_QUALIFIER UnicodeString& s)
 {
    return boost::u32regex_replace(s, e, human_format);
 }
@@ -136,8 +136,8 @@ UnicodeString human_readable_card_number(const UnicodeString& s)
 int main()
 {
    // password checks using u32regex_match:
-   UnicodeString pwd = "abcDEF---";
-   UnicodeString pwd_check = "(?=.*[[:lower:]])(?=.*[[:upper:]])(?=.*[[:punct:]]).{6,}";
+   U_NAMESPACE_QUALIFIER UnicodeString pwd = "abcDEF---";
+   U_NAMESPACE_QUALIFIER UnicodeString pwd_check = "(?=.*[[:lower:]])(?=.*[[:upper:]])(?=.*[[:punct:]]).{6,}";
    bool b = is_valid_password(pwd, pwd_check);
    assert(b);
    pwd = "abcD-";
@@ -152,8 +152,8 @@ int main()
    assert(file == "d.h");
 
    // Greek text extraction with u32regex_search:
-   UnicodeString text = L"Some where in \x0391\x039D\x0395\x0398\x0391 2004";
-   UnicodeString greek = extract_greek(text);
+   U_NAMESPACE_QUALIFIER UnicodeString text = L"Some where in \x0391\x039D\x0395\x0398\x0391 2004";
+   U_NAMESPACE_QUALIFIER UnicodeString greek = extract_greek(text);
    assert(greek == L"\x0391\x039D\x0395\x0398\x0391 2004");
 
    // extract currency symbols with associated value, use iterator interface:
@@ -161,7 +161,7 @@ int main()
    enumerate_currencies(text2);
    enumerate_currencies2(text2);
 
-   UnicodeString credit_card_number = "1234567887654321";
+   U_NAMESPACE_QUALIFIER UnicodeString credit_card_number = "1234567887654321";
    credit_card_number = human_readable_card_number(credit_card_number);
    assert(credit_card_number == "1234-5678-8765-4321");
    return 0;
diff --git a/example/snippets/regex_grep_example_1.cpp b/example/snippets/regex_grep_example_1.cpp
index 13161dfb..0f0f4ede 100644
--- a/example/snippets/regex_grep_example_1.cpp
+++ b/example/snippets/regex_grep_example_1.cpp
@@ -67,6 +67,8 @@ public:
                what[5].first - base;
       return true;
    }
+private:
+   IndexClassesPred& operator=(const IndexClassesPred&);
 };
 
 void IndexClasses(map_type& m, const std::string& file)
diff --git a/example/snippets/regex_match_example.cpp b/example/snippets/regex_match_example.cpp
index bd35d169..f714f94b 100644
--- a/example/snippets/regex_match_example.cpp
+++ b/example/snippets/regex_match_example.cpp
@@ -55,11 +55,11 @@ int process_ftp(const char* response, std::string* msg)
 istream& getline(istream& is, std::string& s)
 {
    s.erase();
-   char c = is.get();
+   char c = static_cast(is.get());
    while(c != '\n')
    {
       s.append(1, c);
-      c = is.get();
+      c = static_cast(is.get());
    }
    return is;
 }
diff --git a/example/snippets/regex_merge_example.cpp b/example/snippets/regex_merge_example.cpp
index 9b226ecd..a537189d 100644
--- a/example/snippets/regex_merge_example.cpp
+++ b/example/snippets/regex_merge_example.cpp
@@ -86,8 +86,8 @@ int main(int argc, const char** argv)
    return 0;
 }
 
-extern const char* pre_expression = "(<)|(>)|\\r";
-extern const char* pre_format = "(?1<)(?2>)";
+const char* pre_expression = "(<)|(>)|\\r";
+const char* pre_format = "(?1<)(?2>)";
 
 
 const char* expression_text = // preprocessor directives: index 1
diff --git a/example/snippets/regex_replace_example.cpp b/example/snippets/regex_replace_example.cpp
index 69ca40ed..a864d79f 100644
--- a/example/snippets/regex_replace_example.cpp
+++ b/example/snippets/regex_replace_example.cpp
@@ -86,8 +86,8 @@ int main(int argc, const char** argv)
    return 0;
 }
 
-extern const char* pre_expression = "(<)|(>)|(&)|\\r";
-extern const char* pre_format = "(?1<)(?2>)(?3&)";
+const char* pre_expression = "(<)|(>)|(&)|\\r";
+const char* pre_format = "(?1<)(?2>)(?3&)";
 
 
 const char* expression_text = // preprocessor directives: index 1
diff --git a/example/snippets/regex_split_example_1.cpp b/example/snippets/regex_split_example_1.cpp
index 25d2e576..4db5bdd0 100644
--- a/example/snippets/regex_split_example_1.cpp
+++ b/example/snippets/regex_split_example_1.cpp
@@ -36,11 +36,11 @@ using namespace std;
 istream& getline(istream& is, std::string& s)
 {
    s.erase();
-   char c = is.get();
+   char c = static_cast(is.get());
    while(c != '\n')
    {
       s.append(1, c);
-      c = is.get();
+      c = static_cast(is.get());
    }
    return is;
 }
diff --git a/example/snippets/regex_token_iterator_eg_1.cpp b/example/snippets/regex_token_iterator_eg_1.cpp
index e12881e8..f1ecb44d 100644
--- a/example/snippets/regex_token_iterator_eg_1.cpp
+++ b/example/snippets/regex_token_iterator_eg_1.cpp
@@ -29,11 +29,11 @@ using namespace std;
 istream& getline(istream& is, std::string& s)
 {
    s.erase();
-   char c = is.get();
+   char c = static_cast(is.get());
    while(c != '\n')
    {
       s.append(1, c);
-      c = is.get();
+      c = static_cast(is.get());
    }
    return is;
 }
diff --git a/example/timer/regex_timer.cpp b/example/timer/regex_timer.cpp
index 112b0cb0..ad94e7ff 100644
--- a/example/timer/regex_timer.cpp
+++ b/example/timer/regex_timer.cpp
@@ -9,6 +9,10 @@
  *
  */
 
+#ifdef _MSC_VER
+#pragma warning(disable: 4996 4127)
+#endif
+
 #include 
 #include 
 #include 
@@ -54,7 +58,7 @@ ostream& operator << (ostream& os, const std::wstring& s)
    j = s.end();
    while(i != j)
    {
-      os.put(*i);
+      os.put(static_cast(*i));
       ++i;
    }
    return os;
@@ -96,15 +100,15 @@ namespace boost{
 istream& getline(istream& is, std::string& s)
 {
    s.erase();
-   char c = is.get();
+   char c = static_cast(is.get());
    while(c != '\n')
    {
       s.append(1, c);
-      c = is.get();
+      c = static_cast(is.get());
    }
    return is;
 }
-#elif defined(__CYGWIN__)
+#else
 istream& getline(istream& is, std::string& s)
 {
    std::getline(is, s);
@@ -112,8 +116,6 @@ istream& getline(istream& is, std::string& s)
       s.erase(s.size() - 1);
    return is;
 }
-#else
-using std::getline;
 #endif
 }
 
@@ -148,8 +150,8 @@ int main(int argc, char**argv)
    std::size_t nsubs;
    boost::timer t;
    double tim;
-   bool result;
-   int iters = 100;
+   int result = 0;
+   unsigned iters = 100;
    double wait_time = (std::min)(t.elapsed_min() * 1000, 1.0);
 
    while(true)
@@ -202,7 +204,7 @@ int main(int argc, char**argv)
          ds.erase(ds.begin(), ds.end());
          std::copy(s2.begin(), s2.end(), std::back_inserter(ds));
 
-         int i;
+         unsigned i;
          iters = 10;
          tim = 1.1;
 
@@ -217,7 +219,7 @@ int main(int argc, char**argv)
 
          // measure time interval for basic_regex
          do{
-            iters *= (tim > 0.001) ? (1.1/tim) : 100;
+            iters *= static_cast((tim > 0.001) ? (1.1/tim) : 100);
             t.restart();
             for(i =0; i < iters; ++i)
             {
@@ -251,7 +253,7 @@ int main(int argc, char**argv)
          // cache load:
          regex_search(ws2, wsm, wex);
          do{
-            iters *= (tim > 0.001) ? (1.1/tim) : 100;
+            iters *= static_cast((tim > 0.001) ? (1.1/tim) : 100);
             t.restart();
             for(i = 0; i < iters; ++i)
             {
@@ -289,7 +291,7 @@ int main(int argc, char**argv)
          // cache load:
          regex_search(ds.begin(), ds.end(), dm, ex);
          do{
-            iters *= (tim > 0.001) ? (1.1/tim) : 100;
+            iters *= static_cast((tim > 0.001) ? (1.1/tim) : 100);
             t.restart();
             for(i = 0; i < iters; ++i)
             {
@@ -326,7 +328,7 @@ int main(int argc, char**argv)
          // cache load:
          regexecA(&r, s2.c_str(), nsubs, matches.get(), 0);
          do{
-            iters *= (tim > 0.001) ? (1.1/tim) : 100;
+            iters *= static_cast((tim > 0.001) ? (1.1/tim) : 100);
             t.restart();
             for(i = 0; i < iters; ++i)
             {
@@ -357,7 +359,7 @@ int main(int argc, char**argv)
             ts.erase();
             ts.assign(s2.begin() + matches[0].rm_eo, s2.end());
             cout << ts;
-            cout << "\" (matched=" << (matches[0].rm_eo != s2.size()) << ")" << endl << endl;
+            cout << "\" (matched=" << (matches[0].rm_eo != (int)s2.size()) << ")" << endl << endl;
          }
       }
       regfreeA(&r);
diff --git a/include/boost/regex/concepts.hpp b/include/boost/regex/concepts.hpp
index 98fd5941..fa2ea48c 100644
--- a/include/boost/regex/concepts.hpp
+++ b/include/boost/regex/concepts.hpp
@@ -747,6 +747,46 @@ struct RegexConcept
 };
 
 #ifndef BOOST_REGEX_TEST_STD
+
+template 
+struct functor1
+{
+   typedef typename M::char_type char_type;
+   const char_type* operator()(const M&)
+   {
+      static const char_type c = static_cast(0);
+      return &c;
+   }
+};
+template 
+struct functor1b
+{
+   typedef typename M::char_type char_type;
+   std::vector operator()(const M&)
+   {
+      static const std::vector c;
+      return c;
+   }
+};
+template 
+struct functor2
+{
+   template 
+   O operator()(const M& /*m*/, O i)
+   {
+      return i;
+   }
+};
+template 
+struct functor3
+{
+   template 
+   O operator()(const M& /*m*/, O i, regex_constants::match_flag_type)
+   {
+      return i;
+   }
+};
+
 //
 // BoostRegexConcept:
 // Test every interface in the Boost implementation:
@@ -764,6 +804,7 @@ struct BoostRegexConcept
    typedef std::basic_string string_type;
    typedef typename Regex::const_iterator const_iterator;
    typedef bidirectional_iterator_archetype BidiIterator;
+   typedef output_iterator_archetype OutputIterator;
    typedef global_regex_namespace::sub_match sub_match_type;
    typedef global_regex_namespace::match_results match_results_type;
 
@@ -884,6 +925,58 @@ struct BoostRegexConcept
       m_stream << m_sub;
       m_stream << m_cresults;
 #endif
+      //
+      // Extended formatting with a functor:
+      //
+      regex_constants::match_flag_type f = regex_constants::match_default;
+      OutputIterator out = static_object::get();
+      functor3 func3;
+      out = regex_format(out, m_cresults, func3, f);
+      out = regex_format(out, m_cresults, func3);
+      functor2 func2;
+      out = regex_format(out, m_cresults, func2, f);
+      out = regex_format(out, m_cresults, func2);
+      functor1 func1;
+      out = regex_format(out, m_cresults, func1, f);
+      out = regex_format(out, m_cresults, func1);
+
+      m_string += regex_format(m_cresults, func3, f);
+      m_string += regex_format(m_cresults, func3);
+      m_string += regex_format(m_cresults, func2, f);
+      m_string += regex_format(m_cresults, func2);
+      m_string += regex_format(m_cresults, func1, f);
+      m_string += regex_format(m_cresults, func1);
+
+      out = m_cresults.format(out, func3, f);
+      out = m_cresults.format(out, func3);
+      out = m_cresults.format(out, func2, f);
+      out = m_cresults.format(out, func2);
+      out = m_cresults.format(out, func1, f);
+      out = m_cresults.format(out, func1);
+
+      m_string += m_cresults.format(func3, f);
+      m_string += m_cresults.format(func3);
+      m_string += m_cresults.format(func2, f);
+      m_string += m_cresults.format(func2);
+      m_string += m_cresults.format(func1, f);
+      m_string += m_cresults.format(func1);
+
+      out = regex_replace(out, m_in, m_in, ce, func3, f);
+      out = regex_replace(out, m_in, m_in, ce, func3);
+      out = regex_replace(out, m_in, m_in, ce, func2, f);
+      out = regex_replace(out, m_in, m_in, ce, func2);
+      out = regex_replace(out, m_in, m_in, ce, func1, f);
+      out = regex_replace(out, m_in, m_in, ce, func1);
+
+      functor3 > func3s;
+      functor2 > func2s;
+      functor1 > func1s;
+      m_string += regex_replace(m_string, ce, func3s, f);
+      m_string += regex_replace(m_string, ce, func3s);
+      m_string += regex_replace(m_string, ce, func2s, f);
+      m_string += regex_replace(m_string, ce, func2s);
+      m_string += regex_replace(m_string, ce, func1s, f);
+      m_string += regex_replace(m_string, ce, func1s);
    }
 
    std::basic_ostream m_stream;
@@ -893,6 +986,7 @@ struct BoostRegexConcept
    const value_type m_char;
    match_results_type m_results;
    const match_results_type m_cresults;
+   BidiIterator m_in;
 
    BoostRegexConcept();
    BoostRegexConcept(const BoostRegexConcept&);
diff --git a/include/boost/regex/config.hpp b/include/boost/regex/config.hpp
index 8306f3ff..e4b21384 100644
--- a/include/boost/regex/config.hpp
+++ b/include/boost/regex/config.hpp
@@ -92,6 +92,12 @@
 #if defined(_MSC_VER) && !defined(_MSC_EXTENSIONS)
 #  define BOOST_REGEX_NO_EXTERNAL_TEMPLATES
 #endif
+/*
+ * Shared regex lib will crash without this, frankly it looks a lot like a gcc bug:
+ */
+#if defined(__MINGW32__)
+#  define BOOST_REGEX_NO_EXTERNAL_TEMPLATES
+#endif
 
 /*
  * If there isn't good enough wide character support then there will
diff --git a/include/boost/regex/icu.hpp b/include/boost/regex/icu.hpp
index 24715572..c8770c6d 100644
--- a/include/boost/regex/icu.hpp
+++ b/include/boost/regex/icu.hpp
@@ -376,7 +376,7 @@ inline u32regex make_u32regex(const std::basic_string& s, boost::regex_
 //
 // Construction from ICU string type:
 //
-inline u32regex make_u32regex(const UnicodeString& s, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl)
+inline u32regex make_u32regex(const U_NAMESPACE_QUALIFIER UnicodeString& s, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl)
 {
    return re_detail::do_make_u32regex(s.getBuffer(), s.getBuffer() + s.length(), opt, static_cast const*>(0));
 }
@@ -498,7 +498,7 @@ inline bool u32regex_match(const std::wstring& s,
    return re_detail::do_regex_match(s.begin(), s.end(), m, e, flags, static_cast const*>(0));
 }
 #endif
-inline bool u32regex_match(const UnicodeString& s, 
+inline bool u32regex_match(const U_NAMESPACE_QUALIFIER UnicodeString& s, 
                         match_results& m, 
                         const u32regex& e, 
                         match_flag_type flags = match_default)
@@ -562,7 +562,7 @@ inline bool u32regex_match(const std::wstring& s,
    return re_detail::do_regex_match(s.begin(), s.end(), m, e, flags, static_cast const*>(0));
 }
 #endif
-inline bool u32regex_match(const UnicodeString& s, 
+inline bool u32regex_match(const U_NAMESPACE_QUALIFIER UnicodeString& s, 
                         const u32regex& e, 
                         match_flag_type flags = match_default)
 {
@@ -683,7 +683,7 @@ inline bool u32regex_search(const std::wstring& s,
    return re_detail::do_regex_search(s.begin(), s.end(), m, e, flags, s.begin(), static_cast const*>(0));
 }
 #endif
-inline bool u32regex_search(const UnicodeString& s, 
+inline bool u32regex_search(const U_NAMESPACE_QUALIFIER UnicodeString& s, 
                         match_results& m, 
                         const u32regex& e, 
                         match_flag_type flags = match_default)
@@ -744,7 +744,7 @@ inline bool u32regex_search(const std::wstring& s,
    return re_detail::do_regex_search(s.begin(), s.end(), m, e, flags, s.begin(), static_cast const*>(0));
 }
 #endif
-inline bool u32regex_search(const UnicodeString& s, 
+inline bool u32regex_search(const U_NAMESPACE_QUALIFIER UnicodeString& s, 
                         const u32regex& e, 
                         match_flag_type flags = match_default)
 {
@@ -921,7 +921,7 @@ inline OutputIterator u32regex_replace(OutputIterator out,
                          Iterator first,
                          Iterator last,
                          const u32regex& e, 
-                         const UnicodeString& fmt,
+                         const U_NAMESPACE_QUALIFIER UnicodeString& fmt,
                          match_flag_type flags = match_default)
 {
    return re_detail::extract_output_base
@@ -966,9 +966,9 @@ namespace re_detail{
 
 class unicode_string_out_iterator
 {
-   UnicodeString* out;
+   U_NAMESPACE_QUALIFIER UnicodeString* out;
 public:
-   unicode_string_out_iterator(UnicodeString& s) : out(&s) {}
+   unicode_string_out_iterator(U_NAMESPACE_QUALIFIER UnicodeString& s) : out(&s) {}
    unicode_string_out_iterator& operator++() { return *this; }
    unicode_string_out_iterator& operator++(int) { return *this; }
    unicode_string_out_iterator& operator*() { return *this; }
@@ -986,23 +986,23 @@ public:
 
 }
 
-inline UnicodeString u32regex_replace(const UnicodeString& s,
+inline U_NAMESPACE_QUALIFIER UnicodeString u32regex_replace(const U_NAMESPACE_QUALIFIER UnicodeString& s,
                          const u32regex& e, 
                          const UChar* fmt,
                          match_flag_type flags = match_default)
 {
-   UnicodeString result;
+   U_NAMESPACE_QUALIFIER UnicodeString result;
    re_detail::unicode_string_out_iterator i(result);
    u32regex_replace(i, s.getBuffer(), s.getBuffer()+s.length(), e, fmt, flags);
    return result;
 }
 
-inline UnicodeString u32regex_replace(const UnicodeString& s,
+inline U_NAMESPACE_QUALIFIER UnicodeString u32regex_replace(const U_NAMESPACE_QUALIFIER UnicodeString& s,
                          const u32regex& e, 
-                         const UnicodeString& fmt,
+                         const U_NAMESPACE_QUALIFIER UnicodeString& fmt,
                          match_flag_type flags = match_default)
 {
-   UnicodeString result;
+   U_NAMESPACE_QUALIFIER UnicodeString result;
    re_detail::unicode_string_out_iterator i(result);
    re_detail::do_regex_replace(
          re_detail::make_utf32_out(i, static_cast const*>(0)),
diff --git a/include/boost/regex/pending/object_cache.hpp b/include/boost/regex/pending/object_cache.hpp
index 2a7e00bc..e1aa191d 100644
--- a/include/boost/regex/pending/object_cache.hpp
+++ b/include/boost/regex/pending/object_cache.hpp
@@ -73,7 +73,9 @@ boost::shared_ptr object_cache::get(const Key& k, siz
    // for now just throw, but we should never really get here...
    //
    ::boost::throw_exception(std::runtime_error("Error in thread safety code: could not acquire a lock"));
+#ifdef BOOST_NO_UNREACHABLE_RETURN_DETECTION
    return boost::shared_ptr();
+#endif
 #else
    return do_get(k, max_cache_size);
 #endif
diff --git a/include/boost/regex/v4/basic_regex_creator.hpp b/include/boost/regex/v4/basic_regex_creator.hpp
index 6f005054..d847b96f 100644
--- a/include/boost/regex/v4/basic_regex_creator.hpp
+++ b/include/boost/regex/v4/basic_regex_creator.hpp
@@ -787,7 +787,7 @@ void basic_regex_creator::fixup_recursions(re_syntax_base* state)
                      //
                      if(0 == (this->flags() & regex_constants::no_except))
                      {
-                        std::string message = this->m_pdata->m_ptraits->error_string(boost::regex_constants::error_bad_pattern);
+                        std::string message = "Encountered a forward reference to a marked sub-expression that does not exist.";
                         boost::regex_error e(message, boost::regex_constants::error_bad_pattern, 0);
                         e.raise();
                      }
@@ -828,7 +828,7 @@ void basic_regex_creator::fixup_recursions(re_syntax_base* state)
                //
                if(0 == (this->flags() & regex_constants::no_except))
                {
-                  std::string message = this->m_pdata->m_ptraits->error_string(boost::regex_constants::error_bad_pattern);
+                  std::string message = "Encountered a forward reference to a recursive sub-expression that does not exist.";
                   boost::regex_error e(message, boost::regex_constants::error_bad_pattern, 0);
                   e.raise();
                }
@@ -893,7 +893,7 @@ void basic_regex_creator::create_startmaps(re_syntax_base* state)
             //
             if(0 == (this->flags() & regex_constants::no_except))
             {
-               std::string message = this->m_pdata->m_ptraits->error_string(boost::regex_constants::error_bad_pattern);
+               std::string message = "Invalid lookbehind assertion encountered in the regular expression.";
                boost::regex_error e(message, boost::regex_constants::error_bad_pattern, 0);
                e.raise();
             }
diff --git a/include/boost/regex/v4/basic_regex_parser.hpp b/include/boost/regex/v4/basic_regex_parser.hpp
index ebec35b6..7e5e3732 100644
--- a/include/boost/regex/v4/basic_regex_parser.hpp
+++ b/include/boost/regex/v4/basic_regex_parser.hpp
@@ -45,6 +45,11 @@ public:
    basic_regex_parser(regex_data* data);
    void parse(const charT* p1, const charT* p2, unsigned flags);
    void fail(regex_constants::error_type error_code, std::ptrdiff_t position);
+   void fail(regex_constants::error_type error_code, std::ptrdiff_t position, std::string message, std::ptrdiff_t start_pos);
+   void fail(regex_constants::error_type error_code, std::ptrdiff_t position, const std::string& message)
+   {
+      fail(error_code, position, message, position);
+   }
 
    bool parse_all();
    bool parse_basic();
@@ -141,6 +146,11 @@ void basic_regex_parser::parse(const charT* p1, const charT* p2,
    case regbase::literal:
       m_parser_proc = &basic_regex_parser::parse_literal;
       break;
+   default:
+      // Ooops, someone has managed to set more than one of the main option flags, 
+      // so this must be an error:
+      fail(regex_constants::error_unknown, 0, "An invalid combination of regular expression syntax flags was used.");
+      return;
    }
 
    // parse all our characters:
@@ -155,7 +165,7 @@ void basic_regex_parser::parse(const charT* p1, const charT* p2,
    // have had an unexpected ')' :
    if(!result)
    {
-      fail(regex_constants::error_paren, ::boost::re_detail::distance(m_base, m_position));
+      fail(regex_constants::error_paren, ::boost::re_detail::distance(m_base, m_position), "Found a closing ) with no corresponding openening parenthesis.");
       return;
    }
    // if an error has been set then give up now:
@@ -168,13 +178,40 @@ void basic_regex_parser::parse(const charT* p1, const charT* p2,
 
 template 
 void basic_regex_parser::fail(regex_constants::error_type error_code, std::ptrdiff_t position)
+{
+   // get the error message:
+   std::string message = this->m_pdata->m_ptraits->error_string(error_code);
+   fail(error_code, position, message);
+}
+
+template 
+void basic_regex_parser::fail(regex_constants::error_type error_code, std::ptrdiff_t position, std::string message, std::ptrdiff_t start_pos)
 {
    if(0 == this->m_pdata->m_status) // update the error code if not already set
       this->m_pdata->m_status = error_code;
    m_position = m_end; // don't bother parsing anything else
-   // get the error message:
-   std::string message = this->m_pdata->m_ptraits->error_string(error_code);
-   // and raise the exception, this will do nothing if exceptions are disabled:
+
+   //
+   // Augment error message with the regular expression text:
+   //
+   if(start_pos == position)
+      start_pos = (std::max)(static_cast(0), position - 10);
+   std::ptrdiff_t end_pos = (std::min)(position + 10, m_end - m_base);
+   if(error_code != regex_constants::error_empty)
+   {
+      if((start_pos != 0) || (end_pos != (m_end - m_base)))
+         message += "  The error occured while parsing the regular expression fragment: '";
+      else
+         message += "  The error occured while parsing the regular expression: '";
+      if(start_pos != end_pos)
+      {
+         message += std::string(m_base + start_pos, m_base + position);
+         message += ">>>HERE>>>";
+         message += std::string(m_base + position, m_base + end_pos);
+      }
+      message += "'.";
+   }
+
 #ifndef BOOST_NO_EXCEPTIONS
    if(0 == (this->flags() & regex_constants::no_except))
    {
@@ -282,7 +319,7 @@ bool basic_regex_parser::parse_extended()
    case regex_constants::syntax_star:
       if(m_position == this->m_base)
       {
-         fail(regex_constants::error_badrepeat, 0);
+         fail(regex_constants::error_badrepeat, 0, "The repeat operator \"*\" cannot start a regular expression.");
          return false;
       }
       ++m_position;
@@ -290,7 +327,7 @@ bool basic_regex_parser::parse_extended()
    case regex_constants::syntax_question:
       if(m_position == this->m_base)
       {
-         fail(regex_constants::error_badrepeat, 0);
+         fail(regex_constants::error_badrepeat, 0, "The repeat operator \"?\" cannot start a regular expression.");
          return false;
       }
       ++m_position;
@@ -298,7 +335,7 @@ bool basic_regex_parser::parse_extended()
    case regex_constants::syntax_plus:
       if(m_position == this->m_base)
       {
-         fail(regex_constants::error_badrepeat, 0);
+         fail(regex_constants::error_badrepeat, 0, "The repeat operator \"+\" cannot start a regular expression.");
          return false;
       }
       ++m_position;
@@ -307,7 +344,7 @@ bool basic_regex_parser::parse_extended()
       ++m_position;
       return parse_repeat_range(false);
    case regex_constants::syntax_close_brace:
-      fail(regex_constants::error_brace, this->m_position - this->m_end);
+      fail(regex_constants::error_brace, this->m_position - this->m_base, "Found a closing repetition operator } with no corresponding {.");
       return false;
    case regex_constants::syntax_or:
       return parse_alt();
@@ -512,7 +549,7 @@ bool basic_regex_parser::parse_basic_escape()
    case regex_constants::syntax_close_brace:
       if(this->flags() & regbase::no_intervals)
          return parse_literal();
-      fail(regex_constants::error_brace, this->m_position - this->m_base);
+      fail(regex_constants::error_brace, this->m_position - this->m_base, "Found a closing repetition operator } with no corresponding {.");
       return false;
    case regex_constants::syntax_or:
       if(this->flags() & regbase::bk_vbar)
@@ -607,7 +644,7 @@ bool basic_regex_parser::parse_basic_escape()
          case 'c':
          case 'C':
             // not supported yet:
-            fail(regex_constants::error_escape, m_position - m_base);
+            fail(regex_constants::error_escape, m_position - m_base, "The \\c and \\C escape sequences are not supported by POSIX basic regular expressions: try the Perl syntax instead.");
             return false;
          default:
             break;
@@ -705,7 +742,7 @@ escape_type_class_jump:
          char_class_type m;
          if(m_position == m_end)
          {
-            fail(regex_constants::error_escape, m_position - m_base);
+            fail(regex_constants::error_escape, m_position - m_base, "Incomplete property escape found.");
             return false;
          }
          // maybe have \p{ddd}
@@ -717,7 +754,7 @@ escape_type_class_jump:
                ++m_position;
             if(m_position == m_end)
             {
-               fail(regex_constants::error_escape, m_position - m_base);
+               fail(regex_constants::error_escape, m_position - m_base, "Closing } missing from property escape sequence.");
                return false;
             }
             m = this->m_traits.lookup_classname(++base, m_position++);
@@ -740,7 +777,7 @@ escape_type_class_jump:
             }
             return true;
          }
-         fail(regex_constants::error_ctype, m_position - m_base);
+         fail(regex_constants::error_ctype, m_position - m_base, "Escape sequence was neither a valid property nor a valid character class name.");
          return false;
       }
    case regex_constants::escape_type_reset_start_mark:
@@ -776,9 +813,10 @@ escape_type_class_jump:
       {
          bool have_brace = false;
          bool negative = false;
+         static const char* incomplete_message = "Incomplete \\g escape found.";
          if(++m_position == m_end)
          {
-            fail(regex_constants::error_escape, m_position - m_base);
+            fail(regex_constants::error_escape, m_position - m_base, incomplete_message);
             return false;
          }
          // maybe have \g{ddd}
@@ -786,7 +824,7 @@ escape_type_class_jump:
          {
             if(++m_position == m_end)
             {
-               fail(regex_constants::error_escape, m_position - m_base);
+               fail(regex_constants::error_escape, m_position - m_base, incomplete_message);
                return false;
             }
             have_brace = true;
@@ -794,7 +832,7 @@ escape_type_class_jump:
          negative = (*m_position == static_cast('-'));
          if((negative) && (++m_position == m_end))
          {
-            fail(regex_constants::error_escape, m_position - m_base);
+            fail(regex_constants::error_escape, m_position - m_base, incomplete_message);
             return false;
          }
          const charT* pc = m_position;
@@ -819,7 +857,7 @@ escape_type_class_jump:
          }
          else
          {
-            fail(regex_constants::error_backref, m_position - m_end);
+            fail(regex_constants::error_backref, m_position - m_base);
             return false;
          }
          m_position = pc;
@@ -827,7 +865,7 @@ escape_type_class_jump:
          {
             if((m_position == m_end) || (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_brace))
             {
-               fail(regex_constants::error_escape, m_position - m_base);
+               fail(regex_constants::error_escape, m_position - m_base, incomplete_message);
                return false;
             }
             ++m_position;
@@ -894,7 +932,7 @@ bool basic_regex_parser::parse_repeat(std::size_t low, std::size_
    }
    if(0 == this->m_last_state)
    {
-      fail(regex_constants::error_badrepeat, ::boost::re_detail::distance(m_base, m_position));
+      fail(regex_constants::error_badrepeat, ::boost::re_detail::distance(m_base, m_position), "Nothing to repeat.");
       return false;
    }
    if(this->m_last_state->type == syntax_element_endmark)
@@ -968,7 +1006,7 @@ bool basic_regex_parser::parse_repeat(std::size_t low, std::size_
       re_brace* pb = static_cast(this->insert_state(insert_point, syntax_element_startmark, sizeof(re_brace)));
       pb->index = -3;
       pb->icase = this->flags() & regbase::icase;
-      re_jump* jmp = static_cast(this->insert_state(insert_point + sizeof(re_brace), syntax_element_jump, sizeof(re_jump)));
+      jmp = static_cast(this->insert_state(insert_point + sizeof(re_brace), syntax_element_jump, sizeof(re_jump)));
       this->m_pdata->m_data.align();
       jmp->alt.i = this->m_pdata->m_data.size() - this->getoffset(jmp);
       pb = static_cast(this->append_state(syntax_element_endmark, sizeof(re_brace)));
@@ -981,6 +1019,7 @@ bool basic_regex_parser::parse_repeat(std::size_t low, std::size_
 template 
 bool basic_regex_parser::parse_repeat_range(bool isbasic)
 {
+   static const char* incomplete_message = "Missing } in quantified repetition.";
    //
    // parse a repeat-range:
    //
@@ -992,7 +1031,7 @@ bool basic_regex_parser::parse_repeat_range(bool isbasic)
    // fail if at end:
    if(this->m_position == this->m_end)
    {
-      fail(regex_constants::error_brace, this->m_position - this->m_base);
+      fail(regex_constants::error_brace, this->m_position - this->m_base, incomplete_message);
       return false;
    }
    // get min:
@@ -1007,7 +1046,7 @@ bool basic_regex_parser::parse_repeat_range(bool isbasic)
    }
    else if(this->m_position == this->m_end)
    {
-      fail(regex_constants::error_brace, this->m_position - this->m_base);
+      fail(regex_constants::error_brace, this->m_position - this->m_base, incomplete_message);
       return false;
    }
    min = v;
@@ -1021,7 +1060,7 @@ bool basic_regex_parser::parse_repeat_range(bool isbasic)
          ++m_position;
       if(this->m_position == this->m_end)
       {
-         fail(regex_constants::error_brace, this->m_position - this->m_base);
+         fail(regex_constants::error_brace, this->m_position - this->m_base, incomplete_message);
          return false;
       }
       // get the value if any:
@@ -1039,7 +1078,7 @@ bool basic_regex_parser::parse_repeat_range(bool isbasic)
    // OK now check trailing }:
    if(this->m_position == this->m_end)
    {
-      fail(regex_constants::error_brace, this->m_position - this->m_base);
+      fail(regex_constants::error_brace, this->m_position - this->m_base, incomplete_message);
       return false;
    }
    if(isbasic)
@@ -1049,13 +1088,13 @@ bool basic_regex_parser::parse_repeat_range(bool isbasic)
          ++m_position;
          if(this->m_position == this->m_end)
          {
-            fail(regex_constants::error_brace, this->m_position - this->m_base);
+            fail(regex_constants::error_brace, this->m_position - this->m_base, incomplete_message);
             return false;
          }
       }
       else
       {
-         fail(regex_constants::error_badbrace, this->m_position - this->m_base);
+         fail(regex_constants::error_brace, this->m_position - this->m_base, incomplete_message);
          return false;
       }
    }
@@ -1063,7 +1102,7 @@ bool basic_regex_parser::parse_repeat_range(bool isbasic)
       ++m_position;
    else
    {
-      fail(regex_constants::error_badbrace, this->m_position - this->m_base);
+      fail(regex_constants::error_brace, this->m_position - this->m_base, incomplete_message);
       return false;
    }
    //
@@ -1071,7 +1110,11 @@ bool basic_regex_parser::parse_repeat_range(bool isbasic)
    //
    if(min > max)
    {
-      fail(regex_constants::error_badbrace, this->m_position - this->m_base);
+      // Backtrack to error location:
+      m_position -= 2;
+      while(this->m_traits.isctype(*m_position, this->m_word_mask)) --m_position;
+         ++m_position;
+      fail(regex_constants::error_badbrace, m_position - m_base);
       return false;
    }
    return parse_repeat(min, max);
@@ -1094,7 +1137,7 @@ bool basic_regex_parser::parse_alt()
         )
       )
    {
-      fail(regex_constants::error_empty, this->m_position - this->m_base);
+      fail(regex_constants::error_empty, this->m_position - this->m_base, "A regular expression can start with the alternation operator |.");
       return false;
    }
    //
@@ -1146,10 +1189,11 @@ bool basic_regex_parser::parse_alt()
 template 
 bool basic_regex_parser::parse_set()
 {
+   static const char* incomplete_message = "Character set declaration starting with [ terminated prematurely - either no ] was found or the set had no content.";
    ++m_position;
    if(m_position == m_end)
    {
-      fail(regex_constants::error_brack, m_position - m_base);
+      fail(regex_constants::error_brack, m_position - m_base, incomplete_message);
       return false;
    }
    basic_char_set char_set;
@@ -1182,7 +1226,7 @@ bool basic_regex_parser::parse_set()
             ++m_position;
             if(0 == this->append_set(char_set))
             {
-               fail(regex_constants::error_range, m_position - m_base);
+               fail(regex_constants::error_ctype, m_position - m_base);
                return false;
             }
          }
@@ -1237,6 +1281,7 @@ bool basic_regex_parser::parse_set()
 template 
 bool basic_regex_parser::parse_inner_set(basic_char_set& char_set)
 {
+   static const char* incomplete_message = "Character class declaration starting with [ terminated prematurely - either no ] was found or the set had no content.";
    //
    // we have either a character class [:name:]
    // a collating element [.name.]
@@ -1244,7 +1289,7 @@ bool basic_regex_parser::parse_inner_set(basic_char_setm_traits.syntax_type(*m_position))
@@ -1269,14 +1314,14 @@ bool basic_regex_parser::parse_inner_set(basic_char_set::parse_inner_set(basic_char_setm_traits.syntax_type(*m_position) != regex_constants::syntax_close_set))
       {
-         fail(regex_constants::error_brack, m_position - m_base);
+         fail(regex_constants::error_brack, m_position - m_base, incomplete_message);
          return false;
       }
       //
@@ -1346,14 +1391,14 @@ bool basic_regex_parser::parse_inner_set(basic_char_set::parse_inner_set(basic_char_setm_traits.syntax_type(*m_position) != regex_constants::syntax_close_set))
       {
-         fail(regex_constants::error_brack, m_position - m_base);
+         fail(regex_constants::error_brack, m_position - m_base, incomplete_message);
          return false;
       }
       string_type m = this->m_traits.lookup_collatename(name_first, name_last);
@@ -1558,7 +1603,7 @@ charT basic_regex_parser::unescape_character()
    charT result(0);
    if(m_position == m_end)
    {
-      fail(regex_constants::error_escape, m_position - m_base);
+      fail(regex_constants::error_escape, m_position - m_base, "Escape sequence terminated prematurely.");
       return false;
    }
    switch(this->m_traits.escape_syntax_type(*m_position))
@@ -1591,24 +1636,22 @@ charT basic_regex_parser::unescape_character()
       ++m_position;
       if(m_position == m_end)
       {
-         fail(regex_constants::error_escape, m_position - m_base);
+         // Rewind to start of escape:
+         --m_position;
+         while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_escape) --m_position;
+         fail(regex_constants::error_escape, m_position - m_base, "ASCII escape sequence terminated prematurely.");
          return result;
       }
-      /*
-      if((*m_position < charT('@'))
-            || (*m_position > charT(125)) )
-      {
-         fail(regex_constants::error_escape, m_position - m_base);
-         return result;
-      }
-      */
       result = static_cast(*m_position % 32);
       break;
    case regex_constants::escape_type_hex:
       ++m_position;
       if(m_position == m_end)
       {
-         fail(regex_constants::error_escape, m_position - m_base);
+         // Rewind to start of escape:
+         --m_position;
+         while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_escape) --m_position;
+         fail(regex_constants::error_escape, m_position - m_base, "Hexadecimal escape sequence terminated prematurely.");
          return result;
       }
       // maybe have \x{ddd}
@@ -1617,7 +1660,10 @@ charT basic_regex_parser::unescape_character()
          ++m_position;
          if(m_position == m_end)
          {
-            fail(regex_constants::error_escape, m_position - m_base);
+            // Rewind to start of escape:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_escape) --m_position;
+            fail(regex_constants::error_escape, m_position - m_base, "Missing } in hexadecimal escape sequence.");
             return result;
          }
          int i = this->m_traits.toi(m_position, m_end, 16);
@@ -1626,7 +1672,10 @@ charT basic_regex_parser::unescape_character()
             || ((std::numeric_limits::is_specialized) && (i > (int)(std::numeric_limits::max)()))
             || (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_brace))
          {
-            fail(regex_constants::error_badbrace, m_position - m_base);
+            // Rewind to start of escape:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_escape) --m_position;
+            fail(regex_constants::error_badbrace, m_position - m_base, "Hexadecimal escape sequence was invalid.");
             return result;
          }
          ++m_position;
@@ -1639,7 +1688,10 @@ charT basic_regex_parser::unescape_character()
          if((i < 0)
             || !valid_value(charT(0), i))
          {
-            fail(regex_constants::error_escape, m_position - m_base);
+            // Rewind to start of escape:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_escape) --m_position;
+            fail(regex_constants::error_escape, m_position - m_base, "Escape sequence did not encode a valid character.");
             return result;
          }
          result = charT(i);
@@ -1654,14 +1706,20 @@ charT basic_regex_parser::unescape_character()
       int val = this->m_traits.toi(bp, bp + 1, 8);
       if(val != 0)
       {
+         // Rewind to start of escape:
+         --m_position;
+         while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_escape) --m_position;
          // Oops not an octal escape after all:
-         fail(regex_constants::error_escape, m_position - m_base);
+         fail(regex_constants::error_escape, m_position - m_base, "Invalid octal escape sequence.");
          return result;
       }
       val = this->m_traits.toi(m_position, m_position + len, 8);
       if(val < 0) 
       {
-         fail(regex_constants::error_escape, m_position - m_base);
+         // Rewind to start of escape:
+         --m_position;
+         while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_escape) --m_position;
+         fail(regex_constants::error_escape, m_position - m_base, "Octal escape sequence is invalid.");
          return result;
       }
       return static_cast(val);
@@ -1671,6 +1729,9 @@ charT basic_regex_parser::unescape_character()
          ++m_position;
          if(m_position == m_end)
          {
+            // Rewind to start of escape:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_escape) --m_position;
             fail(regex_constants::error_escape, m_position - m_base);
             return false;
          }
@@ -1683,12 +1744,18 @@ charT basic_regex_parser::unescape_character()
                ++m_position;
             if(m_position == m_end)
             {
+               // Rewind to start of escape:
+               --m_position;
+               while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_escape) --m_position;
                fail(regex_constants::error_escape, m_position - m_base);
                return false;
             }
             string_type s = this->m_traits.lookup_collatename(++base, m_position++);
             if(s.empty())
             {
+               // Rewind to start of escape:
+               --m_position;
+               while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_escape) --m_position;
                fail(regex_constants::error_collate, m_position - m_base);
                return false;
             }
@@ -1698,6 +1765,9 @@ charT basic_regex_parser::unescape_character()
             }
          }
          // fall through is a failure:
+         // Rewind to start of escape:
+         --m_position;
+         while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_escape) --m_position;
          fail(regex_constants::error_escape, m_position - m_base);
          return false;
       }
@@ -1733,7 +1803,10 @@ bool basic_regex_parser::parse_backref()
    }
    else
    {
-      fail(regex_constants::error_backref, m_position - m_end);
+      // Rewind to start of escape:
+      --m_position;
+      while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_escape) --m_position;
+      fail(regex_constants::error_backref, m_position - m_base);
       return false;
    }
    return true;
@@ -1765,7 +1838,7 @@ bool basic_regex_parser::parse_QE()
       }
       if(++m_position == m_end) // skip the escape
       {
-         fail(regex_constants::error_escape, m_position - m_base);
+         fail(regex_constants::error_escape, m_position - m_base, "Unterminated \\Q...\\E sequence.");
          return false;
       }
       // check to see if it's a \E:
@@ -1796,7 +1869,10 @@ bool basic_regex_parser::parse_perl_extension()
 {
    if(++m_position == m_end)
    {
-      fail(regex_constants::error_badrepeat, m_position - m_base);
+      // Rewind to start of (? sequence:
+      --m_position;
+      while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+      fail(regex_constants::error_perl_extension, m_position - m_base);
       return false;
    }
    //
@@ -1855,7 +1931,10 @@ bool basic_regex_parser::parse_perl_extension()
       v = this->m_traits.toi(m_position, m_end, 10);
       if((v < 0) || (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_mark))
       {
-         fail(regex_constants::error_backref, m_position - m_base);
+         // Rewind to start of (? sequence:
+         --m_position;
+         while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+         fail(regex_constants::error_perl_extension, m_position - m_base, "The recursive sub-expression refers to an invalid marking group, or is unterminated.");
          return false;
       }
 insert_recursion:
@@ -1874,7 +1953,10 @@ insert_recursion:
       v = this->m_traits.toi(m_position, m_end, 10);
       if((v <= 0) || (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_mark))
       {
-         fail(regex_constants::error_backref, m_position - m_base);
+         // Rewind to start of (? sequence:
+         --m_position;
+         while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+         fail(regex_constants::error_perl_extension, m_position - m_base, "An invalid or unterminated recursive sub-expression.");
          return false;
       }
       v += m_mark_count;
@@ -1894,7 +1976,10 @@ insert_recursion:
       v = m_mark_count + 1 - v;
       if(v <= 0)
       {
-         fail(regex_constants::error_backref, m_position - m_base);
+         // Rewind to start of (? sequence:
+         --m_position;
+         while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+         fail(regex_constants::error_perl_extension, m_position - m_base, "An invalid or unterminated recursive sub-expression.");
          return false;
       }
       goto insert_recursion;
@@ -1917,7 +2002,10 @@ insert_recursion:
          // a lookbehind assertion:
          if(++m_position == m_end)
          {
-            fail(regex_constants::error_badrepeat, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_perl_extension, m_position - m_base);
             return false;
          }
          regex_constants::syntax_type t = this->m_traits.syntax_type(*m_position);
@@ -1955,15 +2043,21 @@ insert_recursion:
       pb->index = markid = -4;
       if(++m_position == m_end)
       {
-         fail(regex_constants::error_badrepeat, m_position - m_base);
+         // Rewind to start of (? sequence:
+         --m_position;
+         while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+         fail(regex_constants::error_perl_extension, m_position - m_base);
          return false;
       }
-      int v = this->m_traits.toi(m_position, m_end, 10);
+      v = this->m_traits.toi(m_position, m_end, 10);
       if(*m_position == charT('R'))
       {
          if(++m_position == m_end)
          {
-            fail(regex_constants::error_badrepeat, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_perl_extension, m_position - m_base);
             return false;
          }
          if(*m_position == charT('&'))
@@ -1973,7 +2067,10 @@ insert_recursion:
                ++m_position;
             if(m_position == m_end)
             {
-               fail(regex_constants::error_badrepeat, m_position - m_base);
+               // Rewind to start of (? sequence:
+               --m_position;
+               while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+               fail(regex_constants::error_perl_extension, m_position - m_base);
                return false;
             }
             v = -static_cast(hash_value_from_capture_name(base, m_position));
@@ -1986,12 +2083,18 @@ insert_recursion:
          br->index = v < 0 ? (v - 1) : 0;
          if(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_mark)
          {
-            fail(regex_constants::error_badrepeat, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_perl_extension, m_position - m_base);
             return false;
          }
          if(++m_position == m_end)
          {
-            fail(regex_constants::error_badrepeat, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_perl_extension, m_position - m_base);
             return false;
          }
       }
@@ -2002,7 +2105,10 @@ insert_recursion:
             ++m_position;
          if(m_position == m_end)
          {
-            fail(regex_constants::error_badrepeat, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_perl_extension, m_position - m_base);
             return false;
          }
          v = static_cast(hash_value_from_capture_name(base, m_position));
@@ -2010,17 +2116,26 @@ insert_recursion:
          br->index = v;
          if(((*m_position != charT('>')) && (*m_position != charT('\''))) || (++m_position == m_end))
          {
-            fail(regex_constants::error_badrepeat, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_perl_extension, m_position - m_base, "Unterminated named capture.");
             return false;
          }
          if(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_mark)
          {
-            fail(regex_constants::error_badrepeat, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_perl_extension, m_position - m_base);
             return false;
          }
          if(++m_position == m_end)
          {
-            fail(regex_constants::error_badrepeat, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_perl_extension, m_position - m_base);
             return false;
          }
       }
@@ -2031,19 +2146,28 @@ insert_recursion:
             ++m_position, ++def;
          if((m_position == m_end) || *def)
          {
-            fail(regex_constants::error_badrepeat, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_perl_extension, m_position - m_base);
             return false;
          }
          re_brace* br = static_cast(this->append_state(syntax_element_assert_backref, sizeof(re_brace)));
          br->index = 9999; // special magic value!
          if(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_mark)
          {
-            fail(regex_constants::error_badrepeat, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_perl_extension, m_position - m_base);
             return false;
          }
          if(++m_position == m_end)
          {
-            fail(regex_constants::error_badrepeat, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_perl_extension, m_position - m_base);
             return false;
          }
       }
@@ -2053,12 +2177,18 @@ insert_recursion:
          br->index = v;
          if(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_mark)
          {
-            fail(regex_constants::error_badrepeat, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_perl_extension, m_position - m_base);
             return false;
          }
          if(++m_position == m_end)
          {
-            fail(regex_constants::error_badrepeat, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_perl_extension, m_position - m_base);
             return false;
          }
       }
@@ -2067,25 +2197,37 @@ insert_recursion:
          // verify that we have a lookahead or lookbehind assert:
          if(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_question)
          {
-            fail(regex_constants::error_badrepeat, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_perl_extension, m_position - m_base);
             return false;
          }
          if(++m_position == m_end)
          {
-            fail(regex_constants::error_badrepeat, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_perl_extension, m_position - m_base);
             return false;
          }
          if(this->m_traits.syntax_type(*m_position) == regex_constants::escape_type_left_word)
          {
             if(++m_position == m_end)
             {
-               fail(regex_constants::error_badrepeat, m_position - m_base);
+               // Rewind to start of (? sequence:
+               --m_position;
+               while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+               fail(regex_constants::error_perl_extension, m_position - m_base);
                return false;
             }
             if((this->m_traits.syntax_type(*m_position) != regex_constants::syntax_equal)
                && (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_not))
             {
-               fail(regex_constants::error_badrepeat, m_position - m_base);
+               // Rewind to start of (? sequence:
+               --m_position;
+               while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+               fail(regex_constants::error_perl_extension, m_position - m_base);
                return false;
             }
             m_position -= 3;
@@ -2095,7 +2237,10 @@ insert_recursion:
             if((this->m_traits.syntax_type(*m_position) != regex_constants::syntax_equal)
                && (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_not))
             {
-               fail(regex_constants::error_paren, m_position - m_base);
+               // Rewind to start of (? sequence:
+               --m_position;
+               while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+               fail(regex_constants::error_perl_extension, m_position - m_base);
                return false;
             }
             m_position -= 2;
@@ -2104,7 +2249,10 @@ insert_recursion:
       break;
       }
    case regex_constants::syntax_close_mark:
-      fail(regex_constants::error_badrepeat, m_position - m_base);
+      // Rewind to start of (? sequence:
+      --m_position;
+      while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+      fail(regex_constants::error_perl_extension, m_position - m_base);
       return false;
    case regex_constants::escape_type_end_buffer:
       {
@@ -2126,14 +2274,20 @@ named_capture_jump:
       const charT* base = ++m_position;
       if(m_position == m_end)
       {
-         fail(regex_constants::error_paren, m_position - m_base);
+         // Rewind to start of (? sequence:
+         --m_position;
+         while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+         fail(regex_constants::error_perl_extension, m_position - m_base);
          return false;
       }
       while((m_position != m_end) && (*m_position != name_delim))
          ++m_position;
       if(m_position == m_end)
       {
-         fail(regex_constants::error_paren, m_position - m_base);
+         // Rewind to start of (? sequence:
+         --m_position;
+         while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+         fail(regex_constants::error_perl_extension, m_position - m_base);
          return false;
       }
       this->m_pdata->set_name(base, m_position, markid);
@@ -2147,7 +2301,10 @@ named_capture_jump:
          v = 0;
          if(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_mark)
          {
-            fail(regex_constants::error_backref, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_perl_extension, m_position - m_base);
             return false;
          }
          goto insert_recursion;
@@ -2160,7 +2317,10 @@ named_capture_jump:
             ++m_position;
          if(m_position == m_end)
          {
-            fail(regex_constants::error_backref, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_perl_extension, m_position - m_base);
             return false;
          }
          v = static_cast(hash_value_from_capture_name(base, m_position));
@@ -2171,7 +2331,10 @@ named_capture_jump:
          ++m_position;
          if(m_position == m_end)
          {
-            fail(regex_constants::error_backref, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_perl_extension, m_position - m_base);
             return false;
          }
          if(*m_position == charT('>'))
@@ -2182,7 +2345,10 @@ named_capture_jump:
                ++m_position;
             if(m_position == m_end)
             {
-               fail(regex_constants::error_backref, m_position - m_base);
+               // Rewind to start of (? sequence:
+               --m_position;
+               while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+               fail(regex_constants::error_perl_extension, m_position - m_base);
                return false;
             }
             v = static_cast(hash_value_from_capture_name(base, m_position));
@@ -2195,7 +2361,13 @@ named_capture_jump:
 option_group_jump:
       regex_constants::syntax_option_type opts = parse_options();
       if(m_position == m_end)
+      {
+         // Rewind to start of (? sequence:
+         --m_position;
+         while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+         fail(regex_constants::error_perl_extension, m_position - m_base);
          return false;
+      }
       // make a note of whether we have a case change:
       m_has_case_change = ((opts & regbase::icase) != (this->flags() & regbase::icase));
       pb->index = markid = 0;
@@ -2214,7 +2386,10 @@ option_group_jump:
       }
       else
       {
-         fail(regex_constants::error_badrepeat, m_position - m_base);
+         // Rewind to start of (? sequence:
+         --m_position;
+         while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+         fail(regex_constants::error_perl_extension, m_position - m_base);
          return false;
       }
 
@@ -2236,12 +2411,21 @@ option_group_jump:
    // Unwind alternatives:
    //
    if(0 == unwind_alts(last_paren_start))
+   {
+      // Rewind to start of (? sequence:
+      --m_position;
+      while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+      fail(regex_constants::error_perl_extension, m_position - m_base, "Invalid alternation operators within (?...) block.");
       return false;
+   }
    //
    // we either have a ')' or we have run out of characters prematurely:
    //
    if(m_position == m_end)
    {
+      // Rewind to start of (? sequence:
+      --m_position;
+      while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
       this->fail(regex_constants::error_paren, ::boost::re_detail::distance(m_base, m_end));
       return false;
    }
@@ -2272,7 +2456,10 @@ option_group_jump:
       if(this->m_last_state == jmp)
       {
          // Oops... we didn't have anything inside the assertion:
-         fail(regex_constants::error_empty, m_position - m_base);
+         // Rewind to start of (? sequence:
+         --m_position;
+         while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+         fail(regex_constants::error_perl_extension, m_position - m_base, "Invalid or empty zero width assertion.");
          return false;
       }
    }
@@ -2292,7 +2479,10 @@ option_group_jump:
       else if(this->getaddress(static_cast(b)->alt.i, b)->type == syntax_element_alt)
       {
          // Can't have seen more than one alternative:
-         fail(regex_constants::error_bad_pattern, m_position - m_base);
+         // Rewind to start of (? sequence:
+         --m_position;
+         while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+         fail(regex_constants::error_bad_pattern, m_position - m_base, "More than one alternation operator | was encountered inside a conditional expression.");
          return false;
       }
       else
@@ -2301,7 +2491,10 @@ option_group_jump:
          b = this->getaddress(b->next.i, b);
          if((b->type == syntax_element_assert_backref) && (static_cast(b)->index == 9999))
          {
-            fail(regex_constants::error_bad_pattern, m_position - m_base);
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+            fail(regex_constants::error_bad_pattern, m_position - m_base, "Alternation operators are not allowed inside a DEFINE block.");
             return false;
          }
       }
@@ -2311,7 +2504,10 @@ option_group_jump:
       if((b->type != syntax_element_assert_backref)
          && (b->type != syntax_element_startmark))
       {
-         fail(regex_constants::error_badrepeat, m_position - m_base);
+         // Rewind to start of (? sequence:
+         --m_position;
+         while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
+         fail(regex_constants::error_badrepeat, m_position - m_base, "A repetition operator cannot be applied to a zero-width assertion.");
          return false;
       }
    }
@@ -2366,6 +2562,9 @@ bool basic_regex_parser::add_emacs_code(bool negate)
    //
    if(++m_position == m_end)
    {
+      // Rewind to start of sequence:
+      --m_position;
+      while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_escape) --m_position;
       fail(regex_constants::error_escape, m_position - m_base);
       return false;
    }
@@ -2466,6 +2665,9 @@ regex_constants::syntax_option_type basic_regex_parser::parse_opt
       }
       if(++m_position == m_end)
       {
+         // Rewind to start of (? sequence:
+         --m_position;
+         while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
          fail(regex_constants::error_paren, m_position - m_base);
          return false;
       }
@@ -2476,6 +2678,9 @@ regex_constants::syntax_option_type basic_regex_parser::parse_opt
    {
       if(++m_position == m_end)
       {
+         // Rewind to start of (? sequence:
+         --m_position;
+         while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
          fail(regex_constants::error_paren, m_position - m_base);
          return false;
       }
@@ -2502,6 +2707,9 @@ regex_constants::syntax_option_type basic_regex_parser::parse_opt
          }
          if(++m_position == m_end)
          {
+            // Rewind to start of (? sequence:
+            --m_position;
+            while(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_open_mark) --m_position;
             fail(regex_constants::error_paren, m_position - m_base);
             return false;
          }
@@ -2528,7 +2736,7 @@ bool basic_regex_parser::unwind_alts(std::ptrdiff_t last_paren_st
         )
       )
    {
-      fail(regex_constants::error_empty, this->m_position - this->m_base);
+      fail(regex_constants::error_empty, this->m_position - this->m_base, "Can't terminate a sub-expression with an alternation operator |.");
       return false;
    }
    // 
diff --git a/include/boost/regex/v4/cpp_regex_traits.hpp b/include/boost/regex/v4/cpp_regex_traits.hpp
index 7ce3ed30..bb40aa1e 100644
--- a/include/boost/regex/v4/cpp_regex_traits.hpp
+++ b/include/boost/regex/v4/cpp_regex_traits.hpp
@@ -187,6 +187,7 @@ struct cpp_regex_traits_base
 #ifndef BOOST_NO_STD_MESSAGES
          if(m_pmessages == b.m_pmessages)
          {
+            return m_pcollate < b.m_pcollate;
          }
          return m_pmessages < b.m_pmessages;
 #else
@@ -212,7 +213,7 @@ std::locale cpp_regex_traits_base::imbue(const std::locale& l)
    m_locale = l;
    m_pctype = &BOOST_USE_FACET(std::ctype, l);
 #ifndef BOOST_NO_STD_MESSAGES
-   m_pmessages = &BOOST_USE_FACET(std::messages, l);
+   m_pmessages = BOOST_HAS_FACET(std::messages, l) ? &BOOST_USE_FACET(std::messages, l) : 0;
 #endif
    m_pcollate = &BOOST_USE_FACET(std::collate, l);
    return result;
@@ -276,7 +277,7 @@ void cpp_regex_traits_char_layer::init()
    typename std::messages::catalog cat = reinterpret_cast::catalog>(-1);
 #endif
    std::string cat_name(cpp_regex_traits::get_catalog_name());
-   if(cat_name.size())
+   if(cat_name.size() && (this->m_pmessages != 0))
    {
       cat = this->m_pmessages->open(
          cat_name, 
@@ -309,7 +310,8 @@ void cpp_regex_traits_char_layer::init()
       }
       catch(...)
       {
-         this->m_pmessages->close(cat);
+         if(this->m_pmessages)
+            this->m_pmessages->close(cat);
          throw;
       }
 #endif
@@ -653,7 +655,7 @@ void cpp_regex_traits_implementation::init()
    typename std::messages::catalog cat = reinterpret_cast::catalog>(-1);
 #endif
    std::string cat_name(cpp_regex_traits::get_catalog_name());
-   if(cat_name.size())
+   if(cat_name.size() && (this->m_pmessages != 0))
    {
       cat = this->m_pmessages->open(
          cat_name, 
@@ -716,7 +718,7 @@ void cpp_regex_traits_implementation::init()
          cpp_regex_traits_implementation::mask_unicode,
       };
 #else
-      static const char_class_type masks[14] = 
+      static const char_class_type masks[16] = 
       {
          ::boost::re_detail::char_class_alnum,
          ::boost::re_detail::char_class_alpha,
@@ -837,8 +839,8 @@ bool cpp_regex_traits_implementation::isctype(const charT c, char_class_t
       || ((mask & ::boost::re_detail::char_class_blank) && (m_pctype->is(std::ctype::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))
-      || ((mask & ::boost::re_detail::char_class_vertical) && (is_separator(c) || (c == '\v')))
-      || ((mask & ::boost::re_detail::char_class_horizontal) && m_pctype->is(std::ctype::space, c) && !(is_separator(c) || (c == '\v')));
+      || ((mask & ::boost::re_detail::char_class_vertical_space) && (is_separator(c) || (c == '\v')))
+      || ((mask & ::boost::re_detail::char_class_horizontal_space) && m_pctype->is(std::ctype::space, c) && !(is_separator(c) || (c == '\v')));
 }
 #endif
 
diff --git a/include/boost/regex/v4/cregex.hpp b/include/boost/regex/v4/cregex.hpp
index cafe396c..7b3df1e5 100644
--- a/include/boost/regex/v4/cregex.hpp
+++ b/include/boost/regex/v4/cregex.hpp
@@ -124,11 +124,11 @@ typedef enum{
    REG_STARTEND =  00004
 } reg_exec_flags;
 
-//
-// POSIX error codes:
-//
+/*
+ * POSIX error codes:
+ */
 typedef unsigned reg_error_t;
-typedef reg_error_t reg_errcode_t;  // backwards compatibility
+typedef reg_error_t reg_errcode_t;  /* backwards compatibility */
 
 static const reg_error_t REG_NOERROR = 0;   /* Success.  */
 static const reg_error_t REG_NOMATCH = 1;   /* Didn't find a match (for regexec).  */
@@ -154,8 +154,9 @@ static const reg_error_t REG_EMPTY = 17;    /* empty expression */
 static const reg_error_t REG_E_MEMORY = 15; /* = REG_ESIZE : out of memory */
 static const reg_error_t REG_ECOMPLEXITY = 18; /* complexity too high */
 static const reg_error_t REG_ESTACK = 19;   /* out of stack space */
-static const reg_error_t REG_E_UNKNOWN = 20; /* unknown error */
-static const reg_error_t REG_ENOSYS = 20;   /* = REG_E_UNKNOWN : Reserved. */
+static const reg_error_t REG_E_PERL = 20;   /* Perl (?...) error */
+static const reg_error_t REG_E_UNKNOWN = 21; /* unknown error */
+static const reg_error_t REG_ENOSYS = 21;   /* = REG_E_UNKNOWN : Reserved. */
 
 BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompA(regex_tA*, const char*, int);
 BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorA(int, const regex_tA*, char*, regsize_t);
@@ -195,14 +196,14 @@ BOOST_REGEX_DECL void BOOST_REGEX_CCALL regfreeW(regex_tW*);
 #endif
 
 #ifdef __cplusplus
-} // extern "C"
-} // namespace
+} /* extern "C" */
+} /* namespace */
 #endif
 
-//
-// C++ high level wrapper goes here:
-//
 #if defined(__cplusplus)
+/*
+ * C++ high level wrapper goes here:
+ */
 #include 
 #include 
 namespace boost{
@@ -228,7 +229,7 @@ struct pred2;
 struct pred3;
 struct pred4;
 
-}  // namespace re_detail
+}  /* namespace re_detail */
 
 #if (defined(BOOST_MSVC) || defined(__BORLANDC__)) && !defined(BOOST_DISABLE_WIN32)
 typedef bool (__cdecl *GrepCallback)(const RegEx& expression);
@@ -257,9 +258,9 @@ public:
    unsigned int SetExpression(const std::string& s, bool icase = false){ return SetExpression(s.c_str(), icase); }
    std::string Expression()const;
    unsigned int error_code()const;
-   //
-   // now matching operators:
-   //
+   /*
+    * now matching operators:
+    */
    bool Match(const char* p, match_flag_type flags = match_default);
    bool Match(const std::string& s, match_flag_type flags = match_default) { return Match(s.c_str(), flags); }
    bool Search(const char* p, match_flag_type flags = match_default);
@@ -283,9 +284,9 @@ public:
                        bool copy = true, match_flag_type flags = match_default);
 
    std::size_t Split(std::vector& v, std::string& s, match_flag_type flags = match_default, unsigned max_count = ~0);
-   //
-   // now operators for returning what matched in more detail:
-   //
+   /*
+    * now operators for returning what matched in more detail:
+    */
    std::size_t Position(int i = 0)const;
    std::size_t Length(int i = 0)const;
    bool Matched(int i = 0)const;
@@ -312,11 +313,11 @@ public:
 #pragma warning(pop)
 #endif
 
-} // namespace boost
+} /* namespace boost */
 
-#endif
+#endif /* __cplusplus */
 
-#endif // include guard
+#endif /* include guard */
 
 
 
diff --git a/include/boost/regex/v4/error_type.hpp b/include/boost/regex/v4/error_type.hpp
index b6633a00..afcc71e3 100644
--- a/include/boost/regex/v4/error_type.hpp
+++ b/include/boost/regex/v4/error_type.hpp
@@ -28,8 +28,8 @@ namespace regex_constants{
 
 enum error_type{
 
-   error_ok = 0,         // not used
-   error_no_match = 1,   // not used
+   error_ok = 0,         /* not used */
+   error_no_match = 1,   /* not used */
    error_bad_pattern = 2,
    error_collate = 3,
    error_ctype = 4,
@@ -42,17 +42,18 @@ enum error_type{
    error_range = 11,
    error_space = 12,
    error_badrepeat = 13,
-   error_end = 14,    // not used
+   error_end = 14,    /* not used */
    error_size = 15,
-   error_right_paren = 16,  // not used
+   error_right_paren = 16,  /* not used */
    error_empty = 17,
    error_complexity = 18,
    error_stack = 19,
-   error_unknown = 20
+   error_perl_extension = 20,
+   error_unknown = 21
 };
 
 }
 }
-#endif // __cplusplus
+#endif /* __cplusplus */
 
 #endif
diff --git a/include/boost/regex/v4/match_flags.hpp b/include/boost/regex/v4/match_flags.hpp
index 9585aca8..26bde9a5 100644
--- a/include/boost/regex/v4/match_flags.hpp
+++ b/include/boost/regex/v4/match_flags.hpp
@@ -31,43 +31,43 @@ namespace boost{
 typedef enum _match_flags
 {
    match_default = 0,
-   match_not_bol = 1,                                // first is not start of line
-   match_not_eol = match_not_bol << 1,               // last is not end of line
-   match_not_bob = match_not_eol << 1,               // first is not start of buffer
-   match_not_eob = match_not_bob << 1,               // last is not end of buffer
-   match_not_bow = match_not_eob << 1,               // first is not start of word
-   match_not_eow = match_not_bow << 1,               // last is not end of word
-   match_not_dot_newline = match_not_eow << 1,       // \n is not matched by '.'
-   match_not_dot_null = match_not_dot_newline << 1,  // '\0' is not matched by '.'
-   match_prev_avail = match_not_dot_null << 1,       // *--first is a valid expression
-   match_init = match_prev_avail << 1,               // internal use
-   match_any = match_init << 1,                      // don't care what we match
-   match_not_null = match_any << 1,                  // string can't be null
-   match_continuous = match_not_null << 1,           // each grep match must continue from
-                                                     // uninterupted from the previous one
-   match_partial = match_continuous << 1,            // find partial matches
+   match_not_bol = 1,                                /* first is not start of line */
+   match_not_eol = match_not_bol << 1,               /* last is not end of line */
+   match_not_bob = match_not_eol << 1,               /* first is not start of buffer */
+   match_not_eob = match_not_bob << 1,               /* last is not end of buffer */
+   match_not_bow = match_not_eob << 1,               /* first is not start of word */
+   match_not_eow = match_not_bow << 1,               /* last is not end of word */
+   match_not_dot_newline = match_not_eow << 1,       /* \n is not matched by '.' */
+   match_not_dot_null = match_not_dot_newline << 1,  /* '\0' is not matched by '.' */
+   match_prev_avail = match_not_dot_null << 1,       /* *--first is a valid expression */
+   match_init = match_prev_avail << 1,               /* internal use */
+   match_any = match_init << 1,                      /* don't care what we match */
+   match_not_null = match_any << 1,                  /* string can't be null */
+   match_continuous = match_not_null << 1,           /* each grep match must continue from */
+                                                     /* uninterupted from the previous one */
+   match_partial = match_continuous << 1,            /* find partial matches */
    
-   match_stop = match_partial << 1,                  // stop after first match (grep) V3 only
-   match_not_initial_null = match_stop,              // don't match initial null, V4 only
-   match_all = match_stop << 1,                      // must find the whole of input even if match_any is set
-   match_perl = match_all << 1,                      // Use perl matching rules
-   match_posix = match_perl << 1,                    // Use POSIX matching rules
-   match_nosubs = match_posix << 1,                  // don't trap marked subs
-   match_extra = match_nosubs << 1,                  // include full capture information for repeated captures
-   match_single_line = match_extra << 1,             // treat text as single line and ignor any \n's when matching ^ and $.
-   match_unused1 = match_single_line << 1,           // unused
-   match_unused2 = match_unused1 << 1,               // unused
-   match_unused3 = match_unused2 << 1,               // unused
+   match_stop = match_partial << 1,                  /* stop after first match (grep) V3 only */
+   match_not_initial_null = match_stop,              /* don't match initial null, V4 only */
+   match_all = match_stop << 1,                      /* must find the whole of input even if match_any is set */
+   match_perl = match_all << 1,                      /* Use perl matching rules */
+   match_posix = match_perl << 1,                    /* Use POSIX matching rules */
+   match_nosubs = match_posix << 1,                  /* don't trap marked subs */
+   match_extra = match_nosubs << 1,                  /* include full capture information for repeated captures */
+   match_single_line = match_extra << 1,             /* treat text as single line and ignor any \n's when matching ^ and $. */
+   match_unused1 = match_single_line << 1,           /* unused */
+   match_unused2 = match_unused1 << 1,               /* unused */
+   match_unused3 = match_unused2 << 1,               /* unused */
    match_max = match_unused3,
 
-   format_perl = 0,                                  // perl style replacement
-   format_default = 0,                               // ditto.
-   format_sed = match_max << 1,                      // sed style replacement.
-   format_all = format_sed << 1,                     // enable all extentions to sytax.
-   format_no_copy = format_all << 1,                 // don't copy non-matching segments.
-   format_first_only = format_no_copy << 1,          // Only replace first occurance.
-   format_is_if = format_first_only << 1,            // internal use only.
-   format_literal = format_is_if << 1                // treat string as a literal
+   format_perl = 0,                                  /* perl style replacement */
+   format_default = 0,                               /* ditto. */
+   format_sed = match_max << 1,                      /* sed style replacement. */
+   format_all = format_sed << 1,                     /* enable all extentions to sytax. */
+   format_no_copy = format_all << 1,                 /* don't copy non-matching segments. */
+   format_first_only = format_no_copy << 1,          /* Only replace first occurance. */
+   format_is_if = format_first_only << 1,            /* internal use only. */
+   format_literal = format_is_if << 1                /* treat string as a literal */
 
 } match_flags;
 
@@ -96,10 +96,10 @@ inline match_flags& operator^=(match_flags& m1, match_flags m2)
 #endif
 
 #ifdef __cplusplus
-} // namespace regex_constants
-//
-// import names into boost for backwards compatiblity:
-//
+} /* namespace regex_constants */
+/*
+ * import names into boost for backwards compatiblity:
+ */
 using regex_constants::match_flag_type;
 using regex_constants::match_default;
 using regex_constants::match_not_bol;
@@ -111,28 +111,28 @@ using regex_constants::match_not_eow;
 using regex_constants::match_not_dot_newline;
 using regex_constants::match_not_dot_null;
 using regex_constants::match_prev_avail;
-//using regex_constants::match_init;
+/* using regex_constants::match_init; */
 using regex_constants::match_any;
 using regex_constants::match_not_null;
 using regex_constants::match_continuous;
 using regex_constants::match_partial;
-//using regex_constants::match_stop;
+/*using regex_constants::match_stop; */
 using regex_constants::match_all;
 using regex_constants::match_perl;
 using regex_constants::match_posix;
 using regex_constants::match_nosubs;
 using regex_constants::match_extra;
 using regex_constants::match_single_line;
-//using regex_constants::match_max;
+/*using regex_constants::match_max; */
 using regex_constants::format_all;
 using regex_constants::format_sed;
 using regex_constants::format_perl;
 using regex_constants::format_default;
 using regex_constants::format_no_copy;
 using regex_constants::format_first_only;
-//using regex_constants::format_is_if;
+/*using regex_constants::format_is_if;*/
 
-} // namespace boost
-#endif // __cplusplus
-#endif // include guard
+} /* namespace boost */
+#endif /* __cplusplus */
+#endif /* include guard */
 
diff --git a/include/boost/regex/v4/match_results.hpp b/include/boost/regex/v4/match_results.hpp
index 09dd31f0..cd6b9eb5 100644
--- a/include/boost/regex/v4/match_results.hpp
+++ b/include/boost/regex/v4/match_results.hpp
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 1998-2002
+ * Copyright (c) 1998-2009
  * John Maddock
  *
  * Use, modification and distribution are subject to the 
@@ -74,16 +74,30 @@ public:
    // construct/copy/destroy:
    explicit match_results(const Allocator& a = Allocator())
 #ifndef BOOST_NO_STD_ALLOCATOR
-      : m_subs(a), m_base(), m_last_closed_paren(0) {}
+      : m_subs(a), m_base(), m_last_closed_paren(0), m_is_singular(true) {}
 #else
-      : m_subs(), m_base(), m_last_closed_paren(0) { (void)a; }
+      : m_subs(), m_base(), m_last_closed_paren(0), m_is_singular(true) { (void)a; }
 #endif
    match_results(const match_results& m)
-      : m_subs(m.m_subs), m_base(m.m_base) {}
+      : m_subs(m.m_subs), m_named_subs(m.m_named_subs), m_last_closed_paren(m.m_last_closed_paren), m_is_singular(m.m_is_singular) 
+   {
+      if(!m_is_singular)
+      {
+         m_base = m.m_base;
+         m_null = m.m_null;
+      }
+   }
    match_results& operator=(const match_results& m)
    {
       m_subs = m.m_subs;
-      m_base = m.m_base;
+      m_named_subs = m.m_named_subs;
+      m_last_closed_paren = m.m_last_closed_paren;
+      m_is_singular = m.m_is_singular;
+      if(!m_is_singular)
+      {
+         m_base = m.m_base;
+         m_null = m.m_null;
+      }
       return *this;
    }
    ~match_results(){}
@@ -98,6 +112,8 @@ public:
    // element access:
    difference_type length(int sub = 0) const
    {
+      if(m_is_singular)
+         raise_logic_error();
       sub += 2;
       if((sub < (int)m_subs.size()) && (sub > 0))
          return m_subs[sub].length();
@@ -105,16 +121,20 @@ public:
    }
    difference_type length(const char_type* sub) const
    {
-      const char_type* end = sub;
-      while(*end) ++end;
-      return length(named_subexpression_index(sub, end));
+      if(m_is_singular)
+         raise_logic_error();
+      const char_type* sub_end = sub;
+      while(*sub_end) ++sub_end;
+      return length(named_subexpression_index(sub, sub_end));
    }
    template 
    difference_type length(const charT* sub) const
    {
-      const charT* end = sub;
-      while(*end) ++end;
-      return length(named_subexpression_index(sub, end));
+      if(m_is_singular)
+         raise_logic_error();
+      const charT* sub_end = sub;
+      while(*sub_end) ++sub_end;
+      return length(named_subexpression_index(sub, sub_end));
    }
    template 
    difference_type length(const std::basic_string& sub) const
@@ -123,6 +143,8 @@ public:
    }
    difference_type position(size_type sub = 0) const
    {
+      if(m_is_singular)
+         raise_logic_error();
       sub += 2;
       if(sub < m_subs.size())
       {
@@ -136,16 +158,16 @@ public:
    }
    difference_type position(const char_type* sub) const
    {
-      const char_type* end = sub;
-      while(*end) ++end;
-      return position(named_subexpression_index(sub, end));
+      const char_type* sub_end = sub;
+      while(*sub_end) ++sub_end;
+      return position(named_subexpression_index(sub, sub_end));
    }
    template 
    difference_type position(const charT* sub) const
    {
-      const charT* end = sub;
-      while(*end) ++end;
-      return position(named_subexpression_index(sub, end));
+      const charT* sub_end = sub;
+      while(*sub_end) ++sub_end;
+      return position(named_subexpression_index(sub, sub_end));
    }
    template 
    difference_type position(const std::basic_string& sub) const
@@ -154,6 +176,8 @@ public:
    }
    string_type str(int sub = 0) const
    {
+      if(m_is_singular)
+         raise_logic_error();
       sub += 2;
       string_type result;
       if(sub < (int)m_subs.size() && (sub > 0))
@@ -187,6 +211,8 @@ public:
    }
    const_reference operator[](int sub) const
    {
+      if(m_is_singular && m_subs.empty())
+         raise_logic_error();
       sub += 2;
       if(sub < (int)m_subs.size() && (sub >= 0))
       {
@@ -199,6 +225,8 @@ public:
    //
    const_reference named_subexpression(const char_type* i, const char_type* j) const
    {
+      if(m_is_singular)
+         raise_logic_error();
       int index = m_named_subs->get_id(i, j);
       return index > 0 ? (*this)[index] : m_null;
    }
@@ -215,6 +243,8 @@ public:
    }
    int named_subexpression_index(const char_type* i, const char_type* j) const
    {
+      if(m_is_singular)
+         raise_logic_error();
       int index = m_named_subs->get_id(i, j);
       return index > 0 ? index : -20;
    }
@@ -266,11 +296,15 @@ public:
 
    const_reference prefix() const
    {
+      if(m_is_singular)
+         raise_logic_error();
       return (*this)[-1];
    }
 
    const_reference suffix() const
    {
+      if(m_is_singular)
+         raise_logic_error();
       return (*this)[-2];
    }
    const_iterator begin() const
@@ -282,44 +316,67 @@ public:
       return m_subs.end();
    }
    // format:
-   template 
+   template 
    OutputIterator format(OutputIterator out,
-                         const string_type& fmt,
+                         Functor fmt,
                          match_flag_type flags = format_default) const
    {
-      re_detail::trivial_format_traits traits;
-      return re_detail::regex_format_imp(out, *this, fmt.data(), fmt.data() + fmt.size(), flags, traits);
+      if(m_is_singular)
+         raise_logic_error();
+      typedef typename re_detail::compute_functor_type, OutputIterator>::type F;
+      F func(fmt);
+      return func(*this, out, flags);
    }
-   string_type format(const string_type& fmt,
-                      match_flag_type flags = format_default) const
+   template 
+   string_type format(Functor fmt, match_flag_type flags = format_default) const
    {
-      string_type result;
-      re_detail::string_out_iterator i(result);
-      re_detail::trivial_format_traits traits;
-      re_detail::regex_format_imp(i, *this, fmt.data(), fmt.data() + fmt.size(), flags, traits);
+      if(m_is_singular)
+         raise_logic_error();
+      std::basic_string result;
+      re_detail::string_out_iterator > i(result);
+
+      typedef typename re_detail::compute_functor_type, re_detail::string_out_iterator > >::type F;
+      F func(fmt);
+
+      func(*this, i, flags);
       return result;
    }
    // format with locale:
-   template 
+   template 
    OutputIterator format(OutputIterator out,
-                         const string_type& fmt,
+                         Functor fmt,
                          match_flag_type flags,
                          const RegexT& re) const
    {
-      return ::boost::re_detail::regex_format_imp(out, *this, fmt.data(), fmt.data() + fmt.size(), flags, re.get_traits());
+      if(m_is_singular)
+         raise_logic_error();
+      typedef ::boost::regex_traits_wrapper traits_type;
+      typedef typename re_detail::compute_functor_type, OutputIterator, traits_type>::type F;
+      F func(fmt);
+      return func(*this, out, flags, re.get_traits());
    }
-   template 
-   string_type format(const string_type& fmt,
+   template 
+   string_type format(Functor fmt,
                       match_flag_type flags,
                       const RegexT& re) const
    {
-      string_type result;
-      re_detail::string_out_iterator i(result);
-      ::boost::re_detail::regex_format_imp(i, *this, fmt.data(), fmt.data() + fmt.size(), flags, re.get_traits());
+      if(m_is_singular)
+         raise_logic_error();
+      typedef ::boost::regex_traits_wrapper traits_type;
+      std::basic_string result;
+      re_detail::string_out_iterator > i(result);
+
+      typedef typename re_detail::compute_functor_type, re_detail::string_out_iterator >, traits_type >::type F;
+      F func(fmt);
+
+      func(*this, i, flags, re.get_traits());
       return result;
    }
+
    const_reference get_last_closed_paren()const
    {
+      if(m_is_singular)
+         raise_logic_error();
       return m_last_closed_paren == 0 ? m_null : (*this)[m_last_closed_paren];
    }
 
@@ -334,11 +391,39 @@ public:
    void swap(match_results& that)
    {
       std::swap(m_subs, that.m_subs);
-      std::swap(m_base, that.m_base);
+      std::swap(m_named_subs, that.m_named_subs);
+      std::swap(m_last_closed_paren, that.m_last_closed_paren);
+      std::swap(m_is_singular, that.m_is_singular);
+      if(m_is_singular)
+      {
+         if(!that.m_is_singular)
+         {
+            m_base = that.m_base;
+            m_null = that.m_null;
+         }
+      }
+      else if(that.m_is_singular)
+      {
+         that.m_base = m_base;
+         that.m_null = m_null;
+      }
+      else
+      {
+         std::swap(m_base, that.m_base);
+         std::swap(m_null, that.m_null);
+      }
    }
    bool operator==(const match_results& that)const
    {
-      return (m_subs == that.m_subs) && (m_base == that.m_base);
+      if(m_is_singular)
+      {
+         return that.m_is_singular;
+      }
+      else if(that.m_is_singular)
+      {
+         return false;
+      }
+      return (m_subs == that.m_subs) && (m_base == that.m_base) && (m_last_closed_paren == that.m_last_closed_paren);
    }
    bool operator!=(const match_results& that)const
    { return !(*this == that); }
@@ -348,6 +433,8 @@ public:
 
    const capture_sequence_type& captures(int i)const
    {
+      if(m_is_singular)
+         raise_logic_error();
       return (*this)[i].captures();
    }
 #endif
@@ -364,6 +451,7 @@ public:
       m_null.first = i;
       m_null.second = i;
       m_null.matched = false;
+      m_is_singular = false;
    }
 
    void BOOST_REGEX_CALL set_second(BidiIterator i, size_type pos, bool m = true, bool escape_k = false)
@@ -381,6 +469,7 @@ public:
          m_null.first = i;
          m_null.second = i;
          m_null.matched = false;
+         m_is_singular = false;
       }
    }
    void BOOST_REGEX_CALL set_size(size_type n, BidiIterator i, BidiIterator j)
@@ -411,6 +500,7 @@ public:
    }
    void BOOST_REGEX_CALL set_first(BidiIterator i)
    {
+      BOOST_ASSERT(m_subs.size() > 2);
       // set up prefix:
       m_subs[1].second = i;
       m_subs[1].matched = (m_subs[1].first != i);
@@ -446,16 +536,32 @@ public:
    }
 
 private:
-   vector_type            m_subs; // subexpressions
-   BidiIterator   m_base; // where the search started from
-   sub_match m_null; // a null match
-   boost::shared_ptr m_named_subs;
-   int m_last_closed_paren;
+   //
+   // Error handler called when an uninitialized match_results is accessed:
+   //
+   static void raise_logic_error()
+   {
+      std::logic_error e("Attempt to access an uninitialzed boost::match_results<> class.");
+      boost::throw_exception(e);
+   }
+
+
+   vector_type            m_subs;                      // subexpressions
+   BidiIterator   m_base;                              // where the search started from
+   sub_match m_null;                     // a null match
+   boost::shared_ptr m_named_subs;     // Shared copy of named subs in the regex object
+   int m_last_closed_paren;                            // Last ) to be seen - used for formatting
+   bool m_is_singular;                                 // True if our stored iterators are singular
 };
 
 template 
 void BOOST_REGEX_CALL match_results::maybe_assign(const match_results& m)
 {
+   if(m_is_singular)
+   {
+      *this = m;
+      return;
+   }
    const_iterator p1, p2;
    p1 = begin();
    p2 = m.begin();
diff --git a/include/boost/regex/v4/perl_matcher_non_recursive.hpp b/include/boost/regex/v4/perl_matcher_non_recursive.hpp
index 2ce7ebe0..343afc02 100644
--- a/include/boost/regex/v4/perl_matcher_non_recursive.hpp
+++ b/include/boost/regex/v4/perl_matcher_non_recursive.hpp
@@ -188,7 +188,7 @@ bool perl_matcher::match_all_states()
          if(!(this->*proc)())
          {
             if(state_count > max_state_count)
-               raise_error(traits_inst, regex_constants::error_space);
+               raise_error(traits_inst, regex_constants::error_complexity);
             if((m_match_flags & match_partial) && (position == last) && (position != search_base))
                m_has_partial_match = true;
             bool successful_unwind = unwind(false);
@@ -219,7 +219,7 @@ void perl_matcher::extend_stack()
       m_backup_state = block;
    }
    else
-      raise_error(traits_inst, regex_constants::error_size);
+      raise_error(traits_inst, regex_constants::error_stack);
 }
 
 template 
diff --git a/include/boost/regex/v4/perl_matcher_recursive.hpp b/include/boost/regex/v4/perl_matcher_recursive.hpp
index 48f08b7b..d0de8025 100644
--- a/include/boost/regex/v4/perl_matcher_recursive.hpp
+++ b/include/boost/regex/v4/perl_matcher_recursive.hpp
@@ -99,7 +99,7 @@ bool perl_matcher::match_all_states()
    };
 
    if(state_count > max_state_count)
-      raise_error(traits_inst, regex_constants::error_space);
+      raise_error(traits_inst, regex_constants::error_complexity);
    while(pstate)
    {
       matcher_proc_type proc = s_match_vtable[pstate->type];
diff --git a/include/boost/regex/v4/regex_format.hpp b/include/boost/regex/v4/regex_format.hpp
index 4e95112f..0ca9baa7 100644
--- a/include/boost/regex/v4/regex_format.hpp
+++ b/include/boost/regex/v4/regex_format.hpp
@@ -1,7 +1,7 @@
 /*
  *
- * Copyright (c) 1998-2002
- * John Maddock
+ * Copyright (c) 1998-2009 John Maddock
+ * Copyright 2008 Eric Niebler. 
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
@@ -21,6 +21,19 @@
 #ifndef BOOST_REGEX_FORMAT_HPP
 #define BOOST_REGEX_FORMAT_HPP
 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#ifndef BOOST_NO_SFINAE
+#include 
+#endif
 
 namespace boost{
 
@@ -76,15 +89,15 @@ struct trivial_format_traits
    }
 };
 
-template 
+template 
 class basic_regex_formatter
 {
 public:
    typedef typename traits::char_type char_type;
    basic_regex_formatter(OutputIterator o, const Results& r, const traits& t)
       : m_traits(t), m_results(r), m_out(o), m_state(output_copy), m_restore_state(output_copy), m_have_conditional(false) {}
-   OutputIterator format(const char_type* p1, const char_type* p2, match_flag_type f);
-   OutputIterator format(const char_type* p1, match_flag_type f)
+   OutputIterator format(ForwardIter p1, ForwardIter p2, match_flag_type f);
+   OutputIterator format(ForwardIter p1, match_flag_type f)
    {
       return format(p1, p1 + m_traits.length(p1), f);
    }
@@ -109,22 +122,75 @@ private:
    void format_until_scope_end();
    bool handle_perl_verb(bool have_brace);
 
-   const traits& m_traits;       // the traits class for localised formatting operations
-   const Results& m_results;     // the match_results being used.
-   OutputIterator m_out;         // where to send output.
-   const char_type* m_position;  // format string, current position
-   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
-   output_state    m_restore_state;  // what state to restore to.
-   bool            m_have_conditional; // we are parsing a conditional
+   inline typename Results::value_type const& get_named_sub(ForwardIter i, ForwardIter j, const mpl::false_&)
+   {
+      std::vector v(i, j);
+      return (i != j) ? this->m_results.named_subexpression(&v[0], &v[0] + v.size())
+         : this->m_results.named_subexpression(static_cast(0), static_cast(0));
+   }
+   inline typename Results::value_type const& get_named_sub(ForwardIter i, ForwardIter j, const mpl::true_&)
+   {
+      return this->m_results.named_subexpression(i, j);
+   }
+   inline typename Results::value_type const& get_named_sub(ForwardIter i, ForwardIter j)
+   {
+      typedef typename boost::is_convertible::type tag_type;
+      return get_named_sub(i, j, tag_type());
+   }
+   inline int get_named_sub_index(ForwardIter i, ForwardIter j, const mpl::false_&)
+   {
+      std::vector v(i, j);
+      return (i != j) ? this->m_results.named_subexpression_index(&v[0], &v[0] + v.size())
+         : this->m_results.named_subexpression_index(static_cast(0), static_cast(0));
+   }
+   inline int get_named_sub_index(ForwardIter i, ForwardIter j, const mpl::true_&)
+   {
+      return this->m_results.named_subexpression_index(i, j);
+   }
+   inline int get_named_sub_index(ForwardIter i, ForwardIter j)
+   {
+      typedef typename boost::is_convertible::type tag_type;
+      return get_named_sub_index(i, j, tag_type());
+   }
+   inline int toi(ForwardIter& i, ForwardIter j, int base, const boost::mpl::false_&)
+   {
+      if(i != j)
+      {
+         std::vector v(i, j);
+         const char_type* start = &v[0];
+         const char_type* pos = start;
+         int r = m_traits.toi(pos, &v[0] + v.size(), base);
+         std::advance(i, pos - start);
+         return r;
+      }
+      return -1;
+   }
+   inline int toi(ForwardIter& i, ForwardIter j, int base, const boost::mpl::true_&)
+   {
+      return m_traits.toi(i, j, base);
+   }
+   inline int toi(ForwardIter& i, ForwardIter j, int base)
+   {
+      typedef typename boost::is_convertible::type tag_type;
+      return toi(i, j, base, tag_type());
+   }
+
+   const traits&    m_traits;       // the traits class for localised formatting operations
+   const Results&   m_results;     // the match_results being used.
+   OutputIterator   m_out;         // where to send output.
+   ForwardIter      m_position;  // format string, current position
+   ForwardIter      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
+   output_state     m_restore_state;  // what state to restore to.
+   bool             m_have_conditional; // we are parsing a conditional
 private:
    basic_regex_formatter(const basic_regex_formatter&);
    basic_regex_formatter& operator=(const basic_regex_formatter&);
 };
 
-template 
-OutputIterator basic_regex_formatter::format(const char_type* p1, const char_type* p2, match_flag_type f)
+template 
+OutputIterator basic_regex_formatter::format(ForwardIter p1, ForwardIter p2, match_flag_type f)
 {
    m_position = p1;
    m_end = p2;
@@ -133,8 +199,8 @@ OutputIterator basic_regex_formatter::format(co
    return m_out;
 }
 
-template 
-void basic_regex_formatter::format_all()
+template 
+void basic_regex_formatter::format_all()
 {
    // over and over:
    while(m_position != m_end)
@@ -211,8 +277,8 @@ void basic_regex_formatter::format_all()
    }
 }
 
-template 
-void basic_regex_formatter::format_perl()
+template 
+void basic_regex_formatter::format_perl()
 {
    //
    // On entry *m_position points to a '$' character
@@ -233,7 +299,7 @@ void basic_regex_formatter::format_perl()
    // OK find out what kind it is:
    //
    bool have_brace = false;
-   const char_type* save_position = m_position;
+   ForwardIter save_position = m_position;
    switch(*m_position)
    {
    case '&':
@@ -254,12 +320,12 @@ void basic_regex_formatter::format_perl()
    case '+':
       if((++m_position != m_end) && (*m_position == '{'))
       {
-         const char_type* base = ++m_position;
+         ForwardIter base = ++m_position;
          while((m_position != m_end) && (*m_position != '}')) ++m_position;
          if(m_position != m_end)
          {
             // Named sub-expression:
-            put(this->m_results.named_subexpression(base, m_position));
+            put(get_named_sub(base, m_position));
             ++m_position;
             break;
          }
@@ -279,7 +345,7 @@ void basic_regex_formatter::format_perl()
       {
          std::ptrdiff_t len = ::boost::re_detail::distance(m_position, m_end);
          //len = (std::min)(static_cast(2), len);
-         int v = m_traits.toi(m_position, m_position + len, 10);
+         int v = this->toi(m_position, m_position + len, 10);
          if((v < 0) || (have_brace && ((m_position == m_end) || (*m_position != '}'))))
          {
             // Look for a Perl-5.10 verb:
@@ -300,8 +366,8 @@ void basic_regex_formatter::format_perl()
    }
 }
 
-template 
-bool basic_regex_formatter::handle_perl_verb(bool have_brace)
+template 
+bool basic_regex_formatter::handle_perl_verb(bool have_brace)
 {
    // 
    // We may have a capitalised string containing a Perl action:
@@ -313,6 +379,8 @@ bool basic_regex_formatter::handle_perl_verb(bo
    static const char_type LAST_SUBMATCH_RESULT[] = { 'L', 'A', 'S', 'T', '_', 'S', 'U', 'B', 'M', 'A', 'T', 'C', 'H', '_', 'R', 'E', 'S', 'U', 'L', 'T' };
    static const char_type LAST_SUBMATCH_RESULT_ALT[] = { '^', 'N' };
 
+   if(m_position == m_end)
+      return false;
    if(have_brace && (*m_position == '^'))
       ++m_position;
 
@@ -323,7 +391,7 @@ bool basic_regex_formatter::handle_perl_verb(bo
       m_position += 5;
       if(have_brace)
       {
-         if(*m_position == '}')
+         if((m_position != m_end) && (*m_position == '}'))
             ++m_position;
          else
          {
@@ -339,7 +407,7 @@ bool basic_regex_formatter::handle_perl_verb(bo
       m_position += 8;
       if(have_brace)
       {
-         if(*m_position == '}')
+         if((m_position != m_end) && (*m_position == '}'))
             ++m_position;
          else
          {
@@ -355,7 +423,7 @@ bool basic_regex_formatter::handle_perl_verb(bo
       m_position += 9;
       if(have_brace)
       {
-         if(*m_position == '}')
+         if((m_position != m_end) && (*m_position == '}'))
             ++m_position;
          else
          {
@@ -371,7 +439,7 @@ bool basic_regex_formatter::handle_perl_verb(bo
       m_position += 16;
       if(have_brace)
       {
-         if(*m_position == '}')
+         if((m_position != m_end) && (*m_position == '}'))
             ++m_position;
          else
          {
@@ -387,7 +455,7 @@ bool basic_regex_formatter::handle_perl_verb(bo
       m_position += 20;
       if(have_brace)
       {
-         if(*m_position == '}')
+         if((m_position != m_end) && (*m_position == '}'))
             ++m_position;
          else
          {
@@ -403,7 +471,7 @@ bool basic_regex_formatter::handle_perl_verb(bo
       m_position += 2;
       if(have_brace)
       {
-         if(*m_position == '}')
+         if((m_position != m_end) && (*m_position == '}'))
             ++m_position;
          else
          {
@@ -417,8 +485,8 @@ bool basic_regex_formatter::handle_perl_verb(bo
    return false;
 }
 
-template 
-void basic_regex_formatter::format_escape()
+template 
+void basic_regex_formatter::format_escape()
 {
    // skip the escape and check for trailing escape:
    if(++m_position == m_end)
@@ -463,7 +531,7 @@ void basic_regex_formatter::format_escape()
       if(*m_position == static_cast('{'))
       {
          ++m_position;
-         int val = m_traits.toi(m_position, m_end, 16);
+         int val = this->toi(m_position, m_end, 16);
          if(val < 0)
          {
             // invalid value treat everything as literals:
@@ -471,8 +539,9 @@ void basic_regex_formatter::format_escape()
             put(static_cast('{'));
             return;
          }
-         if(*m_position != static_cast('}'))
+         if((m_position == m_end) || (*m_position != static_cast('}')))
          {
+            --m_position;
             while(*m_position != static_cast('\\'))
                --m_position;
             ++m_position;
@@ -487,7 +556,7 @@ void basic_regex_formatter::format_escape()
       {
          std::ptrdiff_t len = ::boost::re_detail::distance(m_position, m_end);
          len = (std::min)(static_cast(2), len);
-         int val = m_traits.toi(m_position, m_position + len, 16);
+         int val = this->toi(m_position, m_position + len, 16);
          if(val < 0)
          {
             --m_position;
@@ -549,7 +618,9 @@ void basic_regex_formatter::format_escape()
             break;
       }
       // see if we have a \n sed style backreference:
-      int v = m_traits.toi(m_position, m_position+1, 10);
+      std::ptrdiff_t len = ::boost::re_detail::distance(m_position, m_end);
+      len = (std::min)(static_cast(1), len);
+      int v = this->toi(m_position, m_position+len, 10);
       if((v > 0) || ((v == 0) && (m_flags & ::boost::regex_constants::format_sed)))
       {
          put(m_results[v]);
@@ -559,9 +630,9 @@ void basic_regex_formatter::format_escape()
       {
          // octal ecape sequence:
          --m_position;
-         std::ptrdiff_t len = ::boost::re_detail::distance(m_position, m_end);
+         len = ::boost::re_detail::distance(m_position, m_end);
          len = (std::min)(static_cast(4), len);
-         v = m_traits.toi(m_position, m_position + len, 8);
+         v = this->toi(m_position, m_position + len, 8);
          BOOST_ASSERT(v >= 0);
          put(static_cast(v));
          break;
@@ -572,8 +643,8 @@ void basic_regex_formatter::format_escape()
    }
 }
 
-template 
-void basic_regex_formatter::format_conditional()
+template 
+void basic_regex_formatter::format_conditional()
 {
    if(m_position == m_end)
    {
@@ -584,15 +655,15 @@ void basic_regex_formatter::format_conditional(
    int v;
    if(*m_position == '{')
    {
-      const char_type* base = m_position;
+      ForwardIter base = m_position;
       ++m_position;
-      v = m_traits.toi(m_position, m_end, 10);
+      v = this->toi(m_position, m_end, 10);
       if(v < 0)
       {
          // Try a named subexpression:
          while((m_position != m_end) && (*m_position != '}'))
             ++m_position;
-         v = m_results.named_subexpression_index(base + 1, m_position);
+         v = this->get_named_sub_index(base + 1, m_position);
       }
       if((v < 0) || (*m_position != '}'))
       {
@@ -608,7 +679,7 @@ void basic_regex_formatter::format_conditional(
    {
       std::ptrdiff_t len = ::boost::re_detail::distance(m_position, m_end);
       len = (std::min)(static_cast(2), len);
-      v = m_traits.toi(m_position, m_position + len, 10);
+      v = this->toi(m_position, m_position + len, 10);
    }
    if(v < 0)
    {
@@ -657,8 +728,8 @@ void basic_regex_formatter::format_conditional(
    }
 }
 
-template 
-void basic_regex_formatter::format_until_scope_end()
+template 
+void basic_regex_formatter::format_until_scope_end()
 {
    do
    {
@@ -669,8 +740,8 @@ void basic_regex_formatter::format_until_scope_
    }while(m_position != m_end);
 }
 
-template 
-void basic_regex_formatter::put(char_type c)
+template 
+void basic_regex_formatter::put(char_type c)
 {
    // write a single character to output
    // according to which case translation mode we are in:
@@ -699,8 +770,8 @@ void basic_regex_formatter::put(char_type c)
    ++m_out;
 }
 
-template 
-void basic_regex_formatter::put(const sub_match_type& sub)
+template 
+void basic_regex_formatter::put(const sub_match_type& sub)
 {
    typedef typename sub_match_type::iterator iterator_type;
    iterator_type i = sub.first;
@@ -738,10 +809,10 @@ public:
 #endif
 };
 
-template 
+template 
 OutputIterator regex_format_imp(OutputIterator out,
                           const match_results& m,
-                          const charT* p1, const charT* p2,
+                          ForwardIter p1, ForwardIter p2,
                           match_flag_type flags,
                           const traits& t
                          )
@@ -754,57 +825,289 @@ OutputIterator regex_format_imp(OutputIterator out,
    re_detail::basic_regex_formatter<
       OutputIterator, 
       match_results, 
-      traits > f(out, m, t);
+      traits, ForwardIter> f(out, m, t);
    return f.format(p1, p2, flags);
 }
 
+#ifndef BOOST_NO_SFINAE
+
+BOOST_MPL_HAS_XXX_TRAIT_DEF(const_iterator)
+
+struct any_type { any_type(...); };
+typedef char no_type;
+typedef char (&unary_type)[2];
+typedef char (&binary_type)[3];
+typedef char (&ternary_type)[4];
+
+no_type check_is_formatter(unary_type, binary_type, ternary_type);
+template
+unary_type check_is_formatter(T const &, binary_type, ternary_type);
+template
+binary_type check_is_formatter(unary_type, T const &, ternary_type);
+template
+binary_type check_is_formatter(T const &, U const &, ternary_type);
+template
+ternary_type check_is_formatter(unary_type, binary_type, T const &);
+template
+ternary_type check_is_formatter(T const &, binary_type, U const &);
+template
+ternary_type check_is_formatter(unary_type, T const &, U const &);
+template
+ternary_type check_is_formatter(T const &, U const &, V const &);
+
+struct unary_binary_ternary
+{
+    typedef unary_type (*unary_fun)(any_type);
+    typedef binary_type (*binary_fun)(any_type, any_type);
+    typedef ternary_type (*ternary_fun)(any_type, any_type, any_type);
+    operator unary_fun();
+    operator binary_fun();
+    operator ternary_fun();
+};
+
+template::value>
+struct formatter_wrapper
+  : Formatter
+  , unary_binary_ternary
+{
+   formatter_wrapper(){}
+};
+
+template
+struct formatter_wrapper
+  : unary_binary_ternary
+{
+    operator Formatter *();
+};
+
+template
+struct formatter_wrapper
+  : unary_binary_ternary
+{
+    operator Formatter *();
+};
+
+template 
+struct format_traits_imp
+{
+private:
+   //
+   // F must be a pointer, a function, or a class with a function call operator:
+   //
+   BOOST_STATIC_ASSERT((::boost::is_pointer::value || ::boost::is_function::value || ::boost::is_class::value));
+   static formatter_wrapper f;
+   static M m;
+   static O out;
+   static boost::regex_constants::match_flag_type flags;
+public:
+   BOOST_STATIC_CONSTANT(int, value = sizeof(check_is_formatter(f(m), f(m, out), f(m, out, flags))));
+};
+
+template 
+struct format_traits
+{
+public:
+   // 
+   // Type is mpl::int_ where N is one of:
+   //
+   // 0 : F is a pointer to a presumably null-terminated string.
+   // 1 : F is a character-container such as a std::string.
+   // 2 : F is a Unary Functor.
+   // 3 : F is a Binary Functor.
+   // 4 : F is a Ternary Functor.
+   //
+   typedef typename boost::mpl::if_<
+      boost::mpl::and_, boost::mpl::not_::type> > >,
+      boost::mpl::int_<0>,
+      typename boost::mpl::if_<
+         has_const_iterator,
+         boost::mpl::int_<1>,
+         boost::mpl::int_::value>
+      >::type
+   >::type type;
+   //
+   // This static assertion will fail if the functor passed does not accept
+   // the same type of arguments passed.
+   //
+   BOOST_STATIC_ASSERT( boost::is_class::value && !has_const_iterator::value ? (type::value > 1) : true);
+};
+
+#else // BOOST_NO_SFINAE
+
+template 
+struct format_traits
+{
+public:
+   // 
+   // Type is mpl::int_ where N is one of:
+   //
+   // 0 : F is a pointer to a presumably null-terminated string.
+   // 1 : F is a character-container such as a std::string.
+   //
+   // Other options such as F being a Functor are not supported without
+   // SFINAE support.
+   //
+   typedef typename boost::mpl::if_<
+      boost::is_pointer,
+      boost::mpl::int_<0>,
+      boost::mpl::int_<1>
+   >::type type;
+};
+
+#endif // BOOST_NO_SFINAE
+
+template 
+struct format_functor3
+{
+   format_functor3(Base b) : func(b) {}
+   template 
+   OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type f)
+   {
+      return func(m, i, f);
+   }
+   template 
+   OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type f, const Traits&)
+   {
+      return (*this)(m, i, f);
+   }
+private:
+   Base func;
+   format_functor3(const format_functor3&);
+   format_functor3& operator=(const format_functor3&);
+};
+
+template 
+struct format_functor2
+{
+   format_functor2(Base b) : func(b) {}
+   template 
+   OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type /*f*/)
+   {
+      return func(m, i);
+   }
+   template 
+   OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type f, const Traits&)
+   {
+      return (*this)(m, i, f);
+   }
+private:
+   Base func;
+   format_functor2(const format_functor2&);
+   format_functor2& operator=(const format_functor2&);
+};
+
+template 
+struct format_functor1
+{
+   format_functor1(Base b) : func(b) {}
+
+   template 
+   OutputIter do_format_string(const S& s, OutputIter i)
+   {
+      return re_detail::copy(s.begin(), s.end(), i);
+   }
+   template 
+   inline OutputIter do_format_string(const S* s, OutputIter i)
+   {
+      while(s && *s)
+      {
+         *i = *s;
+         ++i;
+         ++s;
+      }
+      return i;
+   }
+   template 
+   OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type /*f*/)
+   {
+      return do_format_string(func(m), i);
+   }
+   template 
+   OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type f, const Traits&)
+   {
+      return (*this)(m, i, f);
+   }
+private:
+   Base func;
+   format_functor1(const format_functor1&);
+   format_functor1& operator=(const format_functor1&);
+};
+
+template 
+struct format_functor_c_string
+{
+   format_functor_c_string(const charT* ps) : func(ps) {}
+
+   template 
+   OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type f, const Traits& t = Traits())
+   {
+      typedef typename Match::char_type char_type;
+      const charT* end = func;
+      while(*end) ++end;
+      return regex_format_imp(i, m, func, end, f, t);
+   }
+private:
+   const charT* func;
+   format_functor_c_string(const format_functor_c_string&);
+   format_functor_c_string& operator=(const format_functor_c_string&);
+};
+
+template 
+struct format_functor_container
+{
+   format_functor_container(const Container& c) : func(c) {}
+
+   template 
+   OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type f, const Traits& t = Traits())
+   {
+      typedef typename Match::char_type char_type;
+      return re_detail::regex_format_imp(i, m, func.begin(), func.end(), f, t);
+   }
+private:
+   const Container& func;
+   format_functor_container(const format_functor_container&);
+   format_functor_container& operator=(const format_functor_container&);
+};
+
+template  >
+struct compute_functor_type
+{
+   typedef typename format_traits::type tag;
+   typedef typename boost::remove_cv< typename boost::remove_pointer::type>::type maybe_char_type;
+
+   typedef typename mpl::if_<
+      ::boost::is_same >, format_functor_c_string,
+      typename mpl::if_<
+         ::boost::is_same >, format_functor_container,
+         typename mpl::if_<
+            ::boost::is_same >, format_functor1,
+            typename mpl::if_<
+               ::boost::is_same >, format_functor2, 
+               format_functor3
+            >::type
+         >::type
+      >::type
+   >::type type;
+};
 
 } // namespace re_detail
 
-template 
-OutputIterator regex_format(OutputIterator out,
-                          const match_results& m,
-                          const charT* fmt,
+template 
+inline OutputIterator regex_format(OutputIterator out,
+                          const match_results& m,
+                          Functor fmt,
                           match_flag_type flags = format_all
                          )
 {
-   re_detail::trivial_format_traits traits;
-   return re_detail::regex_format_imp(out, m, fmt, fmt + traits.length(fmt), flags, traits);
+   return m.format(out, fmt, flags);
 }
 
-template 
-OutputIterator regex_format(OutputIterator out,
-                          const match_results& m,
-                          const std::basic_string& fmt,
-                          match_flag_type flags = format_all
-                         )
-{
-   re_detail::trivial_format_traits traits;
-   return re_detail::regex_format_imp(out, m, fmt.data(), fmt.data() + fmt.size(), flags, traits);
-}  
-
-template 
-std::basic_string regex_format(const match_results& m, 
-                                      const charT* fmt, 
+template 
+inline std::basic_string::char_type> regex_format(const match_results& m, 
+                                      Functor fmt, 
                                       match_flag_type flags = format_all)
 {
-   std::basic_string result;
-   re_detail::string_out_iterator > i(result);
-   re_detail::trivial_format_traits traits;
-   re_detail::regex_format_imp(i, m, fmt, fmt + traits.length(fmt), flags, traits);
-   return result;
-}
-
-template 
-std::basic_string regex_format(const match_results& m, 
-                                      const std::basic_string& fmt, 
-                                      match_flag_type flags = format_all)
-{
-   std::basic_string result;
-   re_detail::string_out_iterator > i(result);
-   re_detail::trivial_format_traits traits;
-   re_detail::regex_format_imp(i, m, fmt.data(), fmt.data() + fmt.size(), flags, traits);
-   return result;
+   return m.format(fmt, flags);
 }
 
 #ifdef BOOST_MSVC
diff --git a/include/boost/regex/v4/regex_replace.hpp b/include/boost/regex/v4/regex_replace.hpp
index c4544c05..ac8e3c81 100644
--- a/include/boost/regex/v4/regex_replace.hpp
+++ b/include/boost/regex/v4/regex_replace.hpp
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 1998-2002
+ * Copyright (c) 1998-2009
  * John Maddock
  *
  * Use, modification and distribution are subject to the 
@@ -35,12 +35,12 @@ namespace boost{
 #pragma warning(pop)
 #endif
 
-template 
+template 
 OutputIterator regex_replace(OutputIterator out,
                          BidirectionalIterator first,
                          BidirectionalIterator last,
                          const basic_regex& e, 
-                         const charT* fmt, 
+                         Formatter fmt, 
                          match_flag_type flags = match_default)
 {
    regex_iterator i(first, last, e, flags);
@@ -69,21 +69,10 @@ OutputIterator regex_replace(OutputIterator out,
    return out;
 }
 
-template 
-inline OutputIterator regex_replace(OutputIterator out,
-                         Iterator first,
-                         Iterator last,
-                         const basic_regex& e, 
-                         const std::basic_string& fmt,
-                         match_flag_type flags = match_default)
-{
-   return regex_replace(out, first, last, e, fmt.c_str(), flags);
-}
-
-template 
+template 
 std::basic_string regex_replace(const std::basic_string& s,
                          const basic_regex& e, 
-                         const charT* fmt,
+                         Formatter fmt,
                          match_flag_type flags = match_default)
 {
    std::basic_string result;
@@ -92,18 +81,6 @@ std::basic_string regex_replace(const std::basic_string& s,
    return result;
 }
 
-template 
-std::basic_string regex_replace(const std::basic_string& s,
-                         const basic_regex& e, 
-                         const std::basic_string& fmt,
-                         match_flag_type flags = match_default)
-{
-   std::basic_string result;
-   re_detail::string_out_iterator > i(result);
-   regex_replace(i, s.begin(), s.end(), e, fmt.c_str(), flags);
-   return result;
-}
-
 #ifdef BOOST_MSVC
 #pragma warning(push)
 #pragma warning(disable: 4103)
diff --git a/include/boost/regex/v4/regex_traits_defaults.hpp b/include/boost/regex/v4/regex_traits_defaults.hpp
index 5b2c6bc3..a8361083 100644
--- a/include/boost/regex/v4/regex_traits_defaults.hpp
+++ b/include/boost/regex/v4/regex_traits_defaults.hpp
@@ -322,7 +322,7 @@ inline const charT* get_escape_R_string()
 {
 #ifdef BOOST_MSVC
 #  pragma warning(push)
-#  pragma warning(disable:4309)
+#  pragma warning(disable:4309 4245)
 #endif
    static const charT e1[] = { '(', '?', '>', '\x0D', '\x0A', '?', 
       '|', '[', '\x0A', '\x0B', '\x0C', '\x85', '\\', 'x', '{', '2', '0', '2', '8', '}', 
diff --git a/include/boost/regex/v4/u32regex_iterator.hpp b/include/boost/regex/v4/u32regex_iterator.hpp
index 7e893e69..65ebd7f8 100644
--- a/include/boost/regex/v4/u32regex_iterator.hpp
+++ b/include/boost/regex/v4/u32regex_iterator.hpp
@@ -178,7 +178,7 @@ inline u32regex_iterator::const
    typedef typename std::basic_string::const_iterator iter_type;
    return u32regex_iterator(p.begin(), p.end(), e, m);
 }
-inline u32regex_iterator make_u32regex_iterator(const UnicodeString& s, const u32regex& e, regex_constants::match_flag_type m = regex_constants::match_default)
+inline u32regex_iterator make_u32regex_iterator(const U_NAMESPACE_QUALIFIER UnicodeString& s, const u32regex& e, regex_constants::match_flag_type m = regex_constants::match_default)
 {
    return u32regex_iterator(s.getBuffer(), s.getBuffer() + s.length(), e, m);
 }
diff --git a/include/boost/regex/v4/u32regex_token_iterator.hpp b/include/boost/regex/v4/u32regex_token_iterator.hpp
index 2726d486..c47a2192 100644
--- a/include/boost/regex/v4/u32regex_token_iterator.hpp
+++ b/include/boost/regex/v4/u32regex_token_iterator.hpp
@@ -294,7 +294,7 @@ inline u32regex_token_iterator:
    typedef typename std::basic_string::const_iterator iter_type;
    return u32regex_token_iterator(p.begin(), p.end(), e, m);
 }
-inline u32regex_token_iterator make_u32regex_token_iterator(const UnicodeString& s, const u32regex& e, int submatch = 0, regex_constants::match_flag_type m = regex_constants::match_default)
+inline u32regex_token_iterator make_u32regex_token_iterator(const U_NAMESPACE_QUALIFIER UnicodeString& s, const u32regex& e, int submatch = 0, regex_constants::match_flag_type m = regex_constants::match_default)
 {
    return u32regex_token_iterator(s.getBuffer(), s.getBuffer() + s.length(), e, submatch, m);
 }
@@ -327,7 +327,7 @@ inline u32regex_token_iterator:
    return u32regex_token_iterator(p.begin(), p.end(), e, m);
 }
 template 
-inline u32regex_token_iterator make_u32regex_token_iterator(const UnicodeString& s, const u32regex& e, const int (&submatch)[N], regex_constants::match_flag_type m = regex_constants::match_default)
+inline u32regex_token_iterator make_u32regex_token_iterator(const U_NAMESPACE_QUALIFIER UnicodeString& s, const u32regex& e, const int (&submatch)[N], regex_constants::match_flag_type m = regex_constants::match_default)
 {
    return u32regex_token_iterator(s.getBuffer(), s.getBuffer() + s.length(), e, submatch, m);
 }
@@ -356,7 +356,7 @@ inline u32regex_token_iterator:
    typedef typename std::basic_string::const_iterator iter_type;
    return u32regex_token_iterator(p.begin(), p.end(), e, m);
 }
-inline u32regex_token_iterator make_u32regex_token_iterator(const UnicodeString& s, const u32regex& e, const std::vector& submatch, regex_constants::match_flag_type m = regex_constants::match_default)
+inline u32regex_token_iterator make_u32regex_token_iterator(const U_NAMESPACE_QUALIFIER UnicodeString& s, const u32regex& e, const std::vector& submatch, regex_constants::match_flag_type m = regex_constants::match_default)
 {
    return u32regex_token_iterator(s.getBuffer(), s.getBuffer() + s.length(), e, submatch, m);
 }
diff --git a/performance/Jamfile.v2 b/performance/Jamfile.v2
index 44937ada..ca47cb9e 100644
--- a/performance/Jamfile.v2
+++ b/performance/Jamfile.v2
@@ -48,6 +48,7 @@ exe regex_comparison :
     ;
 
 
+install . : regex_comparison ;
 
 
 
diff --git a/src/cpp_regex_traits.cpp b/src/cpp_regex_traits.cpp
index 9ed66be6..1d24cc1a 100644
--- a/src/cpp_regex_traits.cpp
+++ b/src/cpp_regex_traits.cpp
@@ -42,7 +42,7 @@ void cpp_regex_traits_char_layer::init()
    std::messages::catalog cat = reinterpret_cast::catalog>(-1);
 #endif
    std::string cat_name(cpp_regex_traits::get_catalog_name());
-   if(cat_name.size())
+   if(cat_name.size() && (m_pmessages != 0))
    {
       cat = this->m_pmessages->open(
          cat_name, 
diff --git a/src/cregex.cpp b/src/cregex.cpp
index fb12373a..f67d3718 100644
--- a/src/cregex.cpp
+++ b/src/cregex.cpp
@@ -563,11 +563,7 @@ std::string RegEx::What(int i)const
    return result;
 }
 
-#ifdef BOOST_HAS_LONG_LONG
-const std::size_t RegEx::npos = static_cast(~0ULL);
-#else
-const std::size_t RegEx::npos = static_cast(~0UL);
-#endif
+const std::size_t RegEx::npos = ~static_cast(0);
 
 } // namespace boost
 
diff --git a/src/fileiter.cpp b/src/fileiter.cpp
index 7d9c7f88..ff1d1119 100644
--- a/src/fileiter.cpp
+++ b/src/fileiter.cpp
@@ -258,11 +258,22 @@ void mapfile::lock(pointer* node)const
             *p = 0;
             *(reinterpret_cast(*node)) = 1;
          }
-         std::fseek(hfile, (node - _first) * buf_size, SEEK_SET);
-         if(node == _last - 1)
-            std::fread(*node + sizeof(int), _size % buf_size, 1, hfile);
-         else
-            std::fread(*node + sizeof(int), buf_size, 1, hfile);
+ 
+        std::size_t read_size = 0; 
+        int read_pos = std::fseek(hfile, (node - _first) * buf_size, SEEK_SET); 
+
+        if(0 == read_pos && node == _last - 1) 
+           read_size = std::fread(*node + sizeof(int), _size % buf_size, 1, hfile); 
+        else
+           read_size = std::fread(*node + sizeof(int), buf_size, 1, hfile);
+#ifndef BOOST_NO_EXCEPTIONS 
+        if((read_size == 0) || (std::ferror(hfile)))
+        { 
+           throw std::runtime_error("Unable to read file."); 
+        } 
+#else 
+        BOOST_REGEX_NOEH_ASSERT((0 == std::ferror(hfile)) && (read_size != 0)); 
+#endif 
       }
       else
       {
diff --git a/src/posix_api.cpp b/src/posix_api.cpp
index 1564cedb..37ed4221 100644
--- a/src/posix_api.cpp
+++ b/src/posix_api.cpp
@@ -58,6 +58,7 @@ const char* names[] = {
       "REG_EMPTY",
       "REG_ECOMPLEXITY",
       "REG_ESTACK",
+      "REG_E_PERL",
       "REG_E_UNKNOWN",
 };
 } // namespace
diff --git a/src/regex_traits_defaults.cpp b/src/regex_traits_defaults.cpp
index c9596a3d..31b79184 100644
--- a/src/regex_traits_defaults.cpp
+++ b/src/regex_traits_defaults.cpp
@@ -111,30 +111,31 @@ BOOST_REGEX_DECL const char* BOOST_REGEX_CALL get_default_syntax(regex_constants
 BOOST_REGEX_DECL const char* BOOST_REGEX_CALL get_default_error_string(regex_constants::error_type n)
 {
    static const char* const s_default_error_messages[] = {
-      "Success",             /* REG_NOERROR */
-      "No match",             /* REG_NOMATCH */
-      "Invalid regular expression",    /* REG_BADPAT */
-      "Invalid collation character",      /* REG_ECOLLATE */
-      "Invalid character class name",     /* REG_ECTYPE */
-      "Invalid or trailing backslash",         /* REG_EESCAPE */
-      "Invalid back reference",        /* REG_ESUBREG */
-      "Unmatched [ or [^",       /* REG_EBRACK */
-      "Unmatched ( or \\(",         /* REG_EPAREN */
-      "Unmatched { or \\{",           /* REG_EBRACE */
-      "Invalid content of repeat range",     /* REG_BADBR */
-      "Invalid range end",       /* REG_ERANGE */
-      "Memory exhausted",           /* REG_ESPACE */
-      "Invalid preceding regular expression",   /* REG_BADRPT */
-      "Premature end of regular expression", /* REG_EEND */
-      "Regular expression too big",    /* REG_ESIZE */
-      "Unmatched ) or \\)",         /* REG_ERPAREN */
-      "Empty expression",           /* REG_EMPTY */
-      "Complexity requirements exceeded",  /* REG_ECOMPLEXITY */
-      "Out of stack space", /* REG_ESTACK */
-      "Unknown error",    /* REG_E_UNKNOWN */
-      "",
-      "",
-      "",
+      "Success",                                                            /* REG_NOERROR 0 error_ok */
+      "No match",                                                           /* REG_NOMATCH 1 error_no_match */
+      "Invalid regular expression.",                                        /* REG_BADPAT 2 error_bad_pattern */
+      "Invalid collation character.",                                       /* REG_ECOLLATE 3 error_collate */
+      "Invalid character class name, collating name, or character range.",  /* REG_ECTYPE 4 error_ctype */
+      "Invalid or unterminated escape sequence.",                           /* REG_EESCAPE 5 error_escape */
+      "Invalid back reference: specified capturing group does not exist.",  /* REG_ESUBREG 6 error_backref */
+      "Unmatched [ or [^ in character class declaration.",                  /* REG_EBRACK 7 error_brack */
+      "Unmatched marking parenthesis ( or \\(.",                            /* REG_EPAREN 8 error_paren */
+      "Unmatched quantified repeat operator { or \\{.",                     /* REG_EBRACE 9 error_brace */
+      "Invalid content of repeat range.",                                   /* REG_BADBR 10 error_badbrace */
+      "Invalid range end in character class",                               /* REG_ERANGE 11 error_range */
+      "Out of memory.",                                                     /* REG_ESPACE 12 error_space NOT USED */
+      "Invalid preceding regular expression prior to repetition operator.", /* REG_BADRPT 13 error_badrepeat */
+      "Premature end of regular expression",                                /* REG_EEND 14 error_end NOT USED */
+      "Regular expression is too large.",                                   /* REG_ESIZE 15 error_size NOT USED */
+      "Unmatched ) or \\)",                                                 /* REG_ERPAREN 16 error_right_paren NOT USED */
+      "Empty regular expression.",                                          /* REG_EMPTY 17 error_empty */
+      "The complexity of matching the regular expression exceeded predefined bounds.  "
+      "Try refactoring the regular expression to make each choice made by the state machine unambiguous.  "
+      "This exception is thrown to prevent \"eternal\" matches that take an "
+      "indefinite period time to locate.",                                  /* REG_ECOMPLEXITY 18 error_complexity */
+      "Ran out of stack space trying to match the regular expression.",     /* REG_ESTACK 19 error_stack */
+      "Invalid or unterminated Perl (?...) sequence.",                      /* REG_E_PERL 20 error_perl */
+      "Unknown error.",                                                     /* REG_E_UNKNOWN 21 error_unknown */
    };
 
    return (n > ::boost::regex_constants::error_unknown) ? s_default_error_messages[ ::boost::regex_constants::error_unknown] : s_default_error_messages[n];
diff --git a/src/static_mutex.cpp b/src/static_mutex.cpp
index cef76783..040b52dd 100644
--- a/src/static_mutex.cpp
+++ b/src/static_mutex.cpp
@@ -157,7 +157,7 @@ void scoped_static_mutex_lock::lock()
    {
        boost::call_once(static_mutex::m_once,&static_mutex::init);
       if(0 == m_plock)
-         m_plock = new boost::recursive_mutex::scoped_lock(*static_mutex::m_pmutex, false);
+         m_plock = new boost::recursive_mutex::scoped_lock(*static_mutex::m_pmutex, boost::defer_lock);
       m_plock->lock();
       m_have_lock = true;
    }
diff --git a/src/usinstances.cpp b/src/usinstances.cpp
index ca7b1dc9..44ebd28d 100644
--- a/src/usinstances.cpp
+++ b/src/usinstances.cpp
@@ -17,6 +17,9 @@
   */
 
 #define BOOST_REGEX_SOURCE
+#ifdef _MSC_VER
+#pragma warning(disable:4506) // 'no definition for inline function'
+#endif
 
 #include 
 #include 
diff --git a/src/wide_posix_api.cpp b/src/wide_posix_api.cpp
index c8a91902..bdb7580e 100644
--- a/src/wide_posix_api.cpp
+++ b/src/wide_posix_api.cpp
@@ -65,6 +65,7 @@ const wchar_t* wnames[] = {
       L"REG_EMPTY",
       L"REG_ECOMPLEXITY",
       L"REG_ESTACK",
+      L"REG_E_PERL",
       L"REG_E_UNKNOWN",
 };
 }
diff --git a/test/c_compiler_checks/posix_api_check.cpp b/test/c_compiler_checks/posix_api_check.cpp
index 9a94c651..8daae8f2 100644
--- a/test/c_compiler_checks/posix_api_check.cpp
+++ b/test/c_compiler_checks/posix_api_check.cpp
@@ -34,13 +34,13 @@ int flags = REG_EXTENDED | REG_BASIC | REG_NOSPEC | REG_ICASE | REG_NOSUB |
 int main()
 {
    regex_tA re;
-   int result;
+   unsigned int result;
    result = regcompA(&re, expression, REG_AWK);
    if(result > REG_NOERROR)
    {
       char buf[256];
       regerrorA(result, &re, buf, sizeof(buf));
-      printf(buf);
+      printf("%s", buf);
       return result;
    }
    BOOST_TEST(re.re_nsub == 0);
@@ -51,11 +51,11 @@ int main()
    {
       char buf[256];
       regerrorA(result, &re, buf, sizeof(buf));
-      printf(buf);
+      printf("%s", buf);
       regfreeA(&re);
       return result;
    }
-   BOOST_TEST(matches[0].rm_so == matches[0].rm_eo == 1);
+   BOOST_TEST(matches[0].rm_so == matches[0].rm_eo);
    regfreeA(&re);
    printf("no errors found\n");
    return boost::report_errors();
diff --git a/test/c_compiler_checks/wide_posix_api_check.cpp b/test/c_compiler_checks/wide_posix_api_check.cpp
index 7e699f03..30172619 100644
--- a/test/c_compiler_checks/wide_posix_api_check.cpp
+++ b/test/c_compiler_checks/wide_posix_api_check.cpp
@@ -40,7 +40,7 @@ int flags = REG_EXTENDED | REG_BASIC | REG_NOSPEC | REG_ICASE | REG_NOSUB |
 int main()
 {
    regex_t re;
-   int result;
+   unsigned result;
    result = regcomp(&re, expression, REG_AWK);
    if(result > REG_NOERROR)
    {
@@ -48,8 +48,8 @@ int main()
       regerror(result, &re, buf, sizeof(buf));
       char nbuf[256];
       for(int i = 0; i < 256; ++i)
-         nbuf[i] = buf[i];
-      printf(nbuf);
+         nbuf[i] = static_cast(buf[i]);
+      printf("%s", nbuf);
       return result;
    }
    if(re.re_nsub != 0)
@@ -66,8 +66,8 @@ int main()
       regerror(result, &re, buf, sizeof(buf));
       char nbuf[256];
       for(int i = 0; i < 256; ++i)
-         nbuf[i] = buf[i];
-      printf(nbuf);
+         nbuf[i] = static_cast(buf[i]);
+      printf("%s", nbuf);
       regfree(&re);
       return result;
    }
@@ -77,7 +77,7 @@ int main()
       exit(-1);
    }
    regfree(&re);
-   printf("no errors found\n");
+   printf("%s", "no errors found\n");
    return 0;
 }
 
diff --git a/test/concepts/icu_concept_check.cpp b/test/concepts/icu_concept_check.cpp
index 59fd2a04..526758a4 100644
--- a/test/concepts/icu_concept_check.cpp
+++ b/test/concepts/icu_concept_check.cpp
@@ -8,6 +8,13 @@
  * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
+
+// 
+// This define keep ICU in it's own namespace: helps us to track bugs that would 
+// otherwise go unnoticed:
+//
+#define U_USING_ICU_NAMESPACE 0
+
 #include 
 
 #if defined(BOOST_MSVC)
@@ -66,7 +73,7 @@ int main()
    boost::regex_constants::match_flag_type flgs = boost::regex_constants::match_default;
    std::string s1;
    std::wstring s2;
-   UnicodeString us;
+   U_NAMESPACE_QUALIFIER UnicodeString us;
    b = boost::u32regex_match(utf8_arch1(), utf8_arch1(), m1, e1, flgs);
    b = boost::u32regex_match(utf8_arch1(), utf8_arch1(), m1, e1);
    b = boost::u32regex_match(utf8_arch2(), utf8_arch2(), m2, e1, flgs);
diff --git a/test/regress/test_deprecated.cpp b/test/regress/test_deprecated.cpp
index 84eefb9f..276fa599 100644
--- a/test/regress/test_deprecated.cpp
+++ b/test/regress/test_deprecated.cpp
@@ -137,7 +137,7 @@ void test_deprecated(const char&, const test_regex_search_tag&)
    if(test_info::syntax_options() & ~boost::regex::icase)
       return;
    try{
-      boost::RegEx e(expression, test_info::syntax_options() & boost::regex::icase);
+      boost::RegEx e(expression, (test_info::syntax_options() & boost::regex::icase) != 0);
       if(e.error_code())
       {
          BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done, error code = " << e.error_code(), char);
@@ -303,7 +303,7 @@ void test_deprecated(const char&, const test_invalid_regex_tag&)
       return;
    bool have_catch = false;
    try{
-      boost::RegEx e(expression, test_info::syntax_options() & boost::regex::icase);
+      boost::RegEx e(expression, (test_info::syntax_options() & boost::regex::icase) != 0);
       if(e.error_code())
          have_catch = true;
    }
diff --git a/test/regress/test_escapes.cpp b/test/regress/test_escapes.cpp
index d2dbbe43..e3d675be 100644
--- a/test/regress/test_escapes.cpp
+++ b/test/regress/test_escapes.cpp
@@ -12,7 +12,7 @@
 #include "test.hpp"
 
 #ifdef BOOST_MSVC
-#pragma warning(disable:4127)
+#pragma warning(disable:4127 4428)
 #endif
 
 void test_character_escapes()
diff --git a/test/regress/test_icu.cpp b/test/regress/test_icu.cpp
index 88d6fe4a..16f667d9 100644
--- a/test/regress/test_icu.cpp
+++ b/test/regress/test_icu.cpp
@@ -564,7 +564,7 @@ void test_icu(const wchar_t&, const test_regex_replace_tag&)
          //
          // Now with UnicodeString:
          //
-         UnicodeString expression16u, text16u, format16u, result16u, found16u;
+         U_NAMESPACE_QUALIFIER UnicodeString expression16u, text16u, format16u, result16u, found16u;
          if(expression16.size())
             expression16u.setTo(&*expression16.begin(), expression16.size());
          if(text16.size())
diff --git a/test/regress/test_not_regex.hpp b/test/regress/test_not_regex.hpp
index 8b0cdeb9..c1032994 100644
--- a/test/regress/test_not_regex.hpp
+++ b/test/regress/test_not_regex.hpp
@@ -86,15 +86,15 @@ void test(boost::basic_regex& r, const test_invalid_regex_tag&)
       have_catch = true;
       test_empty(r);
    }
-   catch(const std::runtime_error& r)
+   catch(const std::runtime_error& e)
    {
       have_catch = true;
-      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but a std::runtime_error instead: " << r.what(), charT);
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but a std::runtime_error instead: " << e.what(), charT);
    }
-   catch(const std::exception& r)
+   catch(const std::exception& e)
    {
       have_catch = true;
-      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but a std::exception instead: " << r.what(), charT);
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but a std::exception instead: " << e.what(), charT);
    }
    catch(...)
    {
diff --git a/test/regress/test_regex_replace.hpp b/test/regress/test_regex_replace.hpp
index 53236df7..2165d7d1 100644
--- a/test/regress/test_regex_replace.hpp
+++ b/test/regress/test_regex_replace.hpp
@@ -56,13 +56,13 @@ void test(boost::basic_regex& r, const test_regex_replace_tag&)
    {
       BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done: " << e.what(), charT);
    }
-   catch(const std::runtime_error& r)
+   catch(const std::runtime_error& e)
    {
-      BOOST_REGEX_TEST_ERROR("Received an unexpected std::runtime_error: " << r.what(), charT);
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::runtime_error: " << e.what(), charT);
    }
-   catch(const std::exception& r)
+   catch(const std::exception& e)
    {
-      BOOST_REGEX_TEST_ERROR("Received an unexpected std::exception: " << r.what(), charT);
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::exception: " << e.what(), charT);
    }
    catch(...)
    {
diff --git a/test/regress/test_regex_search.hpp b/test/regress/test_regex_search.hpp
index debb1efb..ff70d765 100644
--- a/test/regress/test_regex_search.hpp
+++ b/test/regress/test_regex_search.hpp
@@ -29,12 +29,17 @@
 struct test_regex_search_tag{};
 
 template 
-void test_sub_match(const boost::sub_match& sub, BidirectionalIterator base, const int* answer_table, int i)
+void test_sub_match(const boost::sub_match& sub, BidirectionalIterator base, const int* answer_table, int i, bool recurse = true)
 {
 #ifdef BOOST_MSVC
 #pragma warning(push)
 #pragma warning(disable:4244)
 #endif
+   if(recurse)
+   {
+      boost::sub_match copy(sub);
+      test_sub_match(copy, base, answer_table, i, false);
+   }
    typedef typename boost::sub_match::value_type charT;
    if((sub.matched == 0) 
       && 
@@ -71,8 +76,19 @@ void test_sub_match(const boost::sub_match& sub, Bidirect
 }
 
 template 
-void test_result(const boost::match_results& what, BidirectionalIterator base, const int* answer_table)
+void test_result(const boost::match_results& what, BidirectionalIterator base, const int* answer_table, bool recurse = true)
 {
+   if(recurse)
+   {
+      boost::match_results copy(what);
+      test_result(copy, base, answer_table, false);
+      boost::match_results s;
+      s.swap(copy);
+      test_result(s, base, answer_table, false);
+      boost::match_results s2;
+      s2 = what;
+      test_result(s2, base, answer_table, false);
+   }
    for(unsigned i = 0; i < what.size(); ++i)
    {
       test_sub_match(what[i], base, answer_table, i);
@@ -508,13 +524,13 @@ void test(boost::basic_regex& r, const test_regex_search_tag&)
    {
       BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done: " << e.what(), charT);
    }
-   catch(const std::runtime_error& r)
+   catch(const std::runtime_error& e)
    {
-      BOOST_REGEX_TEST_ERROR("Received an unexpected std::runtime_error: " << r.what(), charT);
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::runtime_error: " << e.what(), charT);
    }
-   catch(const std::exception& r)
+   catch(const std::exception& e)
    {
-      BOOST_REGEX_TEST_ERROR("Received an unexpected std::exception: " << r.what(), charT);
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::exception: " << e.what(), charT);
    }
    catch(...)
    {
diff --git a/test/regress/test_simple_repeats.cpp b/test/regress/test_simple_repeats.cpp
index 690c71eb..1ebdc707 100644
--- a/test/regress/test_simple_repeats.cpp
+++ b/test/regress/test_simple_repeats.cpp
@@ -172,6 +172,7 @@ void test_simple_repeats()
    TEST_REGEX_SEARCH("^a{0,1}?$", perl, "aaaaa", match_default, make_array(-2, -2));
    TEST_REGEX_SEARCH("^(?:a){0,1}?$", perl, "aaaaa", match_default, make_array(-2, -2));
    TEST_REGEX_SEARCH("^a(?:bc)?", perl, "abcbc", match_any|match_all, make_array(-2, -2));
+   test_simple_repeats2();
 }
 
 void test_simple_repeats2()
diff --git a/test/static_mutex/static_mutex_test.cpp b/test/static_mutex/static_mutex_test.cpp
index 72a8cd49..b31eefac 100644
--- a/test/static_mutex/static_mutex_test.cpp
+++ b/test/static_mutex/static_mutex_test.cpp
@@ -161,7 +161,7 @@ startup1 up1;
 
 int main()
 {
-   BOOST_TEST(0 != &up1);
+   (void)up1;
    
    std::list > threads;
    for(int i = 0; i < 2; ++i)