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-msg.sm b/src/mem/protocol/MSI_MOSI_CMP_directory-msg.sm
index 80ab0f246..fc653983a 100644
--- a/src/mem/protocol/MSI_MOSI_CMP_directory-msg.sm
+++ b/src/mem/protocol/MSI_MOSI_CMP_directory-msg.sm
@@ -69,8 +69,8 @@ structure(RequestMsg, desc="...", interface="NetworkMessage") {
   DataBlock DataBlk,            desc="Data for the cache line (if PUTX)";
   int NumPendingExtAcks,        desc="Number of acks to wait for"; // Needed for forwarded responses only
   MessageSizeType MessageSize,  desc="size category of the message";
-  string L1CacheStateStr,       desc="describes L1 cache block state";
-  string L2CacheStateStr,       desc="describes L2 cache block state";
+  std::string L1CacheStateStr,  desc="describes L1 cache block state";
+  std::string L2CacheStateStr,  desc="describes L2 cache block state";
   PrefetchBit Prefetch,         desc="Is this a prefetch request";
 }