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

ERR: Renamed superclass typedef from SystemTools to Superclass to avoid conflict across platforms.

This commit is contained in:
Brad King 2003-06-24 10:16:28 -04:00
parent 51eb9596bc
commit 45e508f530
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmSystemTools.cxx
View File

@ -240,7 +240,7 @@ void cmSystemTools::ReportLastSystemError(const char* msg)
{ {
std::string m = msg; std::string m = msg;
m += ": System Error: "; m += ": System Error: ";
m += SystemTools::GetLastSystemError(); m += Superclass::GetLastSystemError();
cmSystemTools::Error(m.c_str()); cmSystemTools::Error(m.c_str());
} }
@ -602,7 +602,7 @@ bool cmSystemTools::DoesFileExistWithExtensions(
bool cmSystemTools::cmCopyFile(const char* source, const char* destination) bool cmSystemTools::cmCopyFile(const char* source, const char* destination)
{ {
return SystemTools::CopyFileAlways(source, destination); return Superclass::CopyFileAlways(source, destination);
} }
void cmSystemTools::Glob(const char *directory, const char *regexp, void cmSystemTools::Glob(const char *directory, const char *regexp,
@ -870,7 +870,7 @@ cmSystemTools::FileFormat cmSystemTools::GetFileFormat(const char* cext)
bool cmSystemTools::Split(const char* s, std::vector<cmStdString>& l) bool cmSystemTools::Split(const char* s, std::vector<cmStdString>& l)
{ {
std::vector<std::string> temp; std::vector<std::string> temp;
if(!SystemTools::Split(s, temp)) if(!Superclass::Split(s, temp))
{ {
return false; return false;
} }

2
Source/cmSystemTools.h
View File

@ -30,7 +30,7 @@
class cmSystemTools: public cmsys::SystemTools class cmSystemTools: public cmsys::SystemTools
{ {
public: public:
typedef cmsys::SystemTools SystemTools; typedef cmsys::SystemTools Superclass;
/** Expand out any arguements in the vector that have ; separated /** Expand out any arguements in the vector that have ; separated
* strings into multiple arguements. A new vector is created * strings into multiple arguements. A new vector is created