kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ERR: Replaced std::string with kwsys_stl::string for portability.

Browse Source
This commit is contained in:
Brad King 2004-10-11 08:02:51 -04:00
parent b221d046a6
commit bc6ae0649b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/kwsys/SystemTools.cxx
View File

@ -2010,15 +2010,15 @@ bool SystemTools::SetPermissions(const char* file, mode_t mode)
return true; return true;
} }
std::string SystemTools::GetParentDirectory(const char* fileOrDir) kwsys_stl::string SystemTools::GetParentDirectory(const char* fileOrDir)
{ {
if ( !fileOrDir || !*fileOrDir ) if ( !fileOrDir || !*fileOrDir )
{ {
return ""; return "";
} }
std::string res = fileOrDir; kwsys_stl::string res = fileOrDir;
SystemTools::ConvertToUnixSlashes(res); SystemTools::ConvertToUnixSlashes(res);
std::string::size_type cc = res.size()-1; kwsys_stl::string::size_type cc = res.size()-1;
if ( res[cc] == '/' ) if ( res[cc] == '/' )
{ {
cc --; cc --;
@ -2035,10 +2035,10 @@ std::string SystemTools::GetParentDirectory(const char* fileOrDir)
bool SystemTools::IsSubDirectory(const char* cSubdir, const char* cDir) bool SystemTools::IsSubDirectory(const char* cSubdir, const char* cDir)
{ {
std::string subdir = cSubdir; kwsys_stl::string subdir = cSubdir;
std::string dir = cDir; kwsys_stl::string dir = cDir;
SystemTools::ConvertToUnixSlashes(dir); SystemTools::ConvertToUnixSlashes(dir);
std::string path = subdir; kwsys_stl::string path = subdir;
do do
{ {
path = SystemTools::GetParentDirectory(path.c_str()); path = SystemTools::GetParentDirectory(path.c_str());

2
Source/kwsys/SystemTools.hxx.in
View File

@ -317,7 +317,7 @@ public:
static bool SetPermissions(const char* file, mode_t mode); static bool SetPermissions(const char* file, mode_t mode);
/** Get the parent directory of the directory or file */ /** 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 */ /** Check if the given file or directory is in subdirectory of dir */
static bool IsSubDirectory(const char* fileOrDir, const char* dir); static bool IsSubDirectory(const char* fileOrDir, const char* dir);