riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cellaigs: Drop initializer list in call to `IdString::in` 

Remove superfluous curly braces in call to IdString::in to address
a compilation error (reproduced below) under GCC 9 and earlier.

kernel/cellaigs.cc:395:18: error: call to member function 'in' is ambiguous
if (cell->type.in({ID($gt), ID($ge)}))
~~~~~~~~~~~^~
./kernel/rtlil.h:383:8: note: candidate function
bool in(const std::string &rhs) const { return *this == rhs; }
^
./kernel/rtlil.h:384:8: note: candidate function
bool in(const pool &rhs) const { return rhs.co...
^
This commit is contained in:
Martin Povišer 2023-08-14 11:42:19 +02:00
parent 008b725c1d
commit 6d9cd16fad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/cellaigs.cc
View File

@ -385,17 +385,17 @@ Aig::Aig(Cell *cell)
goto optimize; goto optimize;
} }
if (cell->type.in({ID($lt), ID($gt), ID($le), ID($ge)})) if (cell->type.in(ID($lt), ID($gt), ID($le), ID($ge)))
{ {
int width = std::max(GetSize(cell->getPort(ID::A)), int width = std::max(GetSize(cell->getPort(ID::A)),
GetSize(cell->getPort(ID::B))) + 1; GetSize(cell->getPort(ID::B))) + 1;
vector<int> A = mk.inport_vec(ID::A, width); vector<int> A = mk.inport_vec(ID::A, width);
vector<int> B = mk.inport_vec(ID::B, width); vector<int> B = mk.inport_vec(ID::B, width);
if (cell->type.in({ID($gt), ID($ge)})) if (cell->type.in(ID($gt), ID($ge)))
std::swap(A, B); std::swap(A, B);
int carry = mk.bool_node(!cell->type.in({ID($le), ID($ge)})); int carry = mk.bool_node(!cell->type.in(ID($le), ID($ge)));
for (auto &n : B) for (auto &n : B)
n = mk.not_gate(n); n = mk.not_gate(n);
vector<int> Y = mk.adder(A, B, carry); vector<int> Y = mk.adder(A, B, carry);