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/MSI_MOSI_CMP_directory-dir.sm b/src/mem/protocol/MSI_MOSI_CMP_directory-dir.sm
index 435bf0eff..e806b333c 100644
--- a/src/mem/protocol/MSI_MOSI_CMP_directory-dir.sm
+++ b/src/mem/protocol/MSI_MOSI_CMP_directory-dir.sm
@@ -100,11 +100,11 @@ machine(Directory, "MOSI Directory Optimized") {
     return State:NP;
   }
 
-  string getDirStateStr(Address addr) {
+  std::string getDirStateStr(Address addr) {
     return Directory_State_to_string(getState(addr));
   }
 
-  string getRequestTypeStr(CoherenceRequestType type) {
+  std::string getRequestTypeStr(CoherenceRequestType type) {
     return CoherenceRequestType_to_string(type);
   }