Merge branch 'turn_on_bliss_by_default_in_makefile' into 'v80-bugfix'

turn on bliss by default in makefile See merge request integer/scip!2962
scipopt · Dec 13, 2022 · 62fab8a · 62fab8a
2 parents 640603d + 10baf53
commit 62fab8a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -25,6 +25,8 @@ Build system
 
 ### Makefile
 
+- Use SYM=bliss by default, since bliss now is shipped with SCIP.
+
 Fixed bugs
 ----------
 

diff --git a/make/make.project b/make/make.project
@@ -101,7 +101,7 @@ OPT		=	opt
 COMP		=	gnu
 LPS		=	spx2
 TPI		=	none
-SYM		=	none
+SYM		=	bliss
 PAPILO		=	false
 STATICLIBEXT	=	a
 SHAREDLIBEXT	=	so

diff --git a/src/bliss/include/bliss/defs.hh b/src/bliss/include/bliss/defs.hh
@@ -22,6 +22,9 @@
 #include <cassert>
 #include <cstdarg>
 
+//SV https://en.cppreference.com/w/cpp/language/operator_alternative
+#include <ciso646>
+
 /** \file
  * \brief Some common definitions.
  */

diff --git a/src/bliss/include/bliss/utils.hh b/src/bliss/include/bliss/utils.hh
@@ -27,6 +27,9 @@
 #include <vector>
 #include <cstdio>
 
+//SV https://en.cppreference.com/w/cpp/language/operator_alternative
+#include <ciso646>
+
 namespace bliss {
 
 /**

diff --git a/src/symmetry/compute_symmetry_bliss.cpp b/src/symmetry/compute_symmetry_bliss.cpp
@@ -971,9 +971,9 @@ initStaticBlissName( )
 {
    blissname = new char[100];
 #ifdef BLISS_PATCH_PRESENT
-   (void) snprintf(blissname, 100, "bliss %sp", bliss::version);
+   (void) SCIPsnprintf(blissname, 100, "bliss %sp", bliss::version);
 #else
-   (void) snprintf(blissname, 100, "bliss %s", bliss::version);
+   (void) SCIPsnprintf(blissname, 100, "bliss %s", bliss::version);
 #endif
    return blissname;
 }