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

2 files changed, 19 insertions, 19 deletions

diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc
index 6352d8a58..74d4ef90f 100644
--- a/src/mem/ruby/system/System.cc
+++ b/src/mem/ruby/system/System.cc
@@ -28,9 +28,9 @@
  */
 
 /*
- * System.C
+ * RubySystem.C
  *
- * Description: See System.h
+ * Description: See RubySystem.h
  *
  * $Id$
  *
@@ -52,7 +52,7 @@
 //#include "XactVisualizer.hh"
 #include "M5Driver.hh"
 
-System::System()
+RubySystem::RubySystem()
 {
   DEBUG_MSG(SYSTEM_COMP, MedPrio,"initializing");
 
@@ -129,7 +129,7 @@ System::System()
 
 }
 
-System::~System()
+RubySystem::~RubySystem()
 {
   for (int i = 0; i < m_chip_vector.size(); i++) {
     delete m_chip_vector[i];
@@ -142,19 +142,19 @@ System::~System()
  */
 }
 
-void System::printConfig(ostream& out) const
+void RubySystem::printConfig(ostream& out) const
 {
-  out << "\n================ Begin System Configuration Print ================\n\n";
+  out << "\n================ Begin RubySystem Configuration Print ================\n\n";
   RubyConfig::printConfiguration(out);
   out << endl;
   getChip(0)->printConfig(out);
   m_network_ptr->printConfig(out);
   m_driver_ptr->printConfig(out);
   m_profiler_ptr->printConfig(out);
-  out << "\n================ End System Configuration Print ================\n\n";
+  out << "\n================ End RubySystem Configuration Print ================\n\n";
 }
 
-void System::printStats(ostream& out)
+void RubySystem::printStats(ostream& out)
 {
   const time_t T = time(NULL);
   tm *localTime = localtime(&T);
@@ -174,7 +174,7 @@ void System::printStats(ostream& out)
   Chip::printStats(out);
 }
 
-void System::clearStats() const
+void RubySystem::clearStats() const
 {
   m_profiler_ptr->clearStats();
   m_network_ptr->clearStats();
@@ -187,7 +187,7 @@ void System::clearStats() const
   }
 }
 
-void System::recordCacheContents(CacheRecorder& tr) const
+void RubySystem::recordCacheContents(CacheRecorder& tr) const
 {
   for (int i = 0; i < m_chip_vector.size(); i++) {
     for (int m_version = 0; m_version < RubyConfig::numberOfProcsPerChip(); m_version++) {
@@ -220,7 +220,7 @@ void System::opalLoadNotify()
 // in setState.  The SLICC spec must also define methods "isBlockShared"
 // and "isBlockExclusive" that are specific to that protocol
 //
-void System::checkGlobalCoherenceInvariant(const Address& addr  )  {
+void RubySystem::checkGlobalCoherenceInvariant(const Address& addr  )  {
 
   NodeID exclusive = -1;
   bool sharedDetected = false;
diff --git a/src/mem/ruby/system/System.hh b/src/mem/ruby/system/System.hh
index 350f74468..b4aa257a3 100644
--- a/src/mem/ruby/system/System.hh
+++ b/src/mem/ruby/system/System.hh
@@ -28,7 +28,7 @@
  */
 
 /*
- * System.h
+ * RubySystem.h
  *
  * Description: Contains all of the various parts of the system we are
  * simulating.  Performs allocation, deallocation, and setup of all
@@ -59,13 +59,13 @@ class XactCommitArbiter;
 class XactVisualizer;
 class TransactionInterfaceManager;
 
-class System {
+class RubySystem {
 public:
   // Constructors
-  System();
+  RubySystem();
 
   // Destructor
-  ~System();
+  ~RubySystem();
 
   // Public Methods
   int getNumProcessors() { return RubyConfig::numberOfProcessors(); }
@@ -103,8 +103,8 @@ private:
   // Private Methods
 
   // Private copy constructor and assignment operator
-  System(const System& obj);
-  System& operator=(const System& obj);
+  RubySystem(const RubySystem& obj);
+  RubySystem& operator=(const RubySystem& obj);
 
   // Data Members (m_ prefix)
   Network* m_network_ptr;
@@ -118,13 +118,13 @@ private:
 };
 
 // Output operator declaration
-ostream& operator<<(ostream& out, const System& obj);
+ostream& operator<<(ostream& out, const RubySystem& obj);
 
 // ******************* Definitions *******************
 
 // Output operator definition
 inline
-ostream& operator<<(ostream& out, const System& obj)
+ostream& operator<<(ostream& out, const RubySystem& obj)
 {
 //  obj.print(out);
   out << flush;