add #define EIGEN_MPL2_ONLY everywhere, fix #3979

google · Nov 9, 2023 · 38dff7f · 38dff7f
1 parent 0557eae
commit 38dff7f
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 0 deletions.
diff --git a/ortools/linear_solver/python/model_builder_helper.cc b/ortools/linear_solver/python/model_builder_helper.cc
@@ -26,6 +26,7 @@
 #include <utility>
 #include <vector>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "Eigen/SparseCore"
 #include "absl/log/check.h"

diff --git a/ortools/pdlp/iteration_stats.cc b/ortools/pdlp/iteration_stats.cc
@@ -22,6 +22,7 @@
 #include <utility>
 #include <vector>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "Eigen/SparseCore"
 #include "absl/log/check.h"

diff --git a/ortools/pdlp/iteration_stats_test.cc b/ortools/pdlp/iteration_stats_test.cc
@@ -17,6 +17,7 @@
 #include <optional>
 #include <utility>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"

diff --git a/ortools/pdlp/primal_dual_hybrid_gradient.cc b/ortools/pdlp/primal_dual_hybrid_gradient.cc
@@ -25,6 +25,7 @@
 #include <utility>
 #include <vector>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "Eigen/SparseCore"
 #include "absl/algorithm/container.h"

diff --git a/ortools/pdlp/primal_dual_hybrid_gradient.h b/ortools/pdlp/primal_dual_hybrid_gradient.h
@@ -18,6 +18,7 @@
 #include <functional>
 #include <optional>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "ortools/lp_data/lp_data.h"
 #include "ortools/pdlp/quadratic_program.h"

diff --git a/ortools/pdlp/primal_dual_hybrid_gradient_test.cc b/ortools/pdlp/primal_dual_hybrid_gradient_test.cc
@@ -25,6 +25,7 @@
 #include <utility>
 #include <vector>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "Eigen/SparseCore"
 #include "absl/container/flat_hash_map.h"

diff --git a/ortools/pdlp/quadratic_program.cc b/ortools/pdlp/quadratic_program.cc
@@ -21,6 +21,7 @@
 #include <tuple>
 #include <vector>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "Eigen/SparseCore"
 #include "absl/log/check.h"

diff --git a/ortools/pdlp/quadratic_program.h b/ortools/pdlp/quadratic_program.h
@@ -21,6 +21,7 @@
 #include <utility>
 #include <vector>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "Eigen/SparseCore"
 #include "absl/status/status.h"

diff --git a/ortools/pdlp/quadratic_program_io.cc b/ortools/pdlp/quadratic_program_io.cc
@@ -21,6 +21,7 @@
 #include <utility>
 #include <vector>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "Eigen/SparseCore"
 #include "absl/base/casts.h"

diff --git a/ortools/pdlp/quadratic_program_test.cc b/ortools/pdlp/quadratic_program_test.cc
@@ -21,6 +21,7 @@
 #include <utility>
 #include <vector>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "Eigen/SparseCore"
 #include "absl/status/status.h"

diff --git a/ortools/pdlp/sharded_optimization_utils.cc b/ortools/pdlp/sharded_optimization_utils.cc
@@ -22,6 +22,7 @@
 #include <utility>
 #include <vector>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "Eigen/SparseCore"
 #include "absl/log/check.h"

diff --git a/ortools/pdlp/sharded_optimization_utils_test.cc b/ortools/pdlp/sharded_optimization_utils_test.cc
@@ -20,6 +20,7 @@
 #include <utility>
 #include <vector>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "Eigen/SparseCore"
 #include "gmock/gmock.h"

diff --git a/ortools/pdlp/sharded_quadratic_program.cc b/ortools/pdlp/sharded_quadratic_program.cc
@@ -18,6 +18,7 @@
 #include <optional>
 #include <utility>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "Eigen/SparseCore"
 #include "absl/log/check.h"

diff --git a/ortools/pdlp/sharded_quadratic_program_test.cc b/ortools/pdlp/sharded_quadratic_program_test.cc
@@ -16,6 +16,7 @@
 #include <limits>
 #include <optional>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"

diff --git a/ortools/pdlp/sharder.cc b/ortools/pdlp/sharder.cc
@@ -19,6 +19,7 @@
 #include <functional>
 #include <vector>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "Eigen/SparseCore"
 #include "absl/log/check.h"

diff --git a/ortools/pdlp/sharder_test.cc b/ortools/pdlp/sharder_test.cc
@@ -20,6 +20,7 @@
 #include <random>
 #include <vector>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "Eigen/SparseCore"
 #include "absl/random/distributions.h"

diff --git a/ortools/pdlp/test_util.cc b/ortools/pdlp/test_util.cc
@@ -19,6 +19,7 @@
 #include <string>
 #include <vector>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "Eigen/SparseCore"
 #include "gmock/gmock.h"

diff --git a/ortools/pdlp/test_util_test.cc b/ortools/pdlp/test_util_test.cc
@@ -19,6 +19,7 @@
 #include <list>
 #include <vector>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "absl/log/check.h"
 #include "absl/types/span.h"

diff --git a/ortools/pdlp/trust_region.cc b/ortools/pdlp/trust_region.cc
@@ -21,6 +21,7 @@
 #include <utility>
 #include <vector>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "absl/log/check.h"
 #include "ortools/base/logging.h"

diff --git a/ortools/pdlp/trust_region.h b/ortools/pdlp/trust_region.h
@@ -20,6 +20,7 @@
 #include <limits>
 #include <vector>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "absl/algorithm/container.h"
 #include "absl/log/check.h"

diff --git a/ortools/pdlp/trust_region_test.cc b/ortools/pdlp/trust_region_test.cc
@@ -20,6 +20,7 @@
 #include <tuple>
 #include <vector>
 
+#define EIGEN_MPL2_ONLY
 #include "Eigen/Core"
 #include "Eigen/SparseCore"
 #include "absl/strings/str_cat.h"