Merge pull request #15 from gtDMMB/math-mulberry-rhlinux-initial-source-changes

maxieds · web-flow · commit 87dcbae8d960 · 2020-10-07T21:25:21.000-04:00
RH Linux source changes for initial compilation with recent g++ (merge into active development branch)
diff --git 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
@@ -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 <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/expressions.hpp>
diff --git 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 <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/expressions.hpp>
diff --git 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 <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/expressions.hpp>
diff --git 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 <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/expressions.hpp>
diff --git 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 <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/expressions.hpp>
diff --git a/src/nntm-energy.cc b/src/nntm-energy.cc
@@ -13,7 +13,6 @@
 
 #include <boost/bind.hpp>
 
-#define BOOST_LOG_DYN_LINK 1 // Fix an issue with dynamic library loading
 #include <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/expressions.hpp>
diff --git 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 <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/expressions.hpp>
diff --git 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 <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/expressions.hpp>
diff --git a/src/nntm-traceback.cc b/src/nntm-traceback.cc
@@ -12,7 +12,6 @@
 
 #include <boost/multi_array.hpp>
 
-#define BOOST_LOG_DYN_LINK 1 // Fix an issue with dynamic library loading
 #include <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/expressions.hpp>
diff --git 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 <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/expressions.hpp>
