From 8a8b3d058ae33f5391deb21e1ed575325634a0ff Mon Sep 17 00:00:00 2001 From: "Maxie D. Schmidt" Date: Wed, 7 Oct 2020 21:17:22 -0400 Subject: [PATCH] Adding the initial source code changes needed to compile on recent RH Linux --- iB4e/CGAL/Regular_complex_d.h | 4 ++-- src/bin-findmfe.cc | 1 - src/bin-parametrizer.cc | 1 - src/bin-scorer.cc | 1 - src/bin-subopt.cc | 1 - src/bin-tests.cc | 1 - src/nntm-energy.cc | 1 - src/nntm-scoring.cc | 1 - src/nntm-subopt.cc | 1 - src/nntm-traceback.cc | 1 - src/rna_polytope.cc | 1 - 11 files changed, 2 insertions(+), 12 deletions(-) diff --git a/iB4e/CGAL/Regular_complex_d.h b/iB4e/CGAL/Regular_complex_d.h index 936641c6..430918fd 100644 --- a/iB4e/CGAL/Regular_complex_d.h +++ b/iB4e/CGAL/Regular_complex_d.h @@ -92,7 +92,7 @@ class RC_vertex_d void* pp; void* for_compact_container() const { return pp; } - void* & for_compact_container() { return pp; } + void* & for_compact_container(void *ppPtr) { pp = ppPtr; return pp; } #ifdef CGAL_USE_LEDA LEDA_MEMORY(RC_vertex_d) @@ -162,7 +162,7 @@ class RC_simplex_d void* pp; void* for_compact_container() const { return pp; } - void* & for_compact_container() { return pp; } + void* & for_compact_container(void *ppPtr) { pp = ppPtr; return pp; } // ----- Added for iB4e bool& is_confirmed() { return confirmed_; }; diff --git a/src/bin-findmfe.cc b/src/bin-findmfe.cc index 29641a52..c421d679 100644 --- a/src/bin-findmfe.cc +++ b/src/bin-findmfe.cc @@ -10,7 +10,6 @@ #include "boost/filesystem.hpp" #include "boost/program_options.hpp" -#define BOOST_LOG_DYN_LINK 1 // Fix an issue with dynamic library loading #include #include #include diff --git a/src/bin-parametrizer.cc b/src/bin-parametrizer.cc index ddb20e67..9852f499 100644 --- a/src/bin-parametrizer.cc +++ b/src/bin-parametrizer.cc @@ -12,7 +12,6 @@ #include "boost/filesystem.hpp" #include "boost/program_options.hpp" -#define BOOST_LOG_DYN_LINK 1 // Fix an issue with dynamic library loading #include #include #include diff --git a/src/bin-scorer.cc b/src/bin-scorer.cc index 0df233aa..54774da1 100644 --- a/src/bin-scorer.cc +++ b/src/bin-scorer.cc @@ -12,7 +12,6 @@ #include "boost/filesystem.hpp" #include "boost/program_options.hpp" -#define BOOST_LOG_DYN_LINK 1 // Fix an issue with dynamic library loading #include #include #include diff --git a/src/bin-subopt.cc b/src/bin-subopt.cc index db4ae54b..2ea2781a 100644 --- a/src/bin-subopt.cc +++ b/src/bin-subopt.cc @@ -12,7 +12,6 @@ #include "subopt.h" #include "rational.h" -#define BOOST_LOG_DYN_LINK 1 // Fix an issue with dynamic library loading #include #include #include diff --git a/src/bin-tests.cc b/src/bin-tests.cc index bf41d678..ee41d7d5 100644 --- a/src/bin-tests.cc +++ b/src/bin-tests.cc @@ -8,7 +8,6 @@ #define CATCH_CONFIG_RUNNER #include "catch.hpp" -#define BOOST_LOG_DYN_LINK 1 // Fix an issue with dynamic library loading #include #include #include diff --git a/src/nntm-energy.cc b/src/nntm-energy.cc index 39e14b31..f602c820 100644 --- a/src/nntm-energy.cc +++ b/src/nntm-energy.cc @@ -13,7 +13,6 @@ #include -#define BOOST_LOG_DYN_LINK 1 // Fix an issue with dynamic library loading #include #include #include diff --git a/src/nntm-scoring.cc b/src/nntm-scoring.cc index 3c38ff01..825bab51 100644 --- a/src/nntm-scoring.cc +++ b/src/nntm-scoring.cc @@ -10,7 +10,6 @@ #include "boost/multi_array.hpp" -#define BOOST_LOG_DYN_LINK 1 // Fix an issue with dynamic library loading #include #include #include diff --git a/src/nntm-subopt.cc b/src/nntm-subopt.cc index a629736d..0c5263e2 100644 --- a/src/nntm-subopt.cc +++ b/src/nntm-subopt.cc @@ -14,7 +14,6 @@ #include "boost/multi_array.hpp" -#define BOOST_LOG_DYN_LINK 1 // Fix an issue with dynamic library loading #include #include #include diff --git a/src/nntm-traceback.cc b/src/nntm-traceback.cc index c79d2116..612890ba 100644 --- a/src/nntm-traceback.cc +++ b/src/nntm-traceback.cc @@ -12,7 +12,6 @@ #include -#define BOOST_LOG_DYN_LINK 1 // Fix an issue with dynamic library loading #include #include #include diff --git a/src/rna_polytope.cc b/src/rna_polytope.cc index de8dcede..8a849d07 100644 --- a/src/rna_polytope.cc +++ b/src/rna_polytope.cc @@ -14,7 +14,6 @@ #include "boost/filesystem.hpp" #include "boost/filesystem/fstream.hpp" -#define BOOST_LOG_DYN_LINK 1 // Fix an issue with dynamic library loading #include #include #include