From 5049505da393e927bf18b97e2deca280af1470e5 Mon Sep 17 00:00:00 2001 From: Ole Christian Eidheim Date: Tue, 13 Oct 2015 12:45:58 +0200 Subject: [PATCH] Minor fix to smatch use in cmake.cc --- src/cmake.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cmake.cc b/src/cmake.cc index d112a26..76b4aa0 100644 --- a/src/cmake.cc +++ b/src/cmake.cc @@ -142,11 +142,11 @@ void CMake::find_variables() { const std::regex set_regex("^ *set *\\( *([A-Za-z_][A-Za-z_0-9]*) +(.*)\\) *$"); std::smatch sm; if(std::regex_match(line, sm, set_regex)) { - std::string data=sm[2]; + auto data=sm[2].str(); while(data.size()>0 && data.back()==' ') data.pop_back(); parse_variable_parameters(data); - variables[sm[1]]=data; + variables[sm[1].str()]=data; } } pos=end_line+1; @@ -264,7 +264,7 @@ std::vector > > CMak const std::regex function_regex("^ *"+name+" *\\( *(.*)\\) *$"); std::smatch sm; if(std::regex_match(line, sm, function_regex)) { - std::string data=sm[1]; + auto data=sm[1].str(); while(data.size()>0 && data.back()==' ') data.pop_back(); auto parameters=get_function_parameters(data);