Merge remote-tracking branch 'origin/v80-bugfix'

scipopt · Oct 27, 2023 · ba2af0e · ba2af0e
2 parents 12ee30e + 738df7f
commit ba2af0e
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 20 deletions.
diff --git a/applications/Coloring/CMakeLists.txt b/applications/Coloring/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.9)
 
 project(Coloring)
 

diff --git a/applications/CycleClustering/CMakeLists.txt b/applications/CycleClustering/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.9)
 
 project(CycleClustering)
 

diff --git a/applications/MinIISC/CMakeLists.txt b/applications/MinIISC/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.9)
 
 project(MinIISC)
 

diff --git a/applications/Ringpacking/CMakeLists.txt b/applications/Ringpacking/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.9)
 
 project(Rinpacking)
 

diff --git a/applications/Scheduler/CMakeLists.txt b/applications/Scheduler/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.9)
 
 project(Scheduler)
 

diff --git a/examples/Binpacking/CMakeLists.txt b/examples/Binpacking/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.9)
 
 project(Binpacking)
 

diff --git a/examples/CallableLibrary/CMakeLists.txt b/examples/CallableLibrary/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.9)
 
 project(CallableLibrary)
 include(CTest)

diff --git a/examples/Eventhdlr/CMakeLists.txt b/examples/Eventhdlr/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.9)
 
 project(Eventhdlr)
 

diff --git a/examples/GMI/CMakeLists.txt b/examples/GMI/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.9)
 
 project(GMI)
 

diff --git a/examples/LOP/CMakeLists.txt b/examples/LOP/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.9)
 
 project(LOP)
 include(CTest)

diff --git a/examples/MIPSolver/CMakeLists.txt b/examples/MIPSolver/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.9)
 
 project(MIPSolver)
 

diff --git a/examples/Queens/CMakeLists.txt b/examples/Queens/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.9)
 
 project(Queens)
 

diff --git a/examples/Relaxator/CMakeLists.txt b/examples/Relaxator/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.9)
 
 project(Relaxator)
 

diff --git a/examples/SCFLP/CMakeLists.txt b/examples/SCFLP/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.9)
 
 project(SCFLP)
 

diff --git a/examples/Sudoku/CMakeLists.txt b/examples/Sudoku/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.9)
 
 project(Sudoku)
 

diff --git a/examples/TSP/CMakeLists.txt b/examples/TSP/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.9)
 
 project(TSP)
 

diff --git a/examples/VRP/CMakeLists.txt b/examples/VRP/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.9)
 
 project(VRP)
 

diff --git a/src/bliss/CMakeLists.txt b/src/bliss/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.9)
 
 if(${CMAKE_VERSION} VERSION_LESS "3.12")
   project(

diff --git a/src/scip/cons_nonlinear.c b/src/scip/cons_nonlinear.c
@@ -142,7 +142,7 @@ typedef struct
 {
    SCIP_NLHDLR*          nlhdlr;             /**< nonlinear handler */
    SCIP_NLHDLREXPRDATA*  nlhdlrexprdata;     /**< data of nonlinear handler */
-   SCIP_NLHDLR_METHOD nlhdlrparticipation; /**< methods where nonlinear handler participates */
+   SCIP_NLHDLR_METHOD    nlhdlrparticipation;/**< methods where nonlinear handler participates */
    SCIP_Bool             issepainit;         /**< was the initsepa callback of nlhdlr called */
    SCIP_Real             auxvalue;           /**< auxiliary value of expression w.r.t. currently enforced solution */
    SCIP_Bool             sepabelowusesactivity;/**< whether sepabelow uses activity of some expression */
@@ -12849,7 +12849,7 @@ SCIP_RETCODE SCIPregisterExprUsageNonlinear(
    }
 
    /* increase the nactivityusedsepa counter for all variables used in the given expression */
-   if(( useactivityforsepabelow || useactivityforsepaabove) && SCIPexprGetNChildren(expr) > 0 )
+   if( (useactivityforsepabelow || useactivityforsepaabove) && SCIPexprGetNChildren(expr) > 0 )
    {
       SCIP_EXPRITER* it;