From ab5e4a22b3893fb0ccdfbf466d46983caeb5948e Mon Sep 17 00:00:00 2001
From: Daniel Sanchez <sanchezd@stanford.edu>
Date: Mon, 11 May 2009 10:38:44 -0700
Subject: ruby: Removed System name clash by renaming ruby's System to
 RubySystem

---
 src/mem/ruby/common/Driver.hh | 2 +-
 src/mem/ruby/common/Global.cc | 2 +-
 src/mem/ruby/common/Global.hh | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mem/ruby/common')

diff --git a/src/mem/ruby/common/Driver.hh b/src/mem/ruby/common/Driver.hh
index 911cb742b..1d5b883ac 100644
--- a/src/mem/ruby/common/Driver.hh
+++ b/src/mem/ruby/common/Driver.hh
@@ -35,7 +35,7 @@
 #include "NodeID.hh"
 #include "CacheRequestType.hh"
 
-class System;
+class RubySystem;
 class SubBlock;
 class Address;
 class MachineID;
diff --git a/src/mem/ruby/common/Global.cc b/src/mem/ruby/common/Global.cc
index e60cd4fd3..4ebcd93ce 100644
--- a/src/mem/ruby/common/Global.cc
+++ b/src/mem/ruby/common/Global.cc
@@ -30,6 +30,6 @@
 #include "Global.hh"
 
 EventQueue* g_eventQueue_ptr = NULL;
-System* g_system_ptr = NULL;
+RubySystem* g_system_ptr = NULL;
 Debug* g_debug_ptr = NULL;
 
diff --git a/src/mem/ruby/common/Global.hh b/src/mem/ruby/common/Global.hh
index eaec05d46..2977e696d 100644
--- a/src/mem/ruby/common/Global.hh
+++ b/src/mem/ruby/common/Global.hh
@@ -92,8 +92,8 @@ typedef int LinkID;
 class EventQueue;
 extern EventQueue* g_eventQueue_ptr;
 
-class System;
-extern System* g_system_ptr;
+class RubySystem;
+extern RubySystem* g_system_ptr;
 
 class Debug;
 extern Debug* g_debug_ptr;
-- 
cgit v1.2.3