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/system/SparseMemory.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/system/SparseMemory.hh')
-rw-r--r-- | src/mem/ruby/system/SparseMemory.hh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/mem/ruby/system/SparseMemory.hh b/src/mem/ruby/system/SparseMemory.hh index 2c207aa3f..0601a8ca5 100644 --- a/src/mem/ruby/system/SparseMemory.hh +++ b/src/mem/ruby/system/SparseMemory.hh @@ -29,6 +29,8 @@ #ifndef __MEM_RUBY_SYSTEM_SPARSEMEMORY_HH__ #define __MEM_RUBY_SYSTEM_SPARSEMEMORY_HH__ +#include <iostream> + #include "base/hashmap.hh" #include "mem/protocol/Directory_Entry.hh" #include "mem/ruby/common/Address.hh" @@ -55,7 +57,7 @@ class SparseMemory SparseMemory(int number_of_bits, int number_of_levels); ~SparseMemory(); - void printConfig(ostream& out) { } + void printConfig(std::ostream& out) { } bool exist(const Address& address) const; void add(const Address& address); @@ -64,8 +66,8 @@ class SparseMemory Directory_Entry* lookup(const Address& address); // Print cache contents - void print(ostream& out) const; - void printStats(ostream& out) const; + void print(std::ostream& out) const; + void printStats(std::ostream& out) const; private: // Private Methods @@ -93,11 +95,11 @@ class SparseMemory uint64_t* m_removes_per_level; }; -inline ostream& -operator<<(ostream& out, const SparseMemEntry& obj) +inline std::ostream& +operator<<(std::ostream& out, const SparseMemEntry& obj) { out << "SparseMemEntry"; - out << flush; + out << std::flush; return out; } |