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/NetworkLink_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh
index b5c58baa2..c5f9f14d1 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh
@@ -31,6 +31,8 @@
 #ifndef NETWORK_LINK_D_H
 #define NETWORK_LINK_D_H
 
+#include <iostream>
+
 #include "mem/ruby/network/garnet/NetworkHeader.hh"
 #include "mem/ruby/common/Consumer.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/flitBuffer_d.hh"
@@ -47,7 +49,7 @@ public:
         NetworkLink_d(int id, int link_latency, GarnetNetwork_d *net_ptr);
         void setLinkConsumer(Consumer *consumer);
         void setSourceQueue(flitBuffer_d *srcQueue);
-        void print(ostream& out) const{}
+        void print(std::ostream& out) const{}
         int getLinkUtilization();
         Vector<int> getVcLoad();
         int get_id(){return m_id;}