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, 4 insertions, 4 deletions

diff --git a/src/mem/ruby/common/Address.cc b/src/mem/ruby/common/Address.cc
index e74bdb47b..2d895cc33 100644
--- a/src/mem/ruby/common/Address.cc
+++ b/src/mem/ruby/common/Address.cc
@@ -29,23 +29,23 @@
 #include "mem/ruby/common/Address.hh"
 
 void
-Address::output(ostream& out) const
+Address::output(std::ostream& out) const
 {
     // Note: this outputs addresses in the form "ffff", not "0xffff".
     // This code should always be able to write out addresses in a
     // format that can be read in by the below input() method.  Please
     // don't change this without talking to Milo first.
-    out << hex << m_address << dec;
+    out << std::hex << m_address << std::dec;
 }
 
 void
-Address::input(istream& in)
+Address::input(std::istream& in)
 {
     // Note: this only works with addresses in the form "ffff", not
     // "0xffff".  This code should always be able to read in addresses
     // written out by the above output() method.  Please don't change
     // this without talking to Milo first.
-    in >> hex >> m_address >> dec;
+    in >> std::hex >> m_address >> std::dec;
 }
 
 Address::Address(const Address& obj)