summaryrefslogtreecommitdiff
path: root/src/mem/ruby/slicc_interface/AbstractController.hh
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/mem/ruby/slicc_interface/AbstractController.hh
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/mem/ruby/slicc_interface/AbstractController.hh')
-rw-r--r--src/mem/ruby/slicc_interface/AbstractController.hh22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/mem/ruby/slicc_interface/AbstractController.hh b/src/mem/ruby/slicc_interface/AbstractController.hh
index facaf2adf..44e47c8ca 100644
--- a/src/mem/ruby/slicc_interface/AbstractController.hh
+++ b/src/mem/ruby/slicc_interface/AbstractController.hh
@@ -29,13 +29,15 @@
#ifndef __MEM_RUBY_SLICC_INTERFACE_ABSTRACTCONTROLLER_HH__
#define __MEM_RUBY_SLICC_INTERFACE_ABSTRACTCONTROLLER_HH__
-#include "sim/sim_object.hh"
-#include "params/RubyController.hh"
+#include <iostream>
+#include <string>
-#include "mem/ruby/common/Consumer.hh"
#include "mem/protocol/MachineType.hh"
#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/common/Consumer.hh"
#include "mem/ruby/network/Network.hh"
+#include "params/RubyController.hh"
+#include "sim/sim_object.hh"
class MessageBuffer;
class Network;
@@ -50,19 +52,19 @@ class AbstractController : public SimObject, public Consumer
// virtual int getNumberOfControllers() const = 0;
virtual MessageBuffer* getMandatoryQueue() const = 0;
virtual const int & getVersion() const = 0;
- virtual const string toString() const = 0; // returns text version of
- // controller type
- virtual const string getName() const = 0; // return instance name
+ virtual const std::string toString() const = 0; // returns text version of
+ // controller type
+ virtual const std::string getName() const = 0; // return instance name
virtual const MachineType getMachineType() const = 0;
virtual void blockOnQueue(Address, MessageBuffer*) = 0;
virtual void unblock(Address) = 0;
virtual void initNetworkPtr(Network* net_ptr) = 0;
- virtual void print(ostream & out) const = 0;
- virtual void printStats(ostream & out) const = 0;
- virtual void printConfig(ostream & out) const = 0;
+ virtual void print(std::ostream & out) const = 0;
+ virtual void printStats(std::ostream & out) const = 0;
+ virtual void printConfig(std::ostream & out) const = 0;
virtual void wakeup() = 0;
- // virtual void dumpStats(ostream & out) = 0;
+ // virtual void dumpStats(std::ostream & out) = 0;
virtual void clearStats() = 0;
};