From efe07c4e0a76868657d617a47cc03797e0a3a93e Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 22 Apr 2009 09:11:06 -0400 Subject: 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. --- Source/cmSystemTools.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 23da1e3..959d32c 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -1101,14 +1101,14 @@ std::string cmSystemTools::FileExistsInParentDirectories(const char* fname, const char* directory, const char* toplevel) { std::string file = fname; - SystemTools::ConvertToUnixSlashes(file); + cmSystemTools::ConvertToUnixSlashes(file); std::string dir = directory; - SystemTools::ConvertToUnixSlashes(dir); + cmSystemTools::ConvertToUnixSlashes(dir); std::string prevDir; while(dir != prevDir) { std::string path = dir + "/" + file; - if ( SystemTools::FileExists(path.c_str()) ) + if ( cmSystemTools::FileExists(path.c_str()) ) { return path; } @@ -1117,7 +1117,7 @@ std::string cmSystemTools::FileExistsInParentDirectories(const char* fname, break; } prevDir = dir; - dir = SystemTools::GetParentDirectory(dir.c_str()); + dir = cmSystemTools::GetParentDirectory(dir.c_str()); } return ""; } -- cgit v0.12