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/common/Set.hh b/src/mem/ruby/common/Set.hh
index a22da914c..d0660c6e6 100644
--- a/src/mem/ruby/common/Set.hh
+++ b/src/mem/ruby/common/Set.hh
@@ -45,6 +45,8 @@
 #ifndef SET_H
 #define SET_H
 
+#include <iostream>
+
 #include "mem/ruby/system/System.hh"
 #include "mem/ruby/common/Global.hh"
 #include "mem/gems_common/Vector.hh"
@@ -164,7 +166,7 @@ public:
   void setBroadcast() { broadcast(); }   // Deprecated
   bool presentInSet(NodeID element) const { return isElement(element); }  // Deprecated
 
-  void print(ostream& out) const;
+  void print(std::ostream& out) const;
 private:
   // Private Methods
 
@@ -185,16 +187,16 @@ private:
 };
 
 // Output operator declaration
-ostream& operator<<(ostream& out, const Set& obj);
+std::ostream& operator<<(std::ostream& out, const Set& obj);
 
 // ******************* Definitions *******************
 
 // Output operator definition
 extern inline
-ostream& operator<<(ostream& out, const Set& obj)
+std::ostream& operator<<(std::ostream& out, const Set& obj)
 {
   obj.print(out);
-  out << flush;
+  out << std::flush;
   return out;
 }