73c73
< sc_gem5::ReportMsgInfo &msgInfo = sc_gem5::reportMsgInfoMap[msg_type];
---
> sc_gem5::ReportMsgInfo &msgInfo = sc_gem5::reportMsgInfoMap()[msg_type];
114c114
< std::string &msg_type = sc_gem5::reportIdToMsgMap[id];
---
> std::string &msg_type = sc_gem5::reportIdToMsgMap()[id];
137c137
< sc_gem5::ReportMsgInfo &info = sc_gem5::reportMsgInfoMap[msg_type];
---
> sc_gem5::ReportMsgInfo &info = sc_gem5::reportMsgInfoMap()[msg_type];
150c150
< sc_gem5::ReportMsgInfo &info = sc_gem5::reportMsgInfoMap[msg_type];
---
> sc_gem5::ReportMsgInfo &info = sc_gem5::reportMsgInfoMap()[msg_type];
171c171
< sc_gem5::ReportMsgInfo &info = sc_gem5::reportMsgInfoMap[msg_type];
---
> sc_gem5::ReportMsgInfo &info = sc_gem5::reportMsgInfoMap()[msg_type];
184c184
< sc_gem5::ReportMsgInfo &info = sc_gem5::reportMsgInfoMap[msg_type];
---
> sc_gem5::ReportMsgInfo &info = sc_gem5::reportMsgInfoMap()[msg_type];
202c202
< return sc_gem5::reportMsgInfoMap[msg_type].count;
---
> return sc_gem5::reportMsgInfoMap()[msg_type].count;
211c211
< return sc_gem5::reportMsgInfoMap[msg_type].sevCounts[severity];
---
> return sc_gem5::reportMsgInfoMap()[msg_type].sevCounts[severity];