From b7cdd1a06122a99458b95cbd91a1f0fb663eff67 Mon Sep 17 00:00:00 2001 From: John Fultz Date: Sat, 30 Aug 2014 19:00:37 -0500 Subject: Fix compiler warnings. --- makegaddag/makegaddag.cpp | 12 ++++++------ makeminidawg/minidawgmaker.cpp | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/makegaddag/makegaddag.cpp b/makegaddag/makegaddag.cpp index 0d31315..d172ba7 100644 --- a/makegaddag/makegaddag.cpp +++ b/makegaddag/makegaddag.cpp @@ -63,11 +63,11 @@ void Node::print(Quackle::LetterString prefix) { children[children.size() - 1].lastchild = true; } - for (int i = 0; i < children.size(); i++) { + for (size_t i = 0; i < children.size(); i++) { nodelist.push_back(&children[i]); } - for (int i = 0; i < children.size(); i++) { + for (size_t i = 0; i < children.size(); i++) { children[i].print(prefix + children[i].c); } } @@ -84,7 +84,7 @@ void Node::pushword(Quackle::LetterString word) { // cout << "first: " << first << ", rest: " << rest << endl; - for (int i = 0; i < children.size(); i++) { + for (size_t i = 0; i < children.size(); i++) { if (children[i].c == first) { index = i; i = children.size(); @@ -185,7 +185,7 @@ int main(int argc, char **argv) ++encodableWords; - for (int i = 1; i <= encodedWord.length(); i++) { + for (unsigned i = 1; i <= encodedWord.length(); i++) { Quackle::LetterString newword; for (int j = i - 1; j >= 0; j--) { @@ -194,7 +194,7 @@ int main(int argc, char **argv) if (i < encodedWord.length()) { newword.push_back(internalSeparatorRepresentation); // "^" - for (int j = i; j < encodedWord.length(); j++) { + for (unsigned j = i; j < encodedWord.length(); j++) { newword.push_back(encodedWord[j]); } } @@ -226,7 +226,7 @@ int main(int argc, char **argv) ofstream out(QuackleIO::Util::qstringToStdString(outputFilename).c_str(), ios::out | ios::binary); - for (int i = 0; i < nodelist.size(); i++) { + for (size_t i = 0; i < nodelist.size(); i++) { // UVcout << nodelist[i]->c << " " << nodelist[i]->pointer << " " << nodelist[i]->t << " " << nodelist[i]->lastchild << endl; unsigned int p = (unsigned int)(nodelist[i]->pointer); diff --git a/makeminidawg/minidawgmaker.cpp b/makeminidawg/minidawgmaker.cpp index 1d57dc6..50d7ece 100644 --- a/makeminidawg/minidawgmaker.cpp +++ b/makeminidawg/minidawgmaker.cpp @@ -514,4 +514,5 @@ int MiniDawgMaker::executeFromArguments() bytes[4] = n5; bytes[5] = n6; bytes[6] = n7; out.write(bytes, 7); } + return 0; } -- cgit v1.2.3