summaryrefslogtreecommitdiffstats
path: root/src/lib/netlist/prg/nltool.cpp
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2020-10-03 14:31:39 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2020-10-03 14:31:39 +1000
commitd1681a8ecef978ee34bafe24e95d34f25581e9c3 (patch)
tree958f96e617f2b5cb3c7c74536a14ad19d9a45be7 /src/lib/netlist/prg/nltool.cpp
parentb7de847b6e5f259fa5c67b43951586204a6ae387 (diff)
parent9ac531e2b9aa690910cbeb35a14bd93fb001592b (diff)
Merge remote-tracking branch 'upstream/master' into master
Diffstat (limited to 'src/lib/netlist/prg/nltool.cpp')
-rw-r--r--src/lib/netlist/prg/nltool.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/netlist/prg/nltool.cpp b/src/lib/netlist/prg/nltool.cpp
index 313ec4e8b2e..21f1f0725fa 100644
--- a/src/lib/netlist/prg/nltool.cpp
+++ b/src/lib/netlist/prg/nltool.cpp
@@ -703,7 +703,7 @@ void tool_app_t::static_compile()
for (auto &e : map)
{
sout << "// " << putf8string(e.second.m_module) << "\n";
- sout << "\t{\"" << putf8string(e.first) << "\", reinterpret_cast<void *>(&" << putf8string(e.first) << ")},\n";
+ sout << "\t{\"" << putf8string(e.first) << "\", reinterpret_cast<void *>(&" << putf8string(e.first) << ")}, // NOLINT\n";
}
sout << "#endif\n\n";
sout << "{\"\", nullptr}\n";
@@ -1174,7 +1174,7 @@ void tool_app_t::listmodels()
{
auto model = nt.setup().models().get_model(e);
- elems.push_back({model.type(), e});
+ elems.emplace_back(model.type(), e);
}
std::sort(elems.begin(), elems.end(), comp);