summaryrefslogtreecommitdiffstats
path: root/Source/kwsys
diff options
context:
space:
mode:
Diffstat (limited to 'Source/kwsys')
-rw-r--r--Source/kwsys/SystemTools.cxx12
-rw-r--r--Source/kwsys/SystemTools.hxx.in2
2 files changed, 7 insertions, 7 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx
index c871f54..658f580 100644
--- a/Source/kwsys/SystemTools.cxx
+++ b/Source/kwsys/SystemTools.cxx
@@ -2010,15 +2010,15 @@ bool SystemTools::SetPermissions(const char* file, mode_t mode)
return true;
}
-std::string SystemTools::GetParentDirectory(const char* fileOrDir)
+kwsys_stl::string SystemTools::GetParentDirectory(const char* fileOrDir)
{
if ( !fileOrDir || !*fileOrDir )
{
return "";
}
- std::string res = fileOrDir;
+ kwsys_stl::string res = fileOrDir;
SystemTools::ConvertToUnixSlashes(res);
- std::string::size_type cc = res.size()-1;
+ kwsys_stl::string::size_type cc = res.size()-1;
if ( res[cc] == '/' )
{
cc --;
@@ -2035,10 +2035,10 @@ std::string SystemTools::GetParentDirectory(const char* fileOrDir)
bool SystemTools::IsSubDirectory(const char* cSubdir, const char* cDir)
{
- std::string subdir = cSubdir;
- std::string dir = cDir;
+ kwsys_stl::string subdir = cSubdir;
+ kwsys_stl::string dir = cDir;
SystemTools::ConvertToUnixSlashes(dir);
- std::string path = subdir;
+ kwsys_stl::string path = subdir;
do
{
path = SystemTools::GetParentDirectory(path.c_str());
diff --git a/Source/kwsys/SystemTools.hxx.in b/Source/kwsys/SystemTools.hxx.in
index 89e32a3..e951206 100644
--- a/Source/kwsys/SystemTools.hxx.in
+++ b/Source/kwsys/SystemTools.hxx.in
@@ -317,7 +317,7 @@ public:
static bool SetPermissions(const char* file, mode_t mode);
/** Get the parent directory of the directory or file */
- static std::string GetParentDirectory(const char* fileOrDir);
+ static kwsys_stl::string GetParentDirectory(const char* fileOrDir);
/** Check if the given file or directory is in subdirectory of dir */
static bool IsSubDirectory(const char* fileOrDir, const char* dir);