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

diff --git a/src/mem/ruby/slicc_interface/NetworkMessage.hh b/src/mem/ruby/slicc_interface/NetworkMessage.hh
index 8a7c00094..41365ff9e 100644
--- a/src/mem/ruby/slicc_interface/NetworkMessage.hh
+++ b/src/mem/ruby/slicc_interface/NetworkMessage.hh
@@ -29,6 +29,8 @@
 #ifndef __MEM_RUBY_SLICC_INTERFACE_NETWORKMESSAGE_HH__
 #define __MEM_RUBY_SLICC_INTERFACE_NETWORKMESSAGE_HH__
 
+#include <iostream>
+
 #include "mem/gems_common/RefCnt.hh"
 #include "mem/gems_common/RefCountable.hh"
 #include "mem/protocol/MessageSizeType.hh"
@@ -76,18 +78,18 @@ class NetworkMessage : public Message
         return m_internal_dest;
     }
 
-    virtual void print(ostream& out) const = 0;
+    virtual void print(std::ostream& out) const = 0;
 
   private:
     NetDest m_internal_dest;
     bool m_internal_dest_valid;
 };
 
-inline ostream&
-operator<<(ostream& out, const NetworkMessage& obj)
+inline std::ostream&
+operator<<(std::ostream& out, const NetworkMessage& obj)
 {
     obj.print(out);
-    out << flush;
+    out << std::flush;
     return out;
 }