Index: gecode-6.2.0/Makefile.in =================================================================== --- gecode-6.2.0.orig/Makefile.in 2019-12-15 17:13:56.971198754 +0200 +++ gecode-6.2.0/Makefile.in 2019-12-15 17:13:56.967198885 +0200 @@ -998,8 +998,7 @@ numeric/interval.hpp \ LICENSE_1_0.txt \ limits.hpp non_type.hpp type.hpp -THIRDHDR = \ - $(BOOSTHDR:%=gecode/third-party/boost/%) +THIRDHDR = # # COLLECTING ALL Index: gecode-6.2.0/gecode/float.hh =================================================================== --- gecode-6.2.0.orig/gecode/float.hh 2019-12-15 17:13:56.971198754 +0200 +++ gecode-6.2.0/gecode/float.hh 2019-12-15 17:14:23.462332109 +0200 @@ -77,7 +77,7 @@ #endif // Include interval implementation -#include +#include /** * \namespace Gecode::Float @@ -135,13 +135,13 @@ * */ /// Rounding Base class (safe version) - typedef gecode_boost::numeric::interval_lib::save_state< gecode_boost::numeric::interval_lib::rounded_arith_std > + typedef boost::numeric::interval_lib::save_state< boost::numeric::interval_lib::rounded_arith_std > RoundingBase; #else /// Rounding Base class (optimized version) - typedef gecode_boost::numeric::interval_lib::rounded_arith_opp + typedef boost::numeric::interval_lib::rounded_arith_opp RoundingBase; #endif @@ -413,13 +413,13 @@ friend FloatVal Float::hull(const FloatNum& x, const FloatNum& y); protected: /// Used rounding policies - typedef gecode_boost::numeric::interval_lib::save_state R; + typedef boost::numeric::interval_lib::save_state R; /// Used checking policy - typedef gecode_boost::numeric::interval_lib::checking_strict P; + typedef boost::numeric::interval_lib::checking_strict P; /// Implementation type for float value - typedef gecode_boost::numeric::interval + typedef boost::numeric::interval > + boost::numeric::interval_lib::policies > FloatValImpType; /// Implementation of float value FloatValImpType x; Index: gecode-6.2.0/gecode/float/num.hpp =================================================================== --- gecode-6.2.0.orig/gecode/float/num.hpp 2019-12-15 17:13:56.971198754 +0200 +++ gecode-6.2.0/gecode/float/num.hpp 2019-12-15 17:13:56.967198885 +0200 @@ -35,27 +35,27 @@ forceinline FloatNum pi_half_lower(void) { - return gecode_boost::numeric::interval_lib::constants::pi_half_lower(); + return boost::numeric::interval_lib::constants::pi_half_lower(); } forceinline FloatNum pi_half_upper(void) { - return gecode_boost::numeric::interval_lib::constants::pi_half_upper(); + return boost::numeric::interval_lib::constants::pi_half_upper(); } forceinline FloatNum pi_lower(void) { - return gecode_boost::numeric::interval_lib::constants::pi_lower(); + return boost::numeric::interval_lib::constants::pi_lower(); } forceinline FloatNum pi_upper(void) { - return gecode_boost::numeric::interval_lib::constants::pi_upper(); + return boost::numeric::interval_lib::constants::pi_upper(); } forceinline FloatNum pi_twice_lower(void) { - return gecode_boost::numeric::interval_lib::constants::pi_twice_lower(); + return boost::numeric::interval_lib::constants::pi_twice_lower(); } forceinline FloatNum pi_twice_upper(void) { - return gecode_boost::numeric::interval_lib::constants::pi_twice_upper(); + return boost::numeric::interval_lib::constants::pi_twice_upper(); } } Index: gecode-6.2.0/gecode/float/val.hpp =================================================================== --- gecode-6.2.0.orig/gecode/float/val.hpp 2019-12-15 17:13:56.971198754 +0200 +++ gecode-6.2.0/gecode/float/val.hpp 2019-12-15 17:13:56.967198885 +0200 @@ -76,29 +76,29 @@ } forceinline FloatNum FloatVal::size(void) const { - return gecode_boost::numeric::width(x); + return boost::numeric::width(x); } forceinline FloatNum FloatVal::med(void) const { - return gecode_boost::numeric::median(x); + return boost::numeric::median(x); } forceinline bool FloatVal::tight(void) const { - return (gecode_boost::numeric::singleton(x) || + return (boost::numeric::singleton(x) || (nextafter(x.lower(),x.upper()) == x.upper())); } forceinline bool FloatVal::singleton(void) const { - return gecode_boost::numeric::singleton(x); + return boost::numeric::singleton(x); } forceinline bool FloatVal::in(FloatNum n) const { - return gecode_boost::numeric::in(n,x); + return boost::numeric::in(n,x); } forceinline bool FloatVal::zero_in(void) const { - return gecode_boost::numeric::zero_in(x); + return boost::numeric::zero_in(x); } forceinline FloatVal @@ -107,17 +107,17 @@ } forceinline FloatVal FloatVal::pi_half(void) { - FloatVal p(gecode_boost::numeric::interval_lib::pi_half()); + FloatVal p(boost::numeric::interval_lib::pi_half()); return p; } forceinline FloatVal FloatVal::pi(void) { - FloatVal p(gecode_boost::numeric::interval_lib::pi()); + FloatVal p(boost::numeric::interval_lib::pi()); return p; } forceinline FloatVal FloatVal::pi_twice(void) { - FloatVal p(gecode_boost::numeric::interval_lib::pi_twice()); + FloatVal p(boost::numeric::interval_lib::pi_twice()); return p; } @@ -226,7 +226,7 @@ operator <(const FloatVal& x, const FloatVal& y) { try { return x.x < y.x; - } catch (gecode_boost::numeric::interval_lib::comparison_error&) { + } catch (boost::numeric::interval_lib::comparison_error&) { return false; } } @@ -234,7 +234,7 @@ operator <(const FloatVal& x, const FloatNum& y) { try { return x.x < y; - } catch (gecode_boost::numeric::interval_lib::comparison_error&) { + } catch (boost::numeric::interval_lib::comparison_error&) { return false; } } @@ -243,7 +243,7 @@ operator <=(const FloatVal& x, const FloatVal& y) { try { return x.x <= y.x; - } catch (gecode_boost::numeric::interval_lib::comparison_error&) { + } catch (boost::numeric::interval_lib::comparison_error&) { return false; } } @@ -251,7 +251,7 @@ operator <=(const FloatVal& x, const FloatNum& y) { try { return x.x <= y; - } catch (gecode_boost::numeric::interval_lib::comparison_error&) { + } catch (boost::numeric::interval_lib::comparison_error&) { return false; } } @@ -260,7 +260,7 @@ operator >(const FloatVal& x, const FloatVal& y) { try { return x.x > y.x; - } catch (gecode_boost::numeric::interval_lib::comparison_error&) { + } catch (boost::numeric::interval_lib::comparison_error&) { return false; } } @@ -268,7 +268,7 @@ operator >(const FloatVal& x, const FloatNum& y) { try { return x.x > y; - } catch (gecode_boost::numeric::interval_lib::comparison_error&) { + } catch (boost::numeric::interval_lib::comparison_error&) { return false; } } @@ -277,7 +277,7 @@ operator >=(const FloatVal& x, const FloatVal& y) { try { return x.x >= y.x; - } catch (gecode_boost::numeric::interval_lib::comparison_error&) { + } catch (boost::numeric::interval_lib::comparison_error&) { return false; } } @@ -285,7 +285,7 @@ operator >=(const FloatVal& x, const FloatNum& y) { try { return x.x >= y; - } catch (gecode_boost::numeric::interval_lib::comparison_error&) { + } catch (boost::numeric::interval_lib::comparison_error&) { return false; } } @@ -294,13 +294,13 @@ operator ==(const FloatVal& x, const FloatVal& y) { try { return x.x == y.x; - } catch (gecode_boost::numeric::interval_lib::comparison_error&) { + } catch (boost::numeric::interval_lib::comparison_error&) { return false; } } inline bool operator ==(const FloatVal& x, const FloatNum& y) { - if (!gecode_boost::numeric::interval_lib::checking_strict + if (!boost::numeric::interval_lib::checking_strict ::is_empty(x.x.lower(), x.x.upper())) { if ((x.x.lower() == y) && (x.x.upper() == y)) return true; @@ -317,7 +317,7 @@ operator !=(const FloatVal& x, const FloatVal& y) { try { return x.x != y.x; - } catch (gecode_boost::numeric::interval_lib::comparison_error&) { + } catch (boost::numeric::interval_lib::comparison_error&) { return false; } } @@ -325,7 +325,7 @@ operator !=(const FloatVal& x, const FloatNum& y) { try { return x.x != y; - } catch (gecode_boost::numeric::interval_lib::comparison_error&) { + } catch (boost::numeric::interval_lib::comparison_error&) { return false; } }