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.

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;
 };