Fixed error with Rice 4.5 - resolves #70

Author: ankane

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.14.2 (unreleased)
+
+- Fixed error with Rice 4.5
+
 ## 0.14.1 (2024-12-04)
 
 - Added support for parameters to `Solver`

ext/or-tools/bin_packing.cpp

@@ -23,6 +23,11 @@ namespace Rice::detail
   class From_Ruby<KnapsackSolver::SolverType>
   {
   public:
+    Convertible is_convertible(VALUE value)
+    {
+      return Convertible::Cast;
+    }
+
     KnapsackSolver::SolverType convert(VALUE x)
     {
       auto s = Symbol(x).str();

ext/or-tools/constraint.cpp

@@ -42,6 +42,11 @@ namespace Rice::detail
   class From_Ruby<LinearExpr>
   {
   public:
+    Convertible is_convertible(VALUE value)
+    {
+      return Convertible::Cast;
+    }
+
     LinearExpr convert(VALUE v)
     {
       LinearExpr expr;

ext/or-tools/extconf.rb

@@ -9,7 +9,7 @@
 $CXXFLAGS << " -Wno-sign-compare -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-missing-field-initializers"
 
 # hide Rice warnings
-$CXXFLAGS << " -Wno-implicit-fallthrough"
+$CXXFLAGS << " -Wno-unused-private-field -Wno-implicit-fallthrough"
 
 inc, lib = dir_config("or-tools")
 if inc || lib

ext/or-tools/linear.cpp

@@ -29,6 +29,11 @@ namespace Rice::detail
   template<>
   struct From_Ruby<MPSolver::OptimizationProblemType>
   {
+    Convertible is_convertible(VALUE value)
+    {
+      return Convertible::Cast;
+    }
+
     static MPSolver::OptimizationProblemType convert(VALUE x)
     {
       auto s = Symbol(x).str();

ext/or-tools/math_opt.cpp

@@ -29,6 +29,11 @@ namespace Rice::detail
   template<>
   struct From_Ruby<SolverType>
   {
+    Convertible is_convertible(VALUE value)
+    {
+      return Convertible::Cast;
+    }
+
     static SolverType convert(VALUE x)
     {
       auto s = Symbol(x).str();

ext/or-tools/routing.cpp

@@ -38,6 +38,11 @@ namespace Rice::detail
   class From_Ruby<RoutingNodeIndex>
   {
   public:
+    Convertible is_convertible(VALUE value)
+    {
+      return Convertible::Cast;
+    }
+
     RoutingNodeIndex convert(VALUE x)
     {
       const RoutingNodeIndex index{From_Ruby<int>().convert(x)};
@@ -285,7 +290,7 @@ void init_routing(Rice::Module& m) {
   Rice::define_class_under<RoutingModel::ResourceGroup>(m, "ResourceGroup");
 
   Rice::define_class_under<RoutingModel>(m, "RoutingModel")
-    .define_constructor(Rice::Constructor<RoutingModel, RoutingIndexManager, RoutingModelParameters>(), Rice::Arg("index_manager"), Rice::Arg("parameters") = operations_research::DefaultRoutingModelParameters())
+    .define_constructor(Rice::Constructor<RoutingModel, RoutingIndexManager, RoutingModelParameters>(), Rice::Arg("_index_manager"), Rice::Arg("_parameters") = operations_research::DefaultRoutingModelParameters())
     .define_method("register_unary_transit_vector", &RoutingModel::RegisterUnaryTransitVector)
     .define_method(
       "register_unary_transit_callback",
@@ -300,7 +305,7 @@ void init_routing(Rice::Module& m) {
             return Rice::detail::From_Ruby<int64_t>().convert(callback.call("call", from_index));
           }
         );
-      }, Rice::Arg("callback").keepAlive())
+      }, Rice::Arg("_callback").keepAlive())
     .define_method("register_transit_matrix", &RoutingModel::RegisterTransitMatrix)
     .define_method(
       "register_transit_callback",
@@ -315,7 +320,7 @@ void init_routing(Rice::Module& m) {
             return Rice::detail::From_Ruby<int64_t>().convert(callback.call("call", from_index, to_index));
           }
         );
-      }, Rice::Arg("callback").keepAlive())
+      }, Rice::Arg("_callback").keepAlive())
     .define_method("add_dimension", &RoutingModel::AddDimension)
     .define_method("add_dimension_with_vehicle_transits", &RoutingModel::AddDimensionWithVehicleTransits)
     .define_method("add_dimension_with_vehicle_capacity", &RoutingModel::AddDimensionWithVehicleCapacity)
@@ -332,7 +337,7 @@ void init_routing(Rice::Module& m) {
     .define_method("add_resource_group", &RoutingModel::AddResourceGroup)
     .define_method("dimension_resource_group_indices", &RoutingModel::GetDimensionResourceGroupIndices)
     .define_method("dimension_resource_group_index", &RoutingModel::GetDimensionResourceGroupIndex)
-    .define_method("add_disjunction", &RoutingModel::AddDisjunction, Rice::Arg("indices"), Rice::Arg("penalty"), Rice::Arg("max_cardinality") = (int64_t)1)
+    .define_method("add_disjunction", &RoutingModel::AddDisjunction, Rice::Arg("_indices"), Rice::Arg("_penalty"), Rice::Arg("_max_cardinality") = (int64_t)1)
     .define_method("disjunction_indices", &RoutingModel::GetDisjunctionIndices)
     .define_method("disjunction_penalty", &RoutingModel::GetDisjunctionPenalty)
     .define_method("disjunction_max_cardinality", &RoutingModel::GetDisjunctionMaxCardinality)

or-tools.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 3.1"
 
-  spec.add_dependency "rice", ">= 4.3.3"
+  spec.add_dependency "rice", ">= 4.5"
 end