Fix Travis/GCC warnings.

This commit is contained in:
Wilson Snyder 2020-08-27 18:48:26 -04:00
parent 0397e19726
commit 45eccaecaf
6 changed files with 10 additions and 12 deletions

View File

@ -2890,13 +2890,13 @@ void EmitCStmts::emitSortedVarList(const VarVec& anons, const VarVec& nonanons,
if (anonL1s != 1)
puts("// Anonymous structures to workaround compiler member-count bugs\n");
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");
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");
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");
for (int l0 = 0; l0 < lim && it != anons.end(); ++l0) {
for (int l0 = 0; l0 < lim && it != anons.cend(); ++l0) {
const AstVar* varp = *it;
emitVarCmtChg(varp, &curVarCmt);
emitVarDecl(varp, prefixIfImp);

View File

@ -578,7 +578,7 @@ string V3Number::displayed(FileLine* fl, const string& vformat) const {
++pos;
}
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];
}
string str;

View File

@ -1502,9 +1502,9 @@ private:
// to cart around. Just make a few pairs.
auto it = shortestPrereqs.cbegin();
for (unsigned i = 0; exhaustive || (i < 3); ++i) {
if (it == shortestPrereqs.end()) break;
if (it == shortestPrereqs.cend()) break;
LogicMTask* ap = *(it++);
if (it == shortestPrereqs.end()) break;
if (it == shortestPrereqs.cend()) break;
LogicMTask* bp = *(it++);
makeSiblingMC(ap, bp);
}

View File

@ -1011,7 +1011,7 @@ private:
string format = nodep->text();
auto pos = format.cbegin();
bool inPct = false;
for (; pos != format.end(); ++pos) {
for (; pos != format.cend(); ++pos) {
if (!inPct && pos[0] == '%') {
inPct = true;
} else if (!inPct) { // Normal text

View File

@ -16,8 +16,7 @@ compile(
verilator_make_cmake => 1,
);
system("cmake --version");
if ($? != 0) {
if (!$Self->have_cmake) {
skip("cmake is not installed");
} else {
my $cmakecache = $Self->{obj_dir}."/CMakeCache.txt";

View File

@ -27,8 +27,7 @@ compile(
($Self->{vltmt} ? ' --threads 6' : '')],
);
system("cmake --version");
if ($? != 0) {
if (!$Self->have_cmake) {
skip("cmake is not installed");
} else {
my $cmakecache = $Self->{obj_dir}."/CMakeCache.txt";