summaryrefslogtreecommitdiffstats
path: root/Source/cmFileCommand.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2006-08-27 17:15:39 (GMT)
committerBrad King <brad.king@kitware.com>2006-08-27 17:15:39 (GMT)
commit2b602ea738f4ed99b67085f3f035f8eb2f43de88 (patch)
tree2c93b6d381a260f7bf51fe926f134abb6d703e4e /Source/cmFileCommand.cxx
parent703c0e32c8bf9cc2de9a02c51d94e3c19fc6f91e (diff)
downloadCMake-2b602ea738f4ed99b67085f3f035f8eb2f43de88.zip
CMake-2b602ea738f4ed99b67085f3f035f8eb2f43de88.tar.gz
CMake-2b602ea738f4ed99b67085f3f035f8eb2f43de88.tar.bz2
COMP: Need to use cmsys_stl when in CMake code, not kwsys_stl.
Diffstat (limited to 'Source/cmFileCommand.cxx')
-rw-r--r--Source/cmFileCommand.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 72cd89c..1b4ad55 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -575,12 +575,12 @@ bool cmFileInstaller::InstallDirectory(const char* source,
if(!(strcmp(dir.GetFile(fileNum), ".") == 0 ||
strcmp(dir.GetFile(fileNum), "..") == 0))
{
- kwsys_stl::string fromPath = source;
+ cmsys_stl::string fromPath = source;
fromPath += "/";
fromPath += dir.GetFile(fileNum);
if(cmSystemTools::FileIsDirectory(fromPath.c_str()))
{
- kwsys_stl::string toDir = destination;
+ cmsys_stl::string toDir = destination;
toDir += "/";
toDir += dir.GetFile(fileNum);
if(!this->InstallDirectory(fromPath.c_str(), toDir.c_str(), always))
@@ -1336,7 +1336,7 @@ void cmFileCommand::ComputeVersionedName(std::string& name,
{
#if defined(__APPLE__)
std::string ext;
- kwsys_stl::string::size_type dot_pos = name.rfind(".");
+ cmsys_stl::string::size_type dot_pos = name.rfind(".");
if(dot_pos != name.npos)
{
ext = name.substr(dot_pos, name.npos);