diff options
author | Nathan Binkert <nate@binkert.org> | 2010-04-02 11:20:32 -0700 |
---|---|---|
committer | Nathan Binkert <nate@binkert.org> | 2010-04-02 11:20:32 -0700 |
commit | f1c3f3044b73d890ffdfdd113b3b37ae2809d21b (patch) | |
tree | 959d71e897a8d01868c8dea8a8b225cbd1b5ce2c /src/mem/protocol/MSI_MOSI_CMP_directory-dir.sm | |
parent | be10204729c107b41d5d7487323c732e9fa09df5 (diff) | |
download | gem5-f1c3f3044b73d890ffdfdd113b3b37ae2809d21b.tar.xz |
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.
Diffstat (limited to 'src/mem/protocol/MSI_MOSI_CMP_directory-dir.sm')
-rw-r--r-- | src/mem/protocol/MSI_MOSI_CMP_directory-dir.sm | 4 |
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); } |