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/Address.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/Address.hh')
| -rw-r--r-- | src/mem/ruby/common/Address.hh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mem/ruby/common/Address.hh b/src/mem/ruby/common/Address.hh index c495f8d86..dc58d012f 100644 --- a/src/mem/ruby/common/Address.hh +++ b/src/mem/ruby/common/Address.hh @@ -98,9 +98,9 @@ class Address Index memoryModuleIndex() const; - void print(ostream& out) const; - void output(ostream& out) const; - void input(istream& in); + void print(std::ostream& out) const; + void output(std::ostream& out) const; + void input(std::istream& in); void setOffset(int offset) @@ -128,11 +128,11 @@ operator<(const Address& obj1, const Address& obj2) return obj1.getAddress() < obj2.getAddress(); } -inline ostream& -operator<<(ostream& out, const Address& obj) +inline std::ostream& +operator<<(std::ostream& out, const Address& obj) { obj.print(out); - out << flush; + out << std::flush; return out; } @@ -259,7 +259,7 @@ ADDRESS_WIDTH MEMORY_SIZE_BITS PAGE_SIZE_BITS DATA_BLOCK_BITS } inline void -Address::print(ostream& out) const +Address::print(std::ostream& out) const { using namespace std; out << "[" << hex << "0x" << m_address << "," << " line 0x" |