flatzinc: sync

ortools/flatzinc/fz.cc

@@ -102,7 +102,7 @@ std::vector<char*> FixAndParseParameters(int* argc, char*** argv) {
     }
     if (strcmp((*argv)[i], "-v") == 0) {
       (*argv)[i] = logging_param;
-    }    
+    }
   }
   const char kUsage[] =
       "Usage: see flags.\nThis program parses and solve a flatzinc problem.";

ortools/flatzinc/mznlib/redefinitions-2.0.mzn

@@ -98,5 +98,3 @@ predicate int_lin_ne_imp(array [int] of int: as, array [int] of var int: bs,
                          int: c, var bool: r);
 
 annotation warm_start_array( array[int] of ann: w );
-
-

ortools/flatzinc/ortools.msc.in

@@ -6,11 +6,9 @@
   "mznlib": "../ortools",
   "executable": "@FZ_REL_INSTALL_BINARY@",
   "tags": ["ortools", "cp", "lcg", "float", "int"],
-  "stdFlags": ["-a","-f","-n","-p","-r","-s","-v"],
+  "stdFlags": ["-a","-f","-n","-p","-r","-s","-v","-l"],
   "extraFlags": [
     ["--cp_model_params", "Provide parameters interpreted as a text SatParameters proto", "string", ""],
-    ["--fz_floats_are_ints", "Interpret floats as integers", "bool:false:true", "true"],
-    ["-l", "Print logging information", "bool", "false"]
   ],
   "supportsMzn": false,
   "supportsFzn": true,