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/slicc/symbols/StateMachine.py | |
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/slicc/symbols/StateMachine.py')
-rw-r--r-- | src/mem/slicc/symbols/StateMachine.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mem/slicc/symbols/StateMachine.py b/src/mem/slicc/symbols/StateMachine.py index 0c66ddab4..a58c1e9c7 100644 --- a/src/mem/slicc/symbols/StateMachine.py +++ b/src/mem/slicc/symbols/StateMachine.py @@ -32,7 +32,7 @@ from slicc.symbols.Var import Var import slicc.generate.html as html python_class_map = {"int": "Int", - "string": "String", + "std::string": "String", "bool": "Bool", "CacheMemory": "RubyCache", "Sequencer": "RubySequencer", @@ -271,12 +271,12 @@ std::string m_name; int m_transitions_per_cycle; int m_buffer_size; int m_recycle_latency; -map<std::string, std::string> m_cfg; +std::map<std::string, std::string> m_cfg; NodeID m_version; Network* m_net_ptr; MachineID m_machineID; bool m_is_blocking; -map< Address, MessageBuffer* > m_block_map; +std::map<Address, MessageBuffer*> m_block_map; ${ident}_Profiler s_profiler; static int m_num_controllers; @@ -714,6 +714,8 @@ $c_ident::${{action.ident}}(const Address& addr) #include "mem/protocol/Types.hh" #include "mem/ruby/system/System.hh" +using namespace std; + void ${ident}_Controller::wakeup() { |