diff options
| author | Brad King <brad.king@kitware.com> | 2003-05-13 13:50:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2003-05-13 13:50:43 (GMT) |
| commit | 128e63aaf7a5166ab79a59b808be238b3e865f13 (patch) | |
| tree | 39e3505679674c63141c7319452742b194c2156c /Source/kwsys | |
| parent | 10c9e5b991cb2bec71c8a680375ffd8f207febff (diff) | |
| download | CMake-128e63aaf7a5166ab79a59b808be238b3e865f13.zip CMake-128e63aaf7a5166ab79a59b808be238b3e865f13.tar.gz CMake-128e63aaf7a5166ab79a59b808be238b3e865f13.tar.bz2 | |
ERR: Removed use of std::string != operator due to bug in SGI compiler's library.
Diffstat (limited to 'Source/kwsys')
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 8204f67..3e281c0 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -1314,7 +1314,7 @@ bool SystemTools::SplitProgramPath(const char* in_name, dir = ""; } } - if((dir != "") && !SystemTools::FileIsDirectory(dir.c_str())) + if(!(dir == "") && !SystemTools::FileIsDirectory(dir.c_str())) { kwsys_std::string oldDir = in_name; SystemTools::ConvertToUnixSlashes(oldDir); @@ -1346,7 +1346,7 @@ kwsys_std::string SystemTools::CollapseFullPath(const char* in_relative, #ifdef _WIN32 // Follow relative path. - if(dir != "") + if(!(dir == "")) { Chdir(dir.c_str()); } @@ -1369,7 +1369,7 @@ kwsys_std::string SystemTools::CollapseFullPath(const char* in_relative, // Resolve relative path. kwsys_std::string newDir; - if(dir != "") + if(!(dir == "")) { realpath(dir.c_str(), resolved_name); newDir = resolved_name; @@ -1385,7 +1385,7 @@ kwsys_std::string SystemTools::CollapseFullPath(const char* in_relative, // Construct and return the full path. kwsys_std::string newPath = newDir; - if(file != "") + if(!(file == "")) { newPath += "/"; newPath += file; @@ -1595,8 +1595,8 @@ void SystemTools::GlobDirs(const char *fullPath, { for (unsigned int i = 0; i < d.GetNumberOfFiles(); ++i) { - if((kwsys_std::string(d.GetFile(i)) != ".") - && (kwsys_std::string(d.GetFile(i)) != "..")) + if(!(kwsys_std::string(d.GetFile(i)) == ".") + && !(kwsys_std::string(d.GetFile(i)) == "..")) { kwsys_std::string fname = startPath; fname +="/"; @@ -1675,8 +1675,8 @@ bool SystemTools::SimpleGlob(const kwsys_std::string& glob, { for (unsigned int i = 0; i < d.GetNumberOfFiles(); ++i) { - if((kwsys_std::string(d.GetFile(i)) != ".") - && (kwsys_std::string(d.GetFile(i)) != "..")) + if(!(kwsys_std::string(d.GetFile(i)) == ".") + && !(kwsys_std::string(d.GetFile(i)) == "..")) { kwsys_std::string fname = path; if ( path[path.size()-1] != '/' ) |