Merge branch 'fix-odr-warnings' into 'v100-bugfix'

svigerske · svigerske · commit c35d27286871 · 2025-11-22T16:24:09.000+01:00
fix one-definition-rule warnings

See merge request integer/scip!4074
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -108,13 +108,11 @@ if(LTO)
         message(STATUS "LTO available")
 
         # with link-time optimization enabled, we get additional warnings at link time on
-        # - reader_nl and presol_milp violating the C++ One Definition Rule (-Wodr) due to
-        #   using struct names SCIP_ProbData and SCIP_PresolData that are also used in objscip (C++ interface)
         # - some presumed malloc() calls with size 18446744073709551608 ((uint)-1)
         # - some presumed memmove() calls in boost::container::short_vector via papilo to a 0-length memory
         # we disable these warnings (need to pass them to the compiler when linking)
         if((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "CLANG"))
-           add_link_options(-Wno-odr -Wno-alloc-size-larger-than -Wno-stringop-overflow)
+           add_link_options(-Wno-alloc-size-larger-than -Wno-stringop-overflow)
         endif()
     else(LTO_AVAILABLE)
         message(STATUS "LTO not available: ${output}")
diff --git a/make/make.darwin.gnu b/make/make.darwin.gnu
@@ -29,9 +29,9 @@ ifeq ($(LTO),true)
 
   CFLAGS	+=	$(LTOFLAG) -fno-fat-lto-objects
   CXXFLAGS	+=	$(LTOFLAG) -fno-fat-lto-objects
-  LDFLAGS	+=	$(LTOFLAG) -Wno-stringop-overflow -Wno-alloc-size-larger-than -Wno-odr
+  LDFLAGS	+=	$(LTOFLAG) -Wno-stringop-overflow -Wno-alloc-size-larger-than
 ifeq ($(SHARED),true)
-  LIBBUILDFLAGS +=	$(LTOFLAG) -Wno-stringop-overflow -Wno-alloc-size-larger-than -Wno-odr
+  LIBBUILDFLAGS +=	$(LTOFLAG) -Wno-stringop-overflow -Wno-alloc-size-larger-than
 endif
 endif
 
diff --git a/make/make.linux.gnu b/make/make.linux.gnu
@@ -52,8 +52,8 @@ ifeq ($(LTO),true)
 
   CFLAGS	+=	$(LTOFLAG) -fno-fat-lto-objects
   CXXFLAGS	+=	$(LTOFLAG) -fno-fat-lto-objects
-  LDFLAGS	+=	$(LTOFLAG) -Wno-stringop-overflow -Wno-alloc-size-larger-than -Wno-odr
+  LDFLAGS	+=	$(LTOFLAG) -Wno-stringop-overflow -Wno-alloc-size-larger-than
 ifeq ($(SHARED),true)
-  LIBBUILDFLAGS +=	$(LTOFLAG) -Wno-stringop-overflow -Wno-alloc-size-larger-than -Wno-odr
+  LIBBUILDFLAGS +=	$(LTOFLAG) -Wno-stringop-overflow -Wno-alloc-size-larger-than
 endif
 endif
diff --git a/src/scip/benders_xyz.c b/src/scip/benders_xyz.c
@@ -51,7 +51,9 @@
  * Data structures
  */
 
-/* TODO: fill in the necessary Benders' decomposition data */
+/* TODO: fill in the necessary Benders' decomposition data
+ * when this plugin is written in C++, rename SCIP_BendersData to something unique (C++ One-Definition-Rule)
+ */
 
 /** Benders' decomposition data */
 struct SCIP_BendersData
diff --git a/src/scip/benderscut_xyz.c b/src/scip/benderscut_xyz.c
@@ -45,7 +45,9 @@
  * Data structures
  */
 
-/* TODO: fill in the necessary compression data */
+/* TODO: fill in the necessary compression data
+ * when this plugin is written in C++, rename SCIP_BenderscutData to something unique (C++ One-Definition-Rule)
+ */
 
 /** Benders' decomposition cut data */
 struct SCIP_BenderscutData
diff --git a/src/scip/branch_xyz.c b/src/scip/branch_xyz.c
@@ -46,7 +46,9 @@
  * Data structures
  */
 
-/* TODO: fill in the necessary branching rule data */
+/* TODO: fill in the necessary branching rule data
+ * when this plugin is written in C++, rename SCIP_BranchruleData to something unique (C++ One-Definition-Rule)
+ */
 
 /** branching rule data */
 struct SCIP_BranchruleData
diff --git a/src/scip/compr_xyz.c b/src/scip/compr_xyz.c
@@ -45,7 +45,9 @@
  * Data structures
  */
 
-/* TODO: fill in the necessary compression data */
+/* TODO: fill in the necessary compression data
+ * when this plugin is written in C++, rename SCIP_ComprData to something unique (C++ One-Definition-Rule)
+ */
 
 /** tree compression data */
 struct SCIP_ComprData
diff --git a/src/scip/cons_xyz.c b/src/scip/cons_xyz.c
@@ -73,7 +73,9 @@
  * Data structures
  */
 
-/* TODO: fill in the necessary constraint data */
+/* TODO: fill in the necessary constraint data
+ * when this plugin is written in C++, rename SCIP_ConsData and SCIP_ConshdlrData to something unique (C++ One-Definition-Rule)
+ */
 
 /** constraint data for xyz constraints */
 struct SCIP_ConsData
diff --git a/src/scip/cutsel_xyz.c b/src/scip/cutsel_xyz.c
@@ -44,7 +44,9 @@
  * Data structures
  */
 
-/* TODO: fill in the necessary cut selector data */
+/* TODO: fill in the necessary cut selector data
+ * when this plugin is written in C++, rename SCIP_CutselData to something unique (C++ One-Definition-Rule)
+ */
 
 /** cut selector data */
 struct SCIP_CutselData
diff --git a/src/scip/dialog_xyz.c b/src/scip/dialog_xyz.c
@@ -46,7 +46,9 @@
  * Data structures
  */
 
-/* TODO: fill in the necessary dialog data */
+/* TODO: fill in the necessary dialog data
+ * when this plugin is written in C++, rename SCIP_DialogData to something unique (C++ One-Definition-Rule)
+ */
 
 /** dialog data */
 struct SCIP_DialogData
diff --git a/src/scip/disp_xyz.c b/src/scip/disp_xyz.c
@@ -51,7 +51,9 @@
  * Data structures
  */
 
-/* TODO: fill in the necessary display column data */
+/* TODO: fill in the necessary display column data
+ * when this plugin is written in C++, rename SCIP_DispData to something unique (C++ One-Definition-Rule)
+ */
 
 /** display column data */
 struct SCIP_DispData
diff --git a/src/scip/event_xyz.c b/src/scip/event_xyz.c
@@ -40,7 +40,9 @@
  * Data structures
  */
 
-/* TODO: fill in the necessary event handler data */
+/* TODO: fill in the necessary event handler data
+ * when this plugin is written in C++, rename SCIP_EventhldrData to something unique (C++ One-Definition-Rule)
+ */
 
 /** event handler data */
 struct SCIP_EventhdlrData
diff --git a/src/scip/expr_xyz.c b/src/scip/expr_xyz.c
@@ -42,7 +42,9 @@
  * Data structures
  */
 
-/* TODO: fill in the necessary data */
+/* TODO: fill in the necessary data
+ * when this plugin is written in C++, rename SCIP_ExprhdlrData to something unique (C++ One-Definition-Rule)
+ */
 
 /** expression handler data */
 struct SCIP_ExprhdlrData
diff --git a/src/scip/heur_xyz.c b/src/scip/heur_xyz.c
@@ -50,7 +50,9 @@
  * Data structures
  */
 
-/* TODO: fill in the necessary primal heuristic data */
+/* TODO: fill in the necessary primal heuristic data
+ * when this plugin is written in C++, rename SCIP_HeurData to something unique (C++ One-Definition-Rule)
+ */
 
 /** primal heuristic data */
 struct SCIP_HeurData
diff --git a/src/scip/iisfinder_xyz.c b/src/scip/iisfinder_xyz.c
@@ -45,7 +45,9 @@
  * Data structures
  */
 
-/* TODO: fill in the necessary IIS data */
+/* TODO: fill in the necessary IIS data
+ * when this plugin is written in C++, rename SCIP_IISfinderData to something unique (C++ One-Definition-Rule)
+ */
 
 /** IIS data */
 struct SCIP_IISfinderData
diff --git a/src/scip/nlhdlr_xyz.c b/src/scip/nlhdlr_xyz.c
@@ -42,7 +42,9 @@
  * Data structures
  */
 
-/* TODO: fill in the necessary nonlinear handler data */
+/* TODO: fill in the necessary nonlinear handler data
+ * when this plugin is written in C++, rename SCIP_NlhdlrData and SCIP_NlhdlrExprData to something unique (C++ One-Definition-Rule)
+ */
 
 /** nonlinear handler data */
 struct SCIP_NlhdlrData
diff --git a/src/scip/nlpi_xyz.c b/src/scip/nlpi_xyz.c
@@ -49,14 +49,14 @@
  * Data structures
  */
 
-/* TODO: fill in the necessary NLP solver interface data */
+/* TODO: fill in the necessary NLP solver interface and NLP problem instance data
+ * when this plugin is written in C++, rename SCIP_NlpiData and SCIP_NlpiProblem to something unique (C++ One-Definition-Rule)
+ */
 
 struct SCIP_NlpiData
 {
 };
 
-/* TODO: fill in the necessary NLP problem instance data */
-
 struct SCIP_NlpiProblem
 {
 };
diff --git a/src/scip/nodesel_xyz.c b/src/scip/nodesel_xyz.c
@@ -45,7 +45,9 @@
  * Data structures
  */
 
-/* TODO: fill in the necessary node selector data */
+/* TODO: fill in the necessary node selector data
+ * when this plugin is written in C++, rename SCIP_NodeselData to something unique (C++ One-Definition-Rule)
+ */
 
 /** node selector data */
 struct SCIP_NodeselData
diff --git a/src/scip/presol_milp.cpp b/src/scip/presol_milp.cpp
@@ -160,7 +160,7 @@ SCIP_RETCODE SCIPincludePresolMILP(
  */
 
 /** presolver data */
-struct SCIP_PresolData
+struct SCIP_PresolMilpData
 {
    int lastncols;                            /**< the number of columns from the last call */
    int lastnrows;                            /**< the number of rows from the last call */
@@ -199,6 +199,7 @@ struct SCIP_PresolData
 
    char* filename = NULL;                    /**< filename to store the instance before presolving */
 };
+typedef struct SCIP_PresolMilpData SCIP_PRESOLMILPDATA;
 
 using namespace papilo;
 
@@ -350,7 +351,7 @@ static
 SCIP_RETCODE setupPresolve(
    SCIP*                 scip,               /**< SCIP data structure */
    Presolve<T>&          presolve,           /**< PaPILO's presolve object */
-   SCIP_PRESOLDATA*      data,               /**< presolver data structure */
+   SCIP_PRESOLMILPDATA*  data,               /**< presolver data structure */
    SCIP_Bool             allowconsmodification /**< whether constraint modifications are allowed */
    )
 {
@@ -503,7 +504,7 @@ static
 SCIP_RETCODE performRationalPresolving(
    SCIP*                 scip,               /**< SCIP data structure */
    SCIP_MATRIX*          matrix,             /**< initialized SCIP_MATRIX data structure */
-   SCIP_PRESOLDATA*      data,               /**< plugin specific presol data */
+   SCIP_PRESOLMILPDATA*  data,               /**< plugin specific presol data */
    SCIP_Bool             initialized,        /**< was the matrix initialized */
    int*                  nfixedvars,         /**< store number of fixed variables */
    int*                  naggrvars,          /**< store number of aggregated variables */
@@ -1053,7 +1054,7 @@ static
 SCIP_RETCODE performRealPresolving(
    SCIP*                 scip,               /**< SCIP data structure */
    SCIP_MATRIX*          matrix,             /**< initialized SCIP_MATRIX data structure */
-   SCIP_PRESOLDATA*      data,               /**< plugin specific presol data */
+   SCIP_PRESOLMILPDATA*  data,               /**< plugin specific presol data */
    SCIP_Bool             initialized,        /**< was the matrix initialized */
    int*                  nfixedvars,         /**< store number of fixed variables */
    int*                  naggrvars,          /**< store number of aggregated variables */
@@ -1606,7 +1607,7 @@ SCIP_DECL_PRESOLCOPY(presolCopyMILP)
 static
 SCIP_DECL_PRESOLFREE(presolFreeMILP)
 {  /*lint --e{715}*/
-   SCIP_PRESOLDATA* data = SCIPpresolGetData(presol);
+   SCIP_PRESOLMILPDATA* data = (SCIP_PRESOLMILPDATA*)SCIPpresolGetData(presol);
    assert(data != NULL);
 
    SCIPpresolSetData(presol, NULL);
@@ -1618,7 +1619,7 @@ SCIP_DECL_PRESOLFREE(presolFreeMILP)
 static
 SCIP_DECL_PRESOLINIT(presolInitMILP)
 {  /*lint --e{715}*/
-   SCIP_PRESOLDATA* data = SCIPpresolGetData(presol);
+   SCIP_PRESOLMILPDATA* data = (SCIP_PRESOLMILPDATA*)SCIPpresolGetData(presol);
    assert(data != NULL);
 
    data->lastncols = -1;
@@ -1633,14 +1634,14 @@ static
 SCIP_DECL_PRESOLEXEC(presolExecMILP)
 {  /*lint --e{715}*/
    SCIP_MATRIX* matrix;
-   SCIP_PRESOLDATA* data;
+   SCIP_PRESOLMILPDATA* data;
    SCIP_Bool initialized;
    SCIP_Bool complete;
    SCIP_Bool infeasible;
 
    *result = SCIP_DIDNOTRUN;
 
-   data = SCIPpresolGetData(presol);
+   data = (SCIP_PRESOLMILPDATA*)SCIPpresolGetData(presol);
 
    int nvars = SCIPgetNVars(scip);
    int nconss = SCIPgetNConss(scip);
@@ -1705,7 +1706,7 @@ SCIP_RETCODE SCIPincludePresolMILP(
    SCIP*                 scip                /**< SCIP data structure */
    )
 {
-   SCIP_PRESOLDATA* presoldata;
+   SCIP_PRESOLMILPDATA* presoldata;
    SCIP_PRESOL* presol;
 
 #if defined(PAPILO_VERSION_TWEAK) && PAPILO_VERSION_TWEAK != 0
@@ -1737,7 +1738,7 @@ SCIP_RETCODE SCIPincludePresolMILP(
    /* include presolver */
    SCIP_CALL( SCIPincludePresolBasic(scip, &presol, PRESOL_NAME, PRESOL_DESC, PRESOL_PRIORITY, PRESOL_MAXROUNDS, PRESOL_TIMING,
          presolExecMILP,
-         presoldata) );
+         (SCIP_PRESOLDATA*)presoldata) );
 
    assert(presol != NULL);
 
diff --git a/src/scip/presol_xyz.c b/src/scip/presol_xyz.c
@@ -46,7 +46,9 @@
  * Data structures
  */
 
-/* TODO: fill in the necessary presolver data */
+/* TODO: fill in the necessary presolver data
+ * when this plugin is written in C++, rename SCIP_PresolData to something unique (C++ One-Definition-Rule)
+ */
 
 /** presolver data */
 struct SCIP_PresolData
diff --git a/src/scip/pricer_xyz.c b/src/scip/pricer_xyz.c
@@ -47,7 +47,9 @@
  * Data structures
  */
 
-/* TODO: fill in the necessary variable pricer data */
+/* TODO: fill in the necessary variable pricer data
+ * when this plugin is written in C++, rename SCIP_PricerData to something unique (C++ One-Definition-Rule)
+ */
 
 /** variable pricer data */
 struct SCIP_PricerData
diff --git a/src/scip/prop_xyz.c b/src/scip/prop_xyz.c
@@ -54,7 +54,9 @@
  * Data structures
  */
 
-/* TODO: fill in the necessary propagator data */
+/* TODO: fill in the necessary propagator data
+ * when this plugin is written in C++, rename SCIP_PropData to something unique (C++ One-Definition-Rule)
+ */
 
 /** propagator data */
 struct SCIP_PropData
diff --git a/src/scip/reader_nl.cpp b/src/scip/reader_nl.cpp
diff --git a/src/scip/reader_xyz.c b/src/scip/reader_xyz.c
diff --git a/src/scip/relax_xyz.c b/src/scip/relax_xyz.c
diff --git a/src/scip/sepa_xyz.c b/src/scip/sepa_xyz.c
diff --git a/src/scip/table_xyz.c b/src/scip/table_xyz.c
