Skip to content

fix compilation for recent compiler versions #8

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

Open
peterlietz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix compilation for recent compiler versions #8

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
8 changes: 6 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
cmake_minimum_required (VERSION 2.6)
cmake_minimum_required (VERSION 3.10)
project (PermLib)

set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
include(UseDoxygen OPTIONAL)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

SET (Boost_FIND_REQUIRED TRUE)
SET (Boost_FIND_QUIETLY TRUE)
SET (Boost_USE_MULTITHREADED TRUE)
find_package(Boost 1.34.1 REQUIRED)
find_package(Boost 1.67 REQUIRED)

IF( NOT CMAKE_BUILD_TYPE )
SET( CMAKE_BUILD_TYPE Debug CACHE STRING
Expand Down
2 changes: 1 addition & 1 deletion include/permlib/abstract_bsgs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ AbstractPermutationGroup* AbstractBSGS<TRANS>::setStabilizer(const std::vector<d
// start the search
boost::shared_ptr<PermutationGroup> stabilizer(new PermutationGroup(copy.n));
backtrackSearch.search(*stabilizer);
return new AbstractBSGS<TRANS>(stabilizer, m_support);
return new AbstractBSGS<TRANS>(stabilizer, bool(m_support));
}

template <class TRANS>
Expand Down
2 changes: 1 addition & 1 deletion include/permlib/bsgs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#include <boost/foreach.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/utility.hpp>
#include <boost/next_prior.hpp>

#include <permlib/bsgs_core.h>

Expand Down
4 changes: 2 additions & 2 deletions include/permlib/permutation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#include <boost/dynamic_bitset.hpp>
#include <boost/foreach.hpp>
#include <boost/cstdint.hpp>
#include <boost/math/common_factor_rt.hpp>
#include <boost/integer/common_factor_rt.hpp>

namespace permlib {

Expand Down Expand Up @@ -343,7 +343,7 @@ inline boost::uint64_t Permutation::order() const {
std::list<CyclePair> cycleList = this->cycles();
boost::uint64_t ord = 1;
BOOST_FOREACH(const CyclePair& cyc, cycleList) {
ord = boost::math::lcm(ord, static_cast<boost::uint64_t>(cyc.second));
ord = boost::integer::lcm(ord, static_cast<boost::uint64_t>(cyc.second));
}
return ord;
}
Expand Down
4 changes: 2 additions & 2 deletions include/permlib/test/giant_test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include <permlib/prime_helper.h>

#include <boost/foreach.hpp>
#include <boost/math/common_factor_rt.hpp>
#include <boost/integer/common_factor_rt.hpp>
#include <cmath>
#include <algorithm>

Expand Down Expand Up @@ -195,7 +195,7 @@ GiantTestBase::GiantGroupType GiantTest<PERM>::determineGiantType(double eps, un
for (unsigned int k = 0; k < cycleLength.size(); ++k) {
if (j == k)
continue;
if (boost::math::gcd(cycleLength[j], cycleLength[k]) != 1) {
if (boost::integer::gcd(cycleLength[j], cycleLength[k]) != 1) {
isCoprime = false;
break;
}
Expand Down
4 changes: 2 additions & 2 deletions include/permlib/test/type_recognition.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include <permlib/permlib_api.h>

#include <boost/shared_ptr.hpp>
#include <boost/math/common_factor_rt.hpp>
#include <boost/integer/common_factor_rt.hpp>
#include <iostream>


Expand Down Expand Up @@ -344,7 +344,7 @@ GroupType* TypeRecognition<PERM,TRANSVERSAL>::largeSymmetricDiagonalSubgroup(std

size_t orbitGCD = orbits.front()->size();
BOOST_FOREACH(const OrbitPtr& orbit, orbits) {
orbitGCD = boost::math::gcd(orbitGCD, orbit->size());
orbitGCD = boost::integer::gcd(orbitGCD, orbit->size());
}

GroupType* lastType = 0;
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
find_package(Boost 1.34.1 REQUIRED unit_test_framework)
find_package(Boost 1.67 REQUIRED unit_test_framework)

include_directories(../include)

Expand Down
2 changes: 1 addition & 1 deletion test/test-test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#define BOOST_TEST_DYN_LINK
#define BOOST_TEST_MODULE group test tests
#include <boost/test/unit_test.hpp>
#include <boost/test/output_test_stream.hpp>
#include <boost/test/tools/output_test_stream.hpp>
using boost::test_tools::output_test_stream;

#include <permlib/permutation.h>
Expand Down