diff --git a/CHANGELOG b/CHANGELOG index 9c123ce47e..6107c29055 100644 --- 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 index cb0069520f..8f2ff8377f 100644 --- 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 index 17b76f3789..304616e6a9 100644 --- a/src/bliss/include/bliss/defs.hh +++ b/src/bliss/include/bliss/defs.hh @@ -22,6 +22,9 @@ #include #include +//SV https://en.cppreference.com/w/cpp/language/operator_alternative +#include + /** \file * \brief Some common definitions. */ diff --git a/src/bliss/include/bliss/utils.hh b/src/bliss/include/bliss/utils.hh index f162745bc2..40b3f924be 100644 --- a/src/bliss/include/bliss/utils.hh +++ b/src/bliss/include/bliss/utils.hh @@ -27,6 +27,9 @@ #include #include +//SV https://en.cppreference.com/w/cpp/language/operator_alternative +#include + namespace bliss { /** diff --git a/src/symmetry/compute_symmetry_bliss.cpp b/src/symmetry/compute_symmetry_bliss.cpp index aa06c51455..203a64a384 100644 --- 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; }