luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix C++11 intrusion.

This commit is contained in:
Wilson Snyder 2020-01-21 19:45:44 -05:00
parent 4266d31443
commit d76b5b7823
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/V3Config.cpp
View File

@ -165,7 +165,7 @@ typedef V3ConfigWildcardResolver<V3ConfigFTask> V3ConfigFTaskResolver;
// Modules have tasks, variables, named blocks and properties // Modules have tasks, variables, named blocks and properties
class V3ConfigModule { class V3ConfigModule {
typedef std::unordered_set<string> StringSet; typedef vl_unordered_set<string> StringSet;
V3ConfigFTaskResolver m_tasks; // Functions/tasks in module V3ConfigFTaskResolver m_tasks; // Functions/tasks in module
V3ConfigVarResolver m_vars; // Variables in module V3ConfigVarResolver m_vars; // Variables in module
@ -290,8 +290,10 @@ class V3ConfigFile {
} }
public: public:
V3ConfigFile() { m_lastIgnore = {-1, m_ignLines.begin()}; } V3ConfigFile() {
m_lastIgnore.lineno = -1;
m_lastIgnore.it = m_ignLines.begin();
}
void update(const V3ConfigFile& file) { void update(const V3ConfigFile& file) {
// Copy in all Attributes // Copy in all Attributes
for (LineAttrMap::const_iterator it = file.m_lineAttrs.begin(); for (LineAttrMap::const_iterator it = file.m_lineAttrs.begin();
@ -455,7 +457,7 @@ void V3Config::addVarAttr(FileLine* fl, const string& module, const string& ftas
if (ftask.empty()) { if (ftask.empty()) {
mod.vars().at(var).push_back(V3ConfigVarAttr(attr, sensep)); mod.vars().at(var).push_back(V3ConfigVarAttr(attr, sensep));
} else { } else {
mod.ftasks().at(ftask).vars().at(var).push_back({attr, sensep}); mod.ftasks().at(ftask).vars().at(var).push_back(V3ConfigVarAttr(attr, sensep));
} }
} }
} }