minor sync

ortools/constraint_solver/gcc.cc

@@ -22,15 +22,15 @@
 #include "ortools/base/integral_types.h"
 #include "ortools/base/logging.h"
 #include "ortools/base/macros.h"
+#include "ortools/base/stringprintf.h"
 #include "ortools/base/join.h"
-#include "ortools/base/int_type_indexed_vector.h"
 #include "ortools/base/int_type.h"
+#include "ortools/base/int_type_indexed_vector.h"
 #include "ortools/base/map_util.h"
 #include "ortools/base/stl_util.h"
 #include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/constraint_solver/constraint_solveri.h"
 #include "ortools/util/vector_map.h"
-#include "ortools/base/stringprintf.h"
 
 namespace operations_research {
 namespace {

ortools/flatzinc/parser.tab.cc

@@ -1,3 +1,16 @@
+// Copyright 2010-2017 Google
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 /* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison implementation for Yacc-like parsers in C

ortools/flatzinc/parser.yy.cc

@@ -1,3 +1,16 @@
+// Copyright 2010-2017 Google
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #line 2 "./ortools/flatzinc/parser.yy.cc"
 
 #line 4 "./ortools/flatzinc/parser.yy.cc"

ortools/port/file.h

@@ -27,6 +27,8 @@ ::util::Status FileGetContents(absl::string_view file_name, std::string* output)
 
 ::util::Status DeleteFile(absl::string_view file_name);
 
+// Returns true if successful.  Outputs temp file to filename.
+bool PortableTemporaryFile(const char* directory_prefix, std::string* filename_out);
 
 }  // namespace operations_research
 

ortools/port/file_nonport.cc

@@ -26,6 +26,9 @@ ::util::Status FileGetContents(absl::string_view file_name, std::string* output)
   return file::GetContents(file_name, output, file::Defaults());
 }
 
+bool PortableTemporaryFile(const char* directory_prefix, std::string* filename_out) {
+    return false;
+}
 
 ::util::Status DeleteFile(absl::string_view file_name) {
   return file::Delete(file_name, file::Defaults());