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

ERR: Removed use of std::string != operator due to bug in SGI compiler's library.

This commit is contained in:
Brad King 2003-05-13 09:50:43 -04:00
parent 10c9e5b991
commit 128e63aaf7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/kwsys/SystemTools.cxx
View File

@ -1314,7 +1314,7 @@ bool SystemTools::SplitProgramPath(const char* in_name,
dir = ""; dir = "";
} }
} }
if((dir != "") && !SystemTools::FileIsDirectory(dir.c_str())) if(!(dir == "") && !SystemTools::FileIsDirectory(dir.c_str()))
{ {
kwsys_std::string oldDir = in_name; kwsys_std::string oldDir = in_name;
SystemTools::ConvertToUnixSlashes(oldDir); SystemTools::ConvertToUnixSlashes(oldDir);
@ -1346,7 +1346,7 @@ kwsys_std::string SystemTools::CollapseFullPath(const char* in_relative,
#ifdef _WIN32 #ifdef _WIN32
// Follow relative path. // Follow relative path.
if(dir != "") if(!(dir == ""))
{ {
Chdir(dir.c_str()); Chdir(dir.c_str());
} }
@ -1369,7 +1369,7 @@ kwsys_std::string SystemTools::CollapseFullPath(const char* in_relative,
// Resolve relative path. // Resolve relative path.
kwsys_std::string newDir; kwsys_std::string newDir;
if(dir != "") if(!(dir == ""))
{ {
realpath(dir.c_str(), resolved_name); realpath(dir.c_str(), resolved_name);
newDir = resolved_name; newDir = resolved_name;
@ -1385,7 +1385,7 @@ kwsys_std::string SystemTools::CollapseFullPath(const char* in_relative,
// Construct and return the full path. // Construct and return the full path.
kwsys_std::string newPath = newDir; kwsys_std::string newPath = newDir;
if(file != "") if(!(file == ""))
{ {
newPath += "/"; newPath += "/";
newPath += file; newPath += file;
@ -1595,8 +1595,8 @@ void SystemTools::GlobDirs(const char *fullPath,
{ {
for (unsigned int i = 0; i < d.GetNumberOfFiles(); ++i) for (unsigned int i = 0; i < d.GetNumberOfFiles(); ++i)
{ {
if((kwsys_std::string(d.GetFile(i)) != ".") if(!(kwsys_std::string(d.GetFile(i)) == ".")
&& (kwsys_std::string(d.GetFile(i)) != "..")) && !(kwsys_std::string(d.GetFile(i)) == ".."))
{ {
kwsys_std::string fname = startPath; kwsys_std::string fname = startPath;
fname +="/"; fname +="/";
@ -1675,8 +1675,8 @@ bool SystemTools::SimpleGlob(const kwsys_std::string& glob,
{ {
for (unsigned int i = 0; i < d.GetNumberOfFiles(); ++i) for (unsigned int i = 0; i < d.GetNumberOfFiles(); ++i)
{ {
if((kwsys_std::string(d.GetFile(i)) != ".") if(!(kwsys_std::string(d.GetFile(i)) == ".")
&& (kwsys_std::string(d.GetFile(i)) != "..")) && !(kwsys_std::string(d.GetFile(i)) == ".."))
{ {
kwsys_std::string fname = path; kwsys_std::string fname = path;
if ( path[path.size()-1] != '/' ) if ( path[path.size()-1] != '/' )