[Cmake-commits] [cmake-commits] king committed cmSystemTools.cxx 1.393 1.394

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv15672/Source

Modified Files:
	cmSystemTools.cxx 
Log Message:
COMP: Fix calls to superclass methods for Borland

The superclass of cmSystemTools is cmsys::SystemTools, which should be
referencable by just SystemTools from inside the class.  Borland C++
does not seem to support this, so we use cmSystemTools instead.


Index: cmSystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSystemTools.cxx,v
retrieving revision 1.393
retrieving revision 1.394
diff -C 2 -d -r1.393 -r1.394
*** cmSystemTools.cxx	21 Apr 2009 15:37:09 -0000	1.393
--- cmSystemTools.cxx	22 Apr 2009 13:11:06 -0000	1.394
***************
*** 1102,1113 ****
  {
    std::string file = fname;
!   SystemTools::ConvertToUnixSlashes(file);
    std::string dir = directory;
!   SystemTools::ConvertToUnixSlashes(dir);
    std::string prevDir;
    while(dir != prevDir)
      {
      std::string path = dir + "/" + file;
!     if ( SystemTools::FileExists(path.c_str()) )
        {
        return path;
--- 1102,1113 ----
  {
    std::string file = fname;
!   cmSystemTools::ConvertToUnixSlashes(file);
    std::string dir = directory;
!   cmSystemTools::ConvertToUnixSlashes(dir);
    std::string prevDir;
    while(dir != prevDir)
      {
      std::string path = dir + "/" + file;
!     if ( cmSystemTools::FileExists(path.c_str()) )
        {
        return path;
***************
*** 1118,1122 ****
        }
      prevDir = dir;
!     dir = SystemTools::GetParentDirectory(dir.c_str());
      }
    return "";
--- 1118,1122 ----
        }
      prevDir = dir;
!     dir = cmSystemTools::GetParentDirectory(dir.c_str());
      }
    return "";