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/common/NetDest.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/common/NetDest.hh')
-rw-r--r-- | src/mem/ruby/common/NetDest.hh | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/mem/ruby/common/NetDest.hh b/src/mem/ruby/common/NetDest.hh index 7592ad9b5..a8d0009d7 100644 --- a/src/mem/ruby/common/NetDest.hh +++ b/src/mem/ruby/common/NetDest.hh @@ -34,12 +34,14 @@ #ifndef __MEM_RUBY_COMMON_NETDEST_HH__ #define __MEM_RUBY_COMMON_NETDEST_HH__ -#include "mem/ruby/common/Global.hh" +#include <iostream> + #include "mem/gems_common/Vector.hh" -#include "mem/ruby/system/NodeID.hh" -#include "mem/ruby/system/MachineID.hh" -#include "mem/ruby/common/Set.hh" #include "mem/protocol/MachineType.hh" +#include "mem/ruby/common/Global.hh" +#include "mem/ruby/common/Set.hh" +#include "mem/ruby/system/MachineID.hh" +#include "mem/ruby/system/NodeID.hh" class NetDest { @@ -98,7 +100,7 @@ class NetDest // get element for a index NodeID elementAt(MachineID index); - void print(ostream& out) const; + void print(std::ostream& out) const; private: // returns a value >= MachineType_base_level("this machine") @@ -120,11 +122,11 @@ class NetDest Vector <Set> m_bits; // a Vector of bit vectors - i.e. Sets }; -inline ostream& -operator<<(ostream& out, const NetDest& obj) +inline std::ostream& +operator<<(std::ostream& out, const NetDest& obj) { obj.print(out); - out << flush; + out << std::flush; return out; } |