summaryrefslogtreecommitdiff
path: root/src/mem/ruby/common/Global.hh
diff options
context:
space:
mode:
authorDaniel Sanchez <sanchezd@stanford.edu>2009-05-11 10:38:44 -0700
committerDaniel Sanchez <sanchezd@stanford.edu>2009-05-11 10:38:44 -0700
commitab5e4a22b3893fb0ccdfbf466d46983caeb5948e (patch)
tree58681979392d2f395da7c284c2f42113939396ee /src/mem/ruby/common/Global.hh
parent84a18e7fdc6106a04188254f940a0e987efe750c (diff)
downloadgem5-ab5e4a22b3893fb0ccdfbf466d46983caeb5948e.tar.xz
ruby: Removed System name clash by renaming ruby's System to RubySystem
Diffstat (limited to 'src/mem/ruby/common/Global.hh')
-rw-r--r--src/mem/ruby/common/Global.hh4
1 files changed, 2 insertions, 2 deletions
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;