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.

1 files changed, 11 insertions, 9 deletions

diff --git a/src/mem/ruby/system/PersistentTable.hh b/src/mem/ruby/system/PersistentTable.hh
index 64203c82c..667d68dcb 100644
--- a/src/mem/ruby/system/PersistentTable.hh
+++ b/src/mem/ruby/system/PersistentTable.hh
@@ -29,6 +29,8 @@
 #ifndef __MEM_RUBY_SYSTEM_PERSISTENTTABLE_HH__
 #define __MEM_RUBY_SYSTEM_PERSISTENTTABLE_HH__
 
+#include <iostream>
+
 #include "mem/gems_common/Map.hh"
 #include "mem/protocol/AccessType.hh"
 #include "mem/ruby/common/Address.hh"
@@ -39,7 +41,7 @@
 class PersistentTableEntry
 {
   public:
-    void print(ostream& out) const {}
+    void print(std::ostream& out) const {}
 
     NetDest m_starving;
     NetDest m_marked;
@@ -67,9 +69,9 @@ class PersistentTable
     int countStarvingForAddress(const Address& addr) const;
     int countReadStarvingForAddress(const Address& addr) const;
 
-    static void printConfig(ostream& out) {}
+    static void printConfig(std::ostream& out) {}
 
-    void print(ostream& out) const;
+    void print(std::ostream& out) const;
 
   private:
     // Private copy constructor and assignment operator
@@ -80,19 +82,19 @@ class PersistentTable
     Map<Address, PersistentTableEntry>* m_map_ptr;
 };
 
-inline ostream&
-operator<<(ostream& out, const PersistentTable& obj)
+inline std::ostream&
+operator<<(std::ostream& out, const PersistentTable& obj)
 {
     obj.print(out);
-    out << flush;
+    out << std::flush;
     return out;
 }
 
-inline ostream&
-operator<<(ostream& out, const PersistentTableEntry& obj)
+inline std::ostream&
+operator<<(std::ostream& out, const PersistentTableEntry& obj)
 {
     obj.print(out);
-    out << flush;
+    out << std::flush;
     return out;
 }