Fix Travis/GCC warnings.
This commit is contained in:
parent
0397e19726
commit
45eccaecaf
|
|
@ -2890,13 +2890,13 @@ void EmitCStmts::emitSortedVarList(const VarVec& anons, const VarVec& nonanons,
|
||||||
if (anonL1s != 1)
|
if (anonL1s != 1)
|
||||||
puts("// Anonymous structures to workaround compiler member-count bugs\n");
|
puts("// Anonymous structures to workaround compiler member-count bugs\n");
|
||||||
auto it = anons.cbegin();
|
auto it = anons.cbegin();
|
||||||
for (int l3 = 0; l3 < anonL3s && it != anons.end(); ++l3) {
|
for (int l3 = 0; l3 < anonL3s && it != anons.cend(); ++l3) {
|
||||||
if (anonL3s != 1) puts("struct {\n");
|
if (anonL3s != 1) puts("struct {\n");
|
||||||
for (int l2 = 0; l2 < anonL2s && it != anons.end(); ++l2) {
|
for (int l2 = 0; l2 < anonL2s && it != anons.cend(); ++l2) {
|
||||||
if (anonL2s != 1) puts("struct {\n");
|
if (anonL2s != 1) puts("struct {\n");
|
||||||
for (int l1 = 0; l1 < anonL1s && it != anons.end(); ++l1) {
|
for (int l1 = 0; l1 < anonL1s && it != anons.cend(); ++l1) {
|
||||||
if (anonL1s != 1) puts("struct {\n");
|
if (anonL1s != 1) puts("struct {\n");
|
||||||
for (int l0 = 0; l0 < lim && it != anons.end(); ++l0) {
|
for (int l0 = 0; l0 < lim && it != anons.cend(); ++l0) {
|
||||||
const AstVar* varp = *it;
|
const AstVar* varp = *it;
|
||||||
emitVarCmtChg(varp, &curVarCmt);
|
emitVarCmtChg(varp, &curVarCmt);
|
||||||
emitVarDecl(varp, prefixIfImp);
|
emitVarDecl(varp, prefixIfImp);
|
||||||
|
|
|
||||||
|
|
@ -578,7 +578,7 @@ string V3Number::displayed(FileLine* fl, const string& vformat) const {
|
||||||
++pos;
|
++pos;
|
||||||
}
|
}
|
||||||
string fmtsize;
|
string fmtsize;
|
||||||
for (; pos != vformat.end() && (isdigit(pos[0]) || pos[0] == '.'); ++pos) {
|
for (; pos != vformat.cend() && (isdigit(pos[0]) || pos[0] == '.'); ++pos) {
|
||||||
fmtsize += pos[0];
|
fmtsize += pos[0];
|
||||||
}
|
}
|
||||||
string str;
|
string str;
|
||||||
|
|
|
||||||
|
|
@ -1502,9 +1502,9 @@ private:
|
||||||
// to cart around. Just make a few pairs.
|
// to cart around. Just make a few pairs.
|
||||||
auto it = shortestPrereqs.cbegin();
|
auto it = shortestPrereqs.cbegin();
|
||||||
for (unsigned i = 0; exhaustive || (i < 3); ++i) {
|
for (unsigned i = 0; exhaustive || (i < 3); ++i) {
|
||||||
if (it == shortestPrereqs.end()) break;
|
if (it == shortestPrereqs.cend()) break;
|
||||||
LogicMTask* ap = *(it++);
|
LogicMTask* ap = *(it++);
|
||||||
if (it == shortestPrereqs.end()) break;
|
if (it == shortestPrereqs.cend()) break;
|
||||||
LogicMTask* bp = *(it++);
|
LogicMTask* bp = *(it++);
|
||||||
makeSiblingMC(ap, bp);
|
makeSiblingMC(ap, bp);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1011,7 +1011,7 @@ private:
|
||||||
string format = nodep->text();
|
string format = nodep->text();
|
||||||
auto pos = format.cbegin();
|
auto pos = format.cbegin();
|
||||||
bool inPct = false;
|
bool inPct = false;
|
||||||
for (; pos != format.end(); ++pos) {
|
for (; pos != format.cend(); ++pos) {
|
||||||
if (!inPct && pos[0] == '%') {
|
if (!inPct && pos[0] == '%') {
|
||||||
inPct = true;
|
inPct = true;
|
||||||
} else if (!inPct) { // Normal text
|
} else if (!inPct) { // Normal text
|
||||||
|
|
|
||||||
|
|
@ -16,8 +16,7 @@ compile(
|
||||||
verilator_make_cmake => 1,
|
verilator_make_cmake => 1,
|
||||||
);
|
);
|
||||||
|
|
||||||
system("cmake --version");
|
if (!$Self->have_cmake) {
|
||||||
if ($? != 0) {
|
|
||||||
skip("cmake is not installed");
|
skip("cmake is not installed");
|
||||||
} else {
|
} else {
|
||||||
my $cmakecache = $Self->{obj_dir}."/CMakeCache.txt";
|
my $cmakecache = $Self->{obj_dir}."/CMakeCache.txt";
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,7 @@ compile(
|
||||||
($Self->{vltmt} ? ' --threads 6' : '')],
|
($Self->{vltmt} ? ' --threads 6' : '')],
|
||||||
);
|
);
|
||||||
|
|
||||||
system("cmake --version");
|
if (!$Self->have_cmake) {
|
||||||
if ($? != 0) {
|
|
||||||
skip("cmake is not installed");
|
skip("cmake is not installed");
|
||||||
} else {
|
} else {
|
||||||
my $cmakecache = $Self->{obj_dir}."/CMakeCache.txt";
|
my $cmakecache = $Self->{obj_dir}."/CMakeCache.txt";
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue