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, 2 insertions, 2 deletions

diff --git a/src/mem/protocol/MESI_SCMP_bankdirectory-L2cache.sm b/src/mem/protocol/MESI_SCMP_bankdirectory-L2cache.sm
index 0bd9c2b14..8d3c2126f 100644
--- a/src/mem/protocol/MESI_SCMP_bankdirectory-L2cache.sm
+++ b/src/mem/protocol/MESI_SCMP_bankdirectory-L2cache.sm
@@ -171,7 +171,7 @@ machine(L2Cache, "MOSI Directory L2 Cache CMP") {
     }
   }
 
-  string getCoherenceRequestTypeStr(CoherenceRequestType type) {
+  std::string getCoherenceRequestTypeStr(CoherenceRequestType type) {
     return CoherenceRequestType_to_string(type);
   }
 
@@ -209,7 +209,7 @@ machine(L2Cache, "MOSI Directory L2 Cache CMP") {
     return State:NP;
   }
 
-  string getStateStr(Address addr) {
+  std::string getStateStr(Address addr) {
     return L2Cache_State_to_string(getState(addr));
   }