Commit 6074f33f authored by Ben Boeckel's avatar Ben Boeckel Committed by Ben Boeckel
Browse files

SystemTools: Use static strings in SystemToolsAppendComponents

Change-Id: I51d3522ff01c360542c5f3c25bec9ce56307b809
parent 3254681a
...@@ -3130,17 +3130,19 @@ SystemToolsAppendComponents( ...@@ -3130,17 +3130,19 @@ SystemToolsAppendComponents(
kwsys_stl::vector<kwsys_stl::string>::const_iterator first, kwsys_stl::vector<kwsys_stl::string>::const_iterator first,
kwsys_stl::vector<kwsys_stl::string>::const_iterator last) kwsys_stl::vector<kwsys_stl::string>::const_iterator last)
{ {
static const kwsys_stl::string up = "..";
static const kwsys_stl::string cur = ".";
for(kwsys_stl::vector<kwsys_stl::string>::const_iterator i = first; for(kwsys_stl::vector<kwsys_stl::string>::const_iterator i = first;
i != last; ++i) i != last; ++i)
{ {
if(*i == "..") if(*i == up)
{ {
if(out_components.size() > 1) if(out_components.size() > 1)
{ {
out_components.erase(out_components.end()-1, out_components.end()); out_components.resize(out_components.size()-1);
} }
} }
else if(!(*i == ".") && !(*i == "")) else if(!i->empty() && *i != cur)
{ {
out_components.push_back(*i); out_components.push_back(*i);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment