# HG changeset patch # User Sebastien Jodogne # Date 1541760916 -3600 # Node ID 0bcf46cea4e459849a0fd19f48b15c9865e90715 # Parent a80ba85d89e6cb6767b1c8716eaa9b1f485953ce fix for older versions of boost::regex diff -r a80ba85d89e6 -r 0bcf46cea4e4 Core/Toolbox.cpp --- a/Core/Toolbox.cpp Fri Nov 09 09:46:21 2018 +0100 +++ b/Core/Toolbox.cpp Fri Nov 09 11:55:16 2018 +0100 @@ -1573,10 +1573,10 @@ std::string Toolbox::SubstituteVariables(const std::string& source, const std::map& dictionary) { - const boost::regex pattern("\\${([^:]*?)}|" // ${what[1]} - "\\${([^:]*?):-([^'\"]*?)}|" // ${what[2]:-what[3]} - "\\${([^:]*?):-\"([^\"]*?)\"}|" // ${what[4]:-"what[5]"} - "\\${([^:]*?):-'([^']*?)'}"); // ${what[6]:-'what[7]'} + const boost::regex pattern("\\$\\{([^:]*?)\\}|" // ${what[1]} + "\\$\\{([^:]*?):-([^'\"]*?)\\}|" // ${what[2]:-what[3]} + "\\$\\{([^:]*?):-\"([^\"]*?)\"\\}|" // ${what[4]:-"what[5]"} + "\\$\\{([^:]*?):-'([^']*?)'\\}"); // ${what[6]:-'what[7]'} VariableFormatter formatter(dictionary);