From f1c3f3044b73d890ffdfdd113b3b37ae2809d21b Mon Sep 17 00:00:00 2001 From: Nathan Binkert 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/RubySlicc_Profiler.sm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/mem/protocol/RubySlicc_Profiler.sm') diff --git a/src/mem/protocol/RubySlicc_Profiler.sm b/src/mem/protocol/RubySlicc_Profiler.sm index d360af160..ce1183e22 100644 --- a/src/mem/protocol/RubySlicc_Profiler.sm +++ b/src/mem/protocol/RubySlicc_Profiler.sm @@ -41,7 +41,8 @@ void profile_L1Cache_miss(CacheMsg msg, NodeID l1cacheID); // used by CMP protocols void profile_L2Cache_miss(GenericRequestType requestType, AccessModeType type, int msgSize, PrefetchBit pfBit, NodeID l2cacheID); -void profile_request(string L1CacheStateStr, string L2CacheStateStr, string directoryStateStr, string requestTypeStr); +void profile_request(std::string L1CacheStateStr, std::string L2CacheStateStr, + std::string directoryStateStr, std::string requestTypeStr); void profileMessageReordering(bool wasReordered); void profileMessageReorderingByNetwork(int vnet, bool wasReordered); void profile_token_retry(Address addr, AccessType type, int count); -- cgit v1.2.3