diff options
| author | Nathan Binkert <nate@binkert.org> | 2010-04-02 11:20:32 -0700 |
|---|---|---|
| committer | Nathan Binkert <nate@binkert.org> | 2010-04-02 11:20:32 -0700 |
| commit | f1c3f3044b73d890ffdfdd113b3b37ae2809d21b (patch) | |
| tree | 959d71e897a8d01868c8dea8a8b225cbd1b5ce2c /src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh | |
| parent | be10204729c107b41d5d7487323c732e9fa09df5 (diff) | |
| download | gem5-f1c3f3044b73d890ffdfdd113b3b37ae2809d21b.tar.xz | |
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.
Diffstat (limited to 'src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh')
| -rw-r--r-- | src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh index 1ca4a7a9c..88d882969 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh @@ -31,6 +31,8 @@ #ifndef NET_INTERFACE_D_H #define NET_INTERFACE_D_H +#include <iostream> + #include "mem/ruby/network/garnet/NetworkHeader.hh" #include "mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh" #include "mem/gems_common/Vector.hh" @@ -55,8 +57,8 @@ public: void wakeup(); void addNode(Vector<MessageBuffer *> &inNode, Vector<MessageBuffer *> &outNode); - void printConfig(ostream& out) const; - void print(ostream& out) const; + void printConfig(std::ostream& out) const; + void print(std::ostream& out) const; int get_vnet(int vc); private: |