Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-19 20:22:58 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-20 13:49:33 (GMT) |
| commit | 6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch) | |
| tree | 2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Boost/src/tools/bcp/add_dependent_lib.cpp | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.tar.bz2 | |
Update Boost in 3rdParty to version 1.56.0.
This updates Boost in our 3rdParty directory to version 1.56.0.
Updated our update.sh script to stop on error.
Changed error reporting in SwiftTools/CrashReporter.cpp to SWIFT_LOG due to
missing include of <iostream> with newer Boost.
Change-Id: I4b35c77de951333979a524097f35f5f83d325edc
Diffstat (limited to '3rdParty/Boost/src/tools/bcp/add_dependent_lib.cpp')
| -rw-r--r-- | 3rdParty/Boost/src/tools/bcp/add_dependent_lib.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/3rdParty/Boost/src/tools/bcp/add_dependent_lib.cpp b/3rdParty/Boost/src/tools/bcp/add_dependent_lib.cpp index bb1818a..41cc597 100644 --- a/3rdParty/Boost/src/tools/bcp/add_dependent_lib.cpp +++ b/3rdParty/Boost/src/tools/bcp/add_dependent_lib.cpp @@ -81,7 +81,7 @@ static void init_library_scanner(const fs::path& p, bool cvs_mode, const std::st "\\(" "[^\\(\\);{}]*" // argument list "\\)" - "\\s*" + "\\s*(?:BOOST[_A-Z]+\\s*)?" "\\{" // start of definition "|" "(\\<\\w+\\>)" // Maybe class name @@ -93,7 +93,7 @@ static void init_library_scanner(const fs::path& p, bool cvs_mode, const std::st "\\(" "[^\\(\\);{}]*" // argument list "\\)" - "\\s*" + "\\s*(?:BOOST[_A-Z]+\\s*)?" "\\{" // start of definition ")" // end branch reset ); @@ -135,7 +135,7 @@ static void init_library_scanner(const fs::path& p, bool cvs_mode, const std::st "\\<(?!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(); |