ruby: get "using namespace" out of headers

In addition to obvious changes, this required a slight change to the slicc
grammar to allow types with :: in them.  Otherwise slicc barfs on std::string
which we need for the headers that slicc generates.

4 files changed, 15 insertions, 7 deletions

diff --git a/src/mem/ruby/recorder/CacheRecorder.cc b/src/mem/ruby/recorder/CacheRecorder.cc
index 495a38fc8..32db211b6 100644
--- a/src/mem/ruby/recorder/CacheRecorder.cc
+++ b/src/mem/ruby/recorder/CacheRecorder.cc
@@ -33,6 +33,8 @@
 #include "mem/ruby/recorder/CacheRecorder.hh"
 #include "mem/ruby/recorder/TraceRecord.hh"
 
+using namespace std;
+
 CacheRecorder::CacheRecorder()
 {
     m_records_ptr = new PrioHeap<TraceRecord>;
diff --git a/src/mem/ruby/recorder/TraceRecord.cc b/src/mem/ruby/recorder/TraceRecord.cc
index 8c8daa051..7f1e96369 100644
--- a/src/mem/ruby/recorder/TraceRecord.cc
+++ b/src/mem/ruby/recorder/TraceRecord.cc
@@ -32,6 +32,8 @@
 #include "mem/ruby/system/System.hh"
 #include "sim/sim_object.hh"
 
+using namespace std;
+
 TraceRecord::TraceRecord(Sequencer* _sequencer, const Address& data_addr,
     const Address& pc_addr, RubyRequestType type, Time time)
 {
diff --git a/src/mem/ruby/recorder/TraceRecord.hh b/src/mem/ruby/recorder/TraceRecord.hh
index c8dae1986..98e78b20e 100644
--- a/src/mem/ruby/recorder/TraceRecord.hh
+++ b/src/mem/ruby/recorder/TraceRecord.hh
@@ -34,6 +34,8 @@
 #ifndef __MEM_RUBY_RECORDER_TRACERECORD_HH__
 #define __MEM_RUBY_RECORDER_TRACERECORD_HH__
 
+#include <iostream>
+
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/ruby/libruby_internal.hh"
@@ -66,9 +68,9 @@ class TraceRecord
 
     void issueRequest() const;
 
-    void print(ostream& out) const;
-    void output(ostream& out) const;
-    bool input(istream& in);
+    void print(std::ostream& out) const;
+    void output(std::ostream& out) const;
+    bool input(std::istream& in);
 
   private:
     Sequencer* m_sequencer_ptr;
@@ -85,7 +87,7 @@ node_less_then_eq(const TraceRecord& n1, const TraceRecord& n2)
 }
 
 inline std::ostream&
-operator<<(ostream& out, const TraceRecord& obj)
+operator<<(std::ostream& out, const TraceRecord& obj)
 {
     obj.print(out);
     out << std::flush;
diff --git a/src/mem/ruby/recorder/Tracer.cc b/src/mem/ruby/recorder/Tracer.cc
index e2d216ba3..23dafdb6c 100644
--- a/src/mem/ruby/recorder/Tracer.cc
+++ b/src/mem/ruby/recorder/Tracer.cc
@@ -33,6 +33,8 @@
 #include "mem/ruby/recorder/Tracer.hh"
 #include "mem/ruby/system/System.hh"
 
+using namespace std;
+
 Tracer::Tracer(const Params *p)
     : SimObject(p)
 {
@@ -43,7 +45,7 @@ Tracer::Tracer(const Params *p)
 }
 
 void
-Tracer::startTrace(std::string filename)
+Tracer::startTrace(string filename)
 {
     if (m_enabled)
         stopTrace();
@@ -80,7 +82,7 @@ Tracer::traceRequest(Sequencer* sequencer, const Address& data_addr,
 }
 
 int
-Tracer::playbackTrace(std::string filename)
+Tracer::playbackTrace(string filename)
 {
     igzstream in(filename.c_str());
     if (in.fail()) {
@@ -123,7 +125,7 @@ Tracer::playbackTrace(std::string filename)
 }
 
 void
-Tracer::print(std::ostream& out) const
+Tracer::print(ostream& out) const
 {
 }