From 66cae793f7ecb255700224f25ea1157d8208fdd6 Mon Sep 17 00:00:00 2001 From: Marc Pfetsch Date: Sun, 11 Dec 2022 13:23:31 +0100 Subject: [PATCH 1/4] turn on blis by default in makefile --- make/make.project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 0495a535129025b36a209aac25ddfaf2864791bb Mon Sep 17 00:00:00 2001 From: Stefan Vigerske Date: Sun, 11 Dec 2022 15:18:19 +0100 Subject: [PATCH 2/4] include ciso646 header for Windows compiler - to get alternative operator representations working --- src/bliss/include/bliss/defs.hh | 3 +++ src/bliss/include/bliss/utils.hh | 3 +++ 2 files changed, 6 insertions(+) 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 { /** From c69621e42f32f0fb972029aad3b2f8aecb387639 Mon Sep 17 00:00:00 2001 From: Stefan Vigerske Date: Sun, 11 Dec 2022 15:27:35 +0100 Subject: [PATCH 3/4] use SCIPsnprintf instead of snprint - available on all platforms --- src/symmetry/compute_symmetry_bliss.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; } From 10baf531d330c4b53e1e1402a776e7f82da71d61 Mon Sep 17 00:00:00 2001 From: Marc Pfetsch Date: Sun, 11 Dec 2022 17:24:15 +0100 Subject: [PATCH 4/4] add changelog entry --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d49e32af3a..8b32bcf6bd 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 ----------