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/MultiBitSelBloomFilter.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/MultiBitSelBloomFilter.hh')
| -rw-r--r-- | src/mem/ruby/filters/MultiBitSelBloomFilter.hh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mem/ruby/filters/MultiBitSelBloomFilter.hh b/src/mem/ruby/filters/MultiBitSelBloomFilter.hh index c3b441c20..f53b2595a 100644 --- a/src/mem/ruby/filters/MultiBitSelBloomFilter.hh +++ b/src/mem/ruby/filters/MultiBitSelBloomFilter.hh @@ -29,6 +29,9 @@ #ifndef __MEM_RUBY_FILTERS_MULTIBITSELBLOOMFILTER_HH__ #define __MEM_RUBY_FILTERS_MULTIBITSELBLOOMFILTER_HH__ +#include <iostream> +#include <string> + #include "mem/gems_common/Map.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/common/Global.hh" @@ -39,7 +42,7 @@ class MultiBitSelBloomFilter : public AbstractBloomFilter { public: - MultiBitSelBloomFilter(string config); + MultiBitSelBloomFilter(std::string config); ~MultiBitSelBloomFilter(); void clear(); @@ -52,7 +55,7 @@ class MultiBitSelBloomFilter : public AbstractBloomFilter bool isSet(const Address& addr); int getCount(const Address& addr); int getTotalCount(); - void print(ostream& out) const; + void print(std::ostream& out) const; int getIndex(const Address& addr); int readBit(const int index); |