Backport from g3 to github

ortools/algorithms/csharp/knapsack_solver.i

@@ -39,4 +39,6 @@ typedef uint64_t uint64;
 %rename (UseReduction) operations_research::KnapsackSolver::use_reduction;
 %rename (SetUseReduction) operations_research::KnapsackSolver::set_use_reduction;
 
+// TODO(user): Replace with %ignoreall/%unignoreall
+//swiglint: disable include-h-allglobals
 %include "ortools/algorithms/knapsack_solver.h"

ortools/base/base.i

@@ -10,6 +10,7 @@
 // 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.
+
 %{
 #include <cstdint>
 #include <string>

ortools/com/google/ortools/constraintsolver/IntIntToLongFunction.java

@@ -25,12 +25,12 @@
  */
 @FunctionalInterface
 public interface IntIntToLongFunction {
-    /**
-     * Applies this function to the given arguments.
-     *
-     * @param left the first argument
-     * @param right the second argument
-     * @return the function result
-     */
-    long applyAsLong(int left, int right);
+  /**
+   * Applies this function to the given arguments.
+   *
+   * @param left the first argument
+   * @param right the second argument
+   * @return the function result
+   */
+  long applyAsLong(int left, int right);
 }

ortools/com/google/ortools/constraintsolver/LongTernaryOperator.java

@@ -25,13 +25,13 @@
  */
 @FunctionalInterface
 public interface LongTernaryOperator {
-    /**
-     * Applies this operator to the given operands.
-     *
-     * @param left the first operand
-     * @param center the second operand
-     * @param right the third operand
-     * @return the operator result
-     */
-    long applyAsLong(long left, long center, long right);
+  /**
+   * Applies this operator to the given operands.
+   *
+   * @param left the first operand
+   * @param center the second operand
+   * @param right the third operand
+   * @return the operator result
+   */
+  long applyAsLong(long left, long center, long right);
 }

ortools/com/google/ortools/constraintsolver/LongTernaryPredicate.java

@@ -24,25 +24,25 @@
  */
 @FunctionalInterface
 public interface LongTernaryPredicate {
-    /**
-     * Evaluates this predicate on the given arguments.
-     *
-     * @param left the first operand
-     * @param center the second operand
-     * @param right the third operand
-     * @return {@code true} if the input argument matches the predicate,
-     * otherwise {@code false}
-     */
-    boolean test(long left, long center, long right);
+  /**
+   * Evaluates this predicate on the given arguments.
+   *
+   * @param left the first operand
+   * @param center the second operand
+   * @param right the third operand
+   * @return {@code true} if the input argument matches the predicate,
+   * otherwise {@code false}
+   */
+  boolean test(long left, long center, long right);
 
-    /**
-     * Returns a predicate that represents the logical negation of this
-     * predicate.
-     *
-     * @return a predicate that represents the logical negation of this
-     * predicate
-     */
-    default LongTernaryPredicate negate() {
-        return (left, center, right) -> !test(left, center, right);
-    }
+  /**
+   * Returns a predicate that represents the logical negation of this
+   * predicate.
+   *
+   * @return a predicate that represents the logical negation of this
+   * predicate
+   */
+  default LongTernaryPredicate negate() {
+    return (left, center, right) -> !test(left, center, right);
+  }
 }

ortools/constraint_solver/csharp/IntArrayHelper.cs

@@ -105,7 +105,7 @@ public static implicit operator CpIntVectorVector(int[,] inVal) {
     return outVal;
   }
 
-  // cast from C# int[][] two-dimensional rray
+  // cast from C# int[][] two-dimensional array
   public static implicit operator CpIntVectorVector(int[][] inVal) {
     int x_size = inVal.GetLength(0);
     CpIntVectorVector outVal = new CpIntVectorVector();
@@ -173,7 +173,7 @@ public static implicit operator CpInt64VectorVector(long[,] inVal) {
     return outVal;
   }
 
-  // cast from C# long[][] two-dimensional rray
+  // cast from C# long[][] two-dimensional array
   public static implicit operator CpInt64VectorVector(long[][] inVal) {
     int x_size = inVal.GetLength(0);
     CpInt64VectorVector outVal = new CpInt64VectorVector();

ortools/constraint_solver/csharp/constraint_solver.i

@@ -238,39 +238,6 @@ DEFINE_ARGS_TO_R_CALLBACK(
 #undef DEFINE_ARGS_TO_R_CALLBACK
 #undef DEFINE_VOID_TO_STRING_CALLBACK
 
-// Convert in module_csharp_wrap.cc input argument (delegate marshaled in C function pointer) to original std::function<...>
-//%typemap(in) Solver::DisplayCallback  %{
-//  $1 = [$input]() -> std::string {
-//    std::string result;
-//    return result.assign((*(char* (*)())$input)());
-//    };
-//%}
-//
-//%typemap(in) Solver::IndexEvaluator1  %{
-//  $1 = [$input](int64 u) -> int64 {
-//    return (*(int64 (*)(int64))$input)(u);
-//    };
-//%}
-//%typemap(in) Solver::IndexEvaluator2  %{
-//  $1 = [$input](int64 u, int64 v) -> int64 {
-//    return (*(int64 (*)(int64, int64))$input)(u, v);};
-//%}
-//%typemap(in) Solver::IndexEvaluator3  %{
-//  $1 = [$input](int64 u, int64 v, int64 w) -> int64 {
-//    return (*(int64 (*)(int64, int64, int64))$input)(u, v, w);};
-//%}
-//
-//%typemap(in) Solver::IndexFilter1  %{
-//  $1 = [$input](int64 u) -> bool {
-//    return (*(bool (*)(int64))$input)(u);};
-//%}
-//%typemap(in) Solver::ObjectiveWatcher %{
-//  $1 = [$input](int64 u) -> void {
-//    return (*(void (*)(int64))$input)(u);};
-//%}
-
-
-
 // Renaming
 namespace operations_research {