From f1c3f3044b73d890ffdfdd113b3b37ae2809d21b Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Fri, 2 Apr 2010 11:20:32 -0700 Subject: 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. --- src/cpu/rubytest/Check.hh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/cpu/rubytest/Check.hh') diff --git a/src/cpu/rubytest/Check.hh b/src/cpu/rubytest/Check.hh index 5f621a018..6d41dfc59 100644 --- a/src/cpu/rubytest/Check.hh +++ b/src/cpu/rubytest/Check.hh @@ -30,6 +30,8 @@ #ifndef __CPU_RUBYTEST_CHECK_HH__ #define __CPU_RUBYTEST_CHECK_HH__ +#include + #include "cpu/rubytest/RubyTester.hh" #include "mem/protocol/AccessModeType.hh" #include "mem/protocol/TesterStatus.hh" @@ -53,7 +55,7 @@ class Check const Address& getAddress() { return m_address; } void changeAddress(const Address& address); - void print(ostream& out) const; + void print(std::ostream& out) const; private: void initiatePrefetch(); @@ -76,11 +78,11 @@ class Check RubyTester* m_tester_ptr; }; -inline ostream& -operator<<(ostream& out, const Check& obj) +inline std::ostream& +operator<<(std::ostream& out, const Check& obj) { obj.print(out); - out << flush; + out << std::flush; return out; } -- cgit v1.2.3