From 6dc3dd91a62cdc52ec8bd2e938b621d7c5e6fb2b Mon Sep 17 00:00:00 2001 From: KWSys Robot Date: Mon, 3 Jun 2013 11:12:00 -0400 Subject: [PATCH] KWSys 2013-06-03 (d79a792e) Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ d79a792e | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' dccf7725..d79a792e Brad King (1): d79a792e SystemTools: Fix CollapseFullPath to not erase root component Change-Id: I25c6600a621a960738b5afc0ba73f63df0693303 --- SystemTools.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SystemTools.cxx b/SystemTools.cxx index 652649f4a..789170865 100644 --- a/SystemTools.cxx +++ b/SystemTools.cxx @@ -3085,7 +3085,7 @@ SystemToolsAppendComponents( { if(*i == "..") { - if(out_components.begin() != out_components.end()) + if(out_components.size() > 1) { out_components.erase(out_components.end()-1, out_components.end()); }