Changes for #inclusivefixit.
Test: treehugger
Change-Id: I7ff0496c5c2792a41781e74634247f55b0548213
diff --git a/tools/versioner/src/Preprocessor.cpp b/tools/versioner/src/Preprocessor.cpp
index 7a5b502..eb88c46 100644
--- a/tools/versioner/src/Preprocessor.cpp
+++ b/tools/versioner/src/Preprocessor.cpp
@@ -237,7 +237,7 @@
return "("s + Join(expressions, ") || (") + ")";
}
-// Assumes that nothing crazy is happening (e.g. having the semicolon be in a macro)
+// Assumes that nothing weird is happening (e.g. having the semicolon be in a macro).
static FileLocation findNextSemicolon(const std::deque<std::string>& lines, FileLocation start) {
unsigned current_line = start.line;
unsigned current_column = start.column;
@@ -373,8 +373,8 @@
guard_map.erase(current);
guard_map.erase(next);
- bool dummy;
- std::tie(current, dummy) = guard_map.insert(std::make_pair(merged, avail));
+ bool unused;
+ std::tie(current, unused) = guard_map.insert(std::make_pair(merged, avail));
next = current;
++next;
}