diff options
author | Daniel Sanchez <sanchezd@stanford.edu> | 2009-05-11 10:38:44 -0700 |
---|---|---|
committer | Daniel Sanchez <sanchezd@stanford.edu> | 2009-05-11 10:38:44 -0700 |
commit | ab5e4a22b3893fb0ccdfbf466d46983caeb5948e (patch) | |
tree | 58681979392d2f395da7c284c2f42113939396ee /src/mem/ruby/system/System.hh | |
parent | 84a18e7fdc6106a04188254f940a0e987efe750c (diff) | |
download | gem5-ab5e4a22b3893fb0ccdfbf466d46983caeb5948e.tar.xz |
ruby: Removed System name clash by renaming ruby's System to RubySystem
Diffstat (limited to 'src/mem/ruby/system/System.hh')
-rw-r--r-- | src/mem/ruby/system/System.hh | 16 |
1 files changed, 8 insertions, 8 deletions
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; |