From f1c3f3044b73d890ffdfdd113b3b37ae2809d21b Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
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/protocol/MOESI_CMP_token-L2cache.sm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mem/protocol/MOESI_CMP_token-L2cache.sm')

diff --git a/src/mem/protocol/MOESI_CMP_token-L2cache.sm b/src/mem/protocol/MOESI_CMP_token-L2cache.sm
index d3e11349d..789a2b5cd 100644
--- a/src/mem/protocol/MOESI_CMP_token-L2cache.sm
+++ b/src/mem/protocol/MOESI_CMP_token-L2cache.sm
@@ -183,7 +183,7 @@ machine(L2Cache, "Token protocol")
     }
   }
 
-  string getStateStr(Address addr) {
+  std::string getStateStr(Address addr) {
     return L2Cache_State_to_string(getState(addr));
   }
 
-- 
cgit v1.2.3