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

2 files changed, 4 insertions, 4 deletions

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index a4cc6eb..ecdfb48 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -240,7 +240,7 @@ void cmSystemTools::ReportLastSystemError(const char* msg)
 {
   std::string m = msg;
   m += ": System Error: ";
-  m += SystemTools::GetLastSystemError();
+  m += Superclass::GetLastSystemError();
   cmSystemTools::Error(m.c_str());
 }
 
@@ -602,7 +602,7 @@ bool cmSystemTools::DoesFileExistWithExtensions(
 
 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,
@@ -870,7 +870,7 @@ cmSystemTools::FileFormat cmSystemTools::GetFileFormat(const char* cext)
 bool cmSystemTools::Split(const char* s, std::vector<cmStdString>& l)
 {
   std::vector<std::string> temp;
-  if(!SystemTools::Split(s, temp))
+  if(!Superclass::Split(s, temp))
     {
     return false;
     }
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index ee5f704..a25b9d9 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -30,7 +30,7 @@
 class cmSystemTools: public cmsys::SystemTools
 {
 public:
-  typedef cmsys::SystemTools SystemTools;
+  typedef cmsys::SystemTools Superclass;
   
   /** Expand out any arguements in the vector that have ; separated
    *  strings into multiple arguements.  A new vector is created