summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKWSys Robot <kwrobot@kitware.com>2013-06-03 15:12:00 (GMT)
committerBrad King <brad.king@kitware.com>2013-06-04 13:08:54 (GMT)
commit6dc3dd91a62cdc52ec8bd2e938b621d7c5e6fb2b (patch)
tree42c46916b3a667a69d490ec558f56cf1515e4383
parentd66f6f36baca6d314f1f17e11d90d52b5c9d7ec2 (diff)
downloadCMake-6dc3dd91a62cdc52ec8bd2e938b621d7c5e6fb2b.zip
CMake-6dc3dd91a62cdc52ec8bd2e938b621d7c5e6fb2b.tar.gz
CMake-6dc3dd91a62cdc52ec8bd2e938b621d7c5e6fb2b.tar.bz2
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
-rw-r--r--SystemTools.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 652649f..7891708 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());
}