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, 3 insertions, 1 deletions

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
index 498a6cae1..91f79882c 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/Router_d.hh
@@ -31,6 +31,8 @@
 #ifndef ROUTER_D_H
 #define ROUTER_D_H
 
+#include <iostream>
+
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/gems_common/Vector.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/flit_d.hh"
@@ -60,7 +62,7 @@ public:
         int get_vc_per_vnet() {return m_vc_per_vnet; }
         int get_num_inports() { return m_input_unit.size(); }
         int get_num_outports() { return m_output_unit.size(); }
-        void printConfig(ostream& out);
+        void printConfig(std::ostream& out);
         int get_id() { return m_id; }
         GarnetNetwork_d* get_net_ptr() { return m_network_ptr; }