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/mem/ruby/system/Sequencer.hh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/mem/ruby/system/Sequencer.hh') diff --git a/src/mem/ruby/system/Sequencer.hh b/src/mem/ruby/system/Sequencer.hh index 69fd3b771..a5b2dd544 100644 --- a/src/mem/ruby/system/Sequencer.hh +++ b/src/mem/ruby/system/Sequencer.hh @@ -29,6 +29,8 @@ #ifndef __MEM_RUBY_SYSTEM_SEQUENCER_HH__ #define __MEM_RUBY_SYSTEM_SEQUENCER_HH__ +#include + #include "mem/gems_common/Map.hh" #include "mem/protocol/AccessModeType.hh" #include "mem/protocol/CacheRequestType.hh" @@ -68,9 +70,9 @@ class Sequencer : public RubyPort, public Consumer // Public Methods void wakeup(); // Used only for deadlock detection - void printConfig(ostream& out) const; + void printConfig(std::ostream& out) const; - void printProgress(ostream& out) const; + void printProgress(std::ostream& out) const; void writeCallback(const Address& address, DataBlock& data); void readCallback(const Address& address, DataBlock& data); @@ -79,8 +81,8 @@ class Sequencer : public RubyPort, public Consumer RequestStatus getRequestStatus(const RubyRequest& request); bool empty() const; - void print(ostream& out) const; - void printStats(ostream & out) const; + void print(std::ostream& out) const; + void printStats(std::ostream& out) const; void checkCoherence(const Address& address); void removeRequest(SequencerRequest* request); @@ -133,11 +135,11 @@ class Sequencer : public RubyPort, public Consumer SequencerWakeupEvent deadlockCheckEvent; }; -inline ostream& -operator<<(ostream& out, const Sequencer& obj) +inline std::ostream& +operator<<(std::ostream& out, const Sequencer& obj) { obj.print(out); - out << flush; + out << std::flush; return out; } -- cgit v1.2.3