ruby: Removed System name clash by renaming ruby's System to RubySystem

6 files changed, 9 insertions, 9 deletions

diff --git a/src/mem/ruby/tester/DeterministicDriver.cc b/src/mem/ruby/tester/DeterministicDriver.cc
index dd0507201..d5277f59a 100644
--- a/src/mem/ruby/tester/DeterministicDriver.cc
+++ b/src/mem/ruby/tester/DeterministicDriver.cc
@@ -43,7 +43,7 @@
 #include "SubBlock.hh"
 #include "Chip.hh"
 
-DeterministicDriver::DeterministicDriver(System* sys_ptr)
+DeterministicDriver::DeterministicDriver(RubySystem* sys_ptr)
 {
   if (g_SIMICS) {
     ERROR_MSG("g_SIMICS should not be defined.");
diff --git a/src/mem/ruby/tester/DeterministicDriver.hh b/src/mem/ruby/tester/DeterministicDriver.hh
index 3d0bae73d..d501a2fce 100644
--- a/src/mem/ruby/tester/DeterministicDriver.hh
+++ b/src/mem/ruby/tester/DeterministicDriver.hh
@@ -42,13 +42,13 @@
 #include "Histogram.hh"
 #include "CacheRequestType.hh"
 
-class System;
+class RubySystem;
 class SpecifiedGenerator;
 
 class DeterministicDriver : public Driver, public Consumer {
 public:
   // Constructors
-  DeterministicDriver(System* sys_ptr);
+  DeterministicDriver(RubySystem* sys_ptr);
 
   // Destructor
   ~DeterministicDriver();
diff --git a/src/mem/ruby/tester/SyntheticDriver.cc b/src/mem/ruby/tester/SyntheticDriver.cc
index d2028ba07..2f386d650 100644
--- a/src/mem/ruby/tester/SyntheticDriver.cc
+++ b/src/mem/ruby/tester/SyntheticDriver.cc
@@ -44,7 +44,7 @@
 #include "SubBlock.hh"
 #include "Chip.hh"
 
-SyntheticDriver::SyntheticDriver(System* sys_ptr)
+SyntheticDriver::SyntheticDriver(RubySystem* sys_ptr)
 {
   cout << "SyntheticDriver::SyntheticDriver" << endl;
   if (g_SIMICS) {
diff --git a/src/mem/ruby/tester/SyntheticDriver.hh b/src/mem/ruby/tester/SyntheticDriver.hh
index 278891ba2..20f929d87 100644
--- a/src/mem/ruby/tester/SyntheticDriver.hh
+++ b/src/mem/ruby/tester/SyntheticDriver.hh
@@ -42,13 +42,13 @@
 #include "Histogram.hh"
 #include "CacheRequestType.hh"
 
-class System;
+class RubySystem;
 class RequestGenerator;
 
 class SyntheticDriver : public Driver, public Consumer {
 public:
   // Constructors
-  SyntheticDriver(System* sys_ptr);
+  SyntheticDriver(RubySystem* sys_ptr);
 
   // Destructor
   ~SyntheticDriver();
diff --git a/src/mem/ruby/tester/Tester.cc b/src/mem/ruby/tester/Tester.cc
index 0e6f12cdc..9dcec1ed1 100644
--- a/src/mem/ruby/tester/Tester.cc
+++ b/src/mem/ruby/tester/Tester.cc
@@ -40,7 +40,7 @@
 #include "Check.hh"
 #include "Chip.hh"
 
-Tester::Tester(System* sys_ptr)
+Tester::Tester(RubySystem* sys_ptr)
 {
   if (g_SIMICS) {
     ERROR_MSG("g_SIMICS should not be defined.");
diff --git a/src/mem/ruby/tester/Tester.hh b/src/mem/ruby/tester/Tester.hh
index 35563a3b4..76fe0684a 100644
--- a/src/mem/ruby/tester/Tester.hh
+++ b/src/mem/ruby/tester/Tester.hh
@@ -42,12 +42,12 @@
 #include "CheckTable.hh"
 #include "CacheRequestType.hh"
 
-class System;
+class RubySystem;
 
 class Tester : public Driver, public Consumer {
 public:
   // Constructors
-  Tester(System* sys_ptr);
+  Tester(RubySystem* sys_ptr);
 
   // Destructor
   ~Tester();