[Boost-commit] svn:boost r86530 - trunk/tools/bcp

Subject: [Boost-commit] svn:boost r86530 - trunk/tools/bcp
From: john_at_[hidden]
Date: 2013-10-31 13:34:35

Author: johnmaddock
Date: 2013-10-31 13:34:35 EDT (Thu, 31 Oct 2013)
New Revision: 86530
URL: http://svn.boost.org/trac/boost/changeset/86530

Log:
Fix for function declarations which have macroized exception specifications.
Fixes #8812.

Text files modified: 
   trunk/tools/bcp/add_dependent_lib.cpp |     6 +++---                                  
   1 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/tools/bcp/add_dependent_lib.cpp
==============================================================================
--- trunk/tools/bcp/add_dependent_lib.cpp	Thu Oct 31 04:54:12 2013	(r86529)
+++ trunk/tools/bcp/add_dependent_lib.cpp	2013-10-31 13:34:35 EDT (Thu, 31 Oct 2013)	(r86530)
@@ -81,7 +81,7 @@
                "\\("
                   "[^\\(\\);{}]*"          // argument list
                "\\)"
-               "\\s*"
+               "\\s*(?:BOOST[_A-Z]+\\s*)?"
                "\\{"                       // start of definition
             "|"
                "(\\<\\w+\\>)"              // Maybe class name
@@ -93,7 +93,7 @@
                "\\("
                   "[^\\(\\);{}]*"          // argument list
                "\\)"
-               "\\s*"
+               "\\s*(?:BOOST[_A-Z]+\\s*)?"
                "\\{"                       // start of definition
             ")"                            // end branch reset
             );
@@ -135,7 +135,7 @@
          "\\<(?!return)\\w+\\>[^:;{}#=<>!~%.\\w]*(";
          // List of function names goes here...
       const char* e3 = 
-         ")\\s*\\([^;()]*\\)\\s*;)";
+         ")\\s*\\([^;()]*\\)\\s*(?:BOOST[_A-Z]+\\s*)?;)";
 
       std::string class_name_list;
       std::set<std::string>::const_iterator i = class_names[libname].begin(), j = class_names[libname].end();