diff options
| author | Gabe Black <gabeblack@google.com> | 2018-11-06 17:48:58 -0800 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2018-11-09 01:25:15 +0000 |
| commit | 1c110fafffdf82034e34146f90729ad92865238d (patch) | |
| tree | 111b229ec0ee422f73b3a1495648c1506e8ec348 /src/systemc/utils/report.hh | |
| parent | 121160d97f3d41220a26d3371a277434c3defea3 (diff) | |
| download | gem5-1c110fafffdf82034e34146f90729ad92865238d.tar.xz | |
systemc: Wrap some report maps in functions.
By declaring the map as a static variable in that function and then
returning it, we can guarantee that it's initialized relative to other
static initializers so that we don't try to use a data structure that
isn't constructed yet. This will let us get rid of the dependence on
python for setting up that mapping.
Change-Id: I031ce2039de8f5f79fbb9d76cf1363f15207b64b
Reviewed-on: https://gem5-review.googlesource.com/c/13975
Maintainer: Gabe Black <gabeblack@google.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'src/systemc/utils/report.hh')
| -rw-r--r-- | src/systemc/utils/report.hh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/systemc/utils/report.hh b/src/systemc/utils/report.hh index a0840c65b..70716cb91 100644 --- a/src/systemc/utils/report.hh +++ b/src/systemc/utils/report.hh @@ -93,8 +93,9 @@ struct ReportSevInfo extern const char *reportSeverityNames[sc_core::SC_MAX_SEVERITY]; extern ReportSevInfo reportSevInfos[sc_core::SC_MAX_SEVERITY]; -extern std::map<std::string, ReportMsgInfo> reportMsgInfoMap; -extern std::map<int, std::string> reportIdToMsgMap; + +std::map<std::string, ReportMsgInfo> &reportMsgInfoMap(); +std::map<int, std::string> &reportIdToMsgMap(); extern int reportVerbosityLevel; |