[Boost-commit] svn:boost r76140 - in trunk: boost/regex libs/regex/doc libs/regex/doc/html libs/regex/doc/html/boost_regex/configuration

Subject: [Boost-commit] svn:boost r76140 - in trunk: boost/regex libs/regex/doc libs/regex/doc/html libs/regex/doc/html/boost_regex/configuration
From: john_at_[hidden]
Date: 2011-12-24 13:04:37

Author: johnmaddock
Date: 2011-12-24 13:04:37 EST (Sat, 24 Dec 2011)
New Revision: 76140
URL: http://svn.boost.org/trac/boost/changeset/76140

Log:
Add BOOST_REGEX_NO_FASTCALL config macro and regenerate docs.
Fixes #6245.
Text files modified: 
   trunk/boost/regex/config.hpp                                     |     2 +-                                      
   trunk/boost/regex/user.hpp                                       |     3 +++                                     
   trunk/libs/regex/doc/configuration.qbk                           |     1 +                                       
   trunk/libs/regex/doc/html/boost_regex/configuration/linkage.html |    15 +++++++++++++++                         
   trunk/libs/regex/doc/html/index.html                             |     2 +-                                      
   5 files changed, 21 insertions(+), 2 deletions(-)

Modified: trunk/boost/regex/config.hpp
==============================================================================
--- trunk/boost/regex/config.hpp	(original)
+++ trunk/boost/regex/config.hpp	2011-12-24 13:04:37 EST (Sat, 24 Dec 2011)
@@ -222,7 +222,7 @@
  ****************************************************************************/
 
 #if defined(BOOST_MSVC) && (BOOST_MSVC >= 1200) && defined(_MSC_EXTENSIONS)
-#if defined(_DEBUG) || defined(__MSVC_RUNTIME_CHECKS) || defined(_MANAGED)
+#if defined(_DEBUG) || defined(__MSVC_RUNTIME_CHECKS) || defined(_MANAGED) || defined(BOOST_REGEX_NO_FASTCALL)
 #  define BOOST_REGEX_CALL __cdecl
 #else
 #  define BOOST_REGEX_CALL __fastcall

Modified: trunk/boost/regex/user.hpp
==============================================================================
--- trunk/boost/regex/user.hpp	(original)
+++ trunk/boost/regex/user.hpp	2011-12-24 13:04:37 EST (Sat, 24 Dec 2011)
@@ -88,3 +88,6 @@
 
 // define this if you want to enable support for Unicode via ICU.
 // #define BOOST_HAS_ICU
+
+// define this if you want regex to use __cdecl calling convensions, even when __fastcall is available:
+// #define BOOST_REGEX_NO_FASTCALL

Modified: trunk/libs/regex/doc/configuration.qbk
==============================================================================
--- trunk/libs/regex/doc/configuration.qbk	(original)
+++ trunk/libs/regex/doc/configuration.qbk	2011-12-24 13:04:37 EST (Sat, 24 Dec 2011)
@@ -38,6 +38,7 @@
 [[macro][description]]
 [[BOOST_REGEX_DYN_LINK][For Microsoft and Borland C++ builds, this tells Boost.Regex that it should link to the dll build of the Boost.Regex.  By default boost.regex will link to its static library build, even if the dynamic C runtime library is in use.]]
 [[BOOST_REGEX_NO_LIB][For Microsoft and Borland C++ builds, this tells Boost.Regex that it should not automatically select the library to link to.]]
+[[BOOST_REGEX_NO_FASTCALL][For Microsoft builds, this tells Boost.Regex to use the `__cdecl` calling convention rather than `__fastcall`.  Useful if you want to use the same library from both managed and unmanaged code.]]
 ]
 
 [endsect]

Modified: trunk/libs/regex/doc/html/boost_regex/configuration/linkage.html
==============================================================================
--- trunk/libs/regex/doc/html/boost_regex/configuration/linkage.html	(original)
+++ trunk/libs/regex/doc/html/boost_regex/configuration/linkage.html	2011-12-24 13:04:37 EST (Sat, 24 Dec 2011)
@@ -72,6 +72,21 @@
                 </p>
               </td>
 </tr>
+<tr>
+<td>
+                <p>
+                  BOOST_REGEX_NO_FASTCALL
+                </p>
+              </td>
+<td>
+                <p>
+                  For Microsoft builds, this tells Boost.Regex to use the <code class="computeroutput"><span class="identifier">__cdecl</span></code> calling convention rather
+                  than <code class="computeroutput"><span class="identifier">__fastcall</span></code>.
+                  Useful if you want to use the same library from both managed and
+                  unmanaged code.
+                </p>
+              </td>
+</tr>
 </tbody>
 </table></div>
 </div>

Modified: trunk/libs/regex/doc/html/index.html
==============================================================================
--- trunk/libs/regex/doc/html/index.html	(original)
+++ trunk/libs/regex/doc/html/index.html	2011-12-24 13:04:37 EST (Sat, 24 Dec 2011)
@@ -198,7 +198,7 @@
   </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: December 24, 2011 at 17:50:34 GMT</small></p></td>
+<td align="left"><p><small>Last revised: December 24, 2011 at 18:02:12 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>