summaryrefslogtreecommitdiff
path: root/src/cpu/rubytest/Check.cc
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2010-04-02 11:20:32 -0700
committerNathan Binkert <nate@binkert.org>2010-04-02 11:20:32 -0700
commitf1c3f3044b73d890ffdfdd113b3b37ae2809d21b (patch)
tree959d71e897a8d01868c8dea8a8b225cbd1b5ce2c /src/cpu/rubytest/Check.cc
parentbe10204729c107b41d5d7487323c732e9fa09df5 (diff)
downloadgem5-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/cpu/rubytest/Check.cc')
-rw-r--r--src/cpu/rubytest/Check.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/rubytest/Check.cc b/src/cpu/rubytest/Check.cc
index ca7ca8457..867e755a8 100644
--- a/src/cpu/rubytest/Check.cc
+++ b/src/cpu/rubytest/Check.cc
@@ -334,7 +334,7 @@ Check::pickInitiatingNode()
}
void
-Check::print(ostream& out) const
+Check::print(std::ostream& out) const
{
out << "["
<< m_address << ", value: "
@@ -342,7 +342,7 @@ Check::print(ostream& out) const
<< m_status << ", initiating node: "
<< m_initiatingNode << ", store_count: "
<< m_store_count
- << "]" << flush;
+ << "]" << std::flush;
}
void