From f1c3f3044b73d890ffdfdd113b3b37ae2809d21b Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Fri, 2 Apr 2010 11:20:32 -0700 Subject: 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. --- src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh') diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh index a6c838e8a..95a7dad1c 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.hh @@ -31,6 +31,8 @@ #ifndef SW_ALLOCATOR_D_H #define SW_ALLOCATOR_D_H +#include + #include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/common/Consumer.hh" @@ -46,7 +48,7 @@ public: void clear_request_vector(); void check_for_wakeup(); int get_vnet (int invc); - void print(ostream& out) const {}; + void print(std::ostream& out) const {}; void arbitrate_inports(); void arbitrate_outports(); bool is_candidate_inport(int inport, int invc); -- cgit v1.2.3