Sync google/github

ortools/base/filelineiter.h

@@ -25,6 +25,9 @@
 #ifndef OR_TOOLS_UTIL_FILELINEITER_H_
 #define OR_TOOLS_UTIL_FILELINEITER_H_
 
+#include <algorithm>
+#include <string>
+
 #include "absl/strings/match.h"
 #include "ortools/base/file.h"
 #include "ortools/base/logging.h"

ortools/constraint_solver/samples/nqueens_cp.py

@@ -79,8 +79,8 @@ def main(board_size):
 
 if __name__ == '__main__':
     # By default, solve the 8x8 problem.
-    board_size = 8
+    size = 8
     if len(sys.argv) > 1:
-        board_size = int(sys.argv[1])
-    main(board_size)
+        size = int(sys.argv[1])
+    main(size)
 # [END program]