diff options
author | Brad King <brad.king@kitware.com> | 2013-06-04 13:08:58 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2013-06-04 13:08:58 (GMT) |
commit | c91e88d0e15f38616284f12fc0f2152ac6c0562c (patch) | |
tree | 250660554caf85ff5acb5ca95e13c6c4a71400ab /Source/kwsys | |
parent | 9d38db531d4bbba4eca48dc1ec4e724e98614201 (diff) | |
parent | 6dc3dd91a62cdc52ec8bd2e938b621d7c5e6fb2b (diff) | |
download | CMake-c91e88d0e15f38616284f12fc0f2152ac6c0562c.zip CMake-c91e88d0e15f38616284f12fc0f2152ac6c0562c.tar.gz CMake-c91e88d0e15f38616284f12fc0f2152ac6c0562c.tar.bz2 |
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys')
-rw-r--r-- | Source/kwsys/SystemTools.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 652649f..7891708 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/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()); } |