summaryrefslogtreecommitdiff
path: root/src/mem/ruby/common/Global.cc
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.cc
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.cc')
-rw-r--r--src/mem/ruby/common/Global.cc2
1 files changed, 1 insertions, 1 deletions
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;