Merge "Fix out-of-bounds deque access causing build failure."

2017-08-18 01:55:39 +00:00 · 2017-08-18 01:55:39 +00:00 · ad5c4e3596
parent cf3b0c183d 113e9b1bc1
commit ad5c4e3596
1 changed files with 1 additions and 1 deletions
--- a/tools/versioner/src/Preprocessor.cpp
+++ b/tools/versioner/src/Preprocessor.cpp
@ -300,7 +300,7 @@ static void mergeGuards(std::deque<std::string>& file_lines, GuardMap& guard_map
    };

    auto nextCol = [&file_lines, &current_location, &nextLine]() {
-      if (current_location.column == file_lines[current_location.column - 1].length()) {
+      if (current_location.column == file_lines[current_location.line - 1].length()) {
        nextLine();
      } else {
        ++current_location.column;