Skip to content

RH Linux source changes for initial compilation with recent g++ (merge into active development branch) #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxieds merged 1 commit into from
Oct 8, 2020
Merged

RH Linux source changes for initial compilation with recent g++ (merge into active development branch) #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions iB4e/CGAL/Regular_complex_d.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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_; };
Expand Down
1 change: 0 additions & 1 deletion src/bin-findmfe.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/bin-parametrizer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/bin-scorer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/bin-subopt.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/bin-tests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/nntm-energy.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/nntm-scoring.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/nntm-subopt.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/nntm-traceback.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/rna_polytope.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down