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/filters/GenericBloomFilter.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/filters/GenericBloomFilter.hh')
-rw-r--r-- | src/mem/ruby/filters/GenericBloomFilter.hh | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/mem/ruby/filters/GenericBloomFilter.hh b/src/mem/ruby/filters/GenericBloomFilter.hh index b7bd56d04..606f55d4f 100644 --- a/src/mem/ruby/filters/GenericBloomFilter.hh +++ b/src/mem/ruby/filters/GenericBloomFilter.hh @@ -29,6 +29,9 @@ #ifndef __MEM_RUBY_FILTERS_GENERICBLOOMFILTER_HH__ #define __MEM_RUBY_FILTERS_GENERICBLOOMFILTER_HH__ +#include <iostream> +#include <string> + #include "mem/ruby/common/Global.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/filters/AbstractBloomFilter.hh" @@ -36,7 +39,7 @@ class GenericBloomFilter { public: - GenericBloomFilter(string config); + GenericBloomFilter(std::string config); ~GenericBloomFilter(); void clear(); @@ -61,18 +64,22 @@ class GenericBloomFilter int readBit(const int index); void writeBit(const int index, const int value); - void print(ostream& out) const; - void printConfig(ostream& out) { out << "GenericBloomFilter" << endl; } + void print(std::ostream& out) const; + void + printConfig(std::ostream& out) + { + out << "GenericBloomFilter" << std::endl; + } private: AbstractBloomFilter* m_filter; }; -inline ostream& -operator<<(ostream& out, const GenericBloomFilter& obj) +inline std::ostream& +operator<<(std::ostream& out, const GenericBloomFilter& obj) { obj.print(out); - out << flush; + out << std::flush; return out; } |