Debian Codegraph @

debian/patches/system-boost

raw
1 --- a/Makefile.in
2 +++ b/Makefile.in
3 @@ -1009,8 +1009,7 @@
4 numeric/interval.hpp \
5 LICENSE_1_0.txt \
6 limits.hpp non_type.hpp type.hpp
7 -THIRDHDR = \
8 - $(BOOSTHDR:%=gecode/third-party/boost/%)
9 +THIRDHDR =
10
11 #
12 # COLLECTING ALL
13 --- a/gecode/float.hh
14 +++ b/gecode/float.hh
15 @@ -77,7 +77,7 @@
16 #endif
17
18 // Include interval implementation
19 -#include <gecode/third-party/boost/numeric/interval.hpp>
20 +#include <boost/numeric/interval.hpp>
21
22 /**
23 * \namespace Gecode::Float
24 @@ -135,13 +135,13 @@
25 *
26 */
27 /// Rounding Base class (safe version)
28 - typedef gecode_boost::numeric::interval_lib::save_state< gecode_boost::numeric::interval_lib::rounded_arith_std<FloatNum> >
29 + typedef boost::numeric::interval_lib::save_state< boost::numeric::interval_lib::rounded_arith_std<FloatNum> >
30 RoundingBase;
31
32 #else
33
34 /// Rounding Base class (optimized version)
35 - typedef gecode_boost::numeric::interval_lib::rounded_arith_opp<FloatNum>
36 + typedef boost::numeric::interval_lib::rounded_arith_opp<FloatNum>
37 RoundingBase;
38
39 #endif
40 @@ -413,13 +413,13 @@
41 friend FloatVal Float::hull(const FloatNum& x, const FloatNum& y);
42 protected:
43 /// Used rounding policies
44 - typedef gecode_boost::numeric::interval_lib::save_state<Float::Rounding> R;
45 + typedef boost::numeric::interval_lib::save_state<Float::Rounding> R;
46 /// Used checking policy
47 - typedef gecode_boost::numeric::interval_lib::checking_strict<FloatNum> P;
48 + typedef boost::numeric::interval_lib::checking_strict<FloatNum> P;
49 /// Implementation type for float value
50 - typedef gecode_boost::numeric::interval
51 + typedef boost::numeric::interval
52 <FloatNum,
53 - gecode_boost::numeric::interval_lib::policies<R, P> >
54 + boost::numeric::interval_lib::policies<R, P> >
55 FloatValImpType;
56 /// Implementation of float value
57 FloatValImpType x;
58 --- a/gecode/float/num.hpp
59 +++ b/gecode/float/num.hpp
60 @@ -35,27 +35,27 @@
61
62 forceinline FloatNum
63 pi_half_lower(void) {
64 - return gecode_boost::numeric::interval_lib::constants::pi_half_lower<FloatNum>();
65 + return boost::numeric::interval_lib::constants::pi_half_lower<FloatNum>();
66 }
67 forceinline FloatNum
68 pi_half_upper(void) {
69 - return gecode_boost::numeric::interval_lib::constants::pi_half_upper<FloatNum>();
70 + return boost::numeric::interval_lib::constants::pi_half_upper<FloatNum>();
71 }
72 forceinline FloatNum
73 pi_lower(void) {
74 - return gecode_boost::numeric::interval_lib::constants::pi_lower<FloatNum>();
75 + return boost::numeric::interval_lib::constants::pi_lower<FloatNum>();
76 }
77 forceinline FloatNum
78 pi_upper(void) {
79 - return gecode_boost::numeric::interval_lib::constants::pi_upper<FloatNum>();
80 + return boost::numeric::interval_lib::constants::pi_upper<FloatNum>();
81 }
82 forceinline FloatNum
83 pi_twice_lower(void) {
84 - return gecode_boost::numeric::interval_lib::constants::pi_twice_lower<FloatNum>();
85 + return boost::numeric::interval_lib::constants::pi_twice_lower<FloatNum>();
86 }
87 forceinline FloatNum
88 pi_twice_upper(void) {
89 - return gecode_boost::numeric::interval_lib::constants::pi_twice_upper<FloatNum>();
90 + return boost::numeric::interval_lib::constants::pi_twice_upper<FloatNum>();
91 }
92 }
93
94 --- a/gecode/float/val.hpp
95 +++ b/gecode/float/val.hpp
96 @@ -76,29 +76,29 @@
97 }
98 forceinline FloatNum
99 FloatVal::size(void) const {
100 - return gecode_boost::numeric::width(x);
101 + return boost::numeric::width(x);
102 }
103 forceinline FloatNum
104 FloatVal::med(void) const {
105 - return gecode_boost::numeric::median(x);
106 + return boost::numeric::median(x);
107 }
108
109 forceinline bool
110 FloatVal::tight(void) const {
111 - return (gecode_boost::numeric::singleton(x) ||
112 + return (boost::numeric::singleton(x) ||
113 (nextafter(x.lower(),x.upper()) == x.upper()));
114 }
115 forceinline bool
116 FloatVal::singleton(void) const {
117 - return gecode_boost::numeric::singleton(x);
118 + return boost::numeric::singleton(x);
119 }
120 forceinline bool
121 FloatVal::in(FloatNum n) const {
122 - return gecode_boost::numeric::in(n,x);
123 + return boost::numeric::in(n,x);
124 }
125 forceinline bool
126 FloatVal::zero_in(void) const {
127 - return gecode_boost::numeric::zero_in(x);
128 + return boost::numeric::zero_in(x);
129 }
130
131 forceinline FloatVal
132 @@ -107,17 +107,17 @@
133 }
134 forceinline FloatVal
135 FloatVal::pi_half(void) {
136 - FloatVal p(gecode_boost::numeric::interval_lib::pi_half<FloatValImpType>());
137 + FloatVal p(boost::numeric::interval_lib::pi_half<FloatValImpType>());
138 return p;
139 }
140 forceinline FloatVal
141 FloatVal::pi(void) {
142 - FloatVal p(gecode_boost::numeric::interval_lib::pi<FloatValImpType>());
143 + FloatVal p(boost::numeric::interval_lib::pi<FloatValImpType>());
144 return p;
145 }
146 forceinline FloatVal
147 FloatVal::pi_twice(void) {
148 - FloatVal p(gecode_boost::numeric::interval_lib::pi_twice<FloatValImpType>());
149 + FloatVal p(boost::numeric::interval_lib::pi_twice<FloatValImpType>());
150 return p;
151 }
152
153 @@ -226,7 +226,7 @@
154 operator <(const FloatVal& x, const FloatVal& y) {
155 try {
156 return x.x < y.x;
157 - } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
158 + } catch (boost::numeric::interval_lib::comparison_error&) {
159 return false;
160 }
161 }
162 @@ -234,7 +234,7 @@
163 operator <(const FloatVal& x, const FloatNum& y) {
164 try {
165 return x.x < y;
166 - } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
167 + } catch (boost::numeric::interval_lib::comparison_error&) {
168 return false;
169 }
170 }
171 @@ -243,7 +243,7 @@
172 operator <=(const FloatVal& x, const FloatVal& y) {
173 try {
174 return x.x <= y.x;
175 - } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
176 + } catch (boost::numeric::interval_lib::comparison_error&) {
177 return false;
178 }
179 }
180 @@ -251,7 +251,7 @@
181 operator <=(const FloatVal& x, const FloatNum& y) {
182 try {
183 return x.x <= y;
184 - } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
185 + } catch (boost::numeric::interval_lib::comparison_error&) {
186 return false;
187 }
188 }
189 @@ -260,7 +260,7 @@
190 operator >(const FloatVal& x, const FloatVal& y) {
191 try {
192 return x.x > y.x;
193 - } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
194 + } catch (boost::numeric::interval_lib::comparison_error&) {
195 return false;
196 }
197 }
198 @@ -268,7 +268,7 @@
199 operator >(const FloatVal& x, const FloatNum& y) {
200 try {
201 return x.x > y;
202 - } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
203 + } catch (boost::numeric::interval_lib::comparison_error&) {
204 return false;
205 }
206 }
207 @@ -277,7 +277,7 @@
208 operator >=(const FloatVal& x, const FloatVal& y) {
209 try {
210 return x.x >= y.x;
211 - } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
212 + } catch (boost::numeric::interval_lib::comparison_error&) {
213 return false;
214 }
215 }
216 @@ -285,7 +285,7 @@
217 operator >=(const FloatVal& x, const FloatNum& y) {
218 try {
219 return x.x >= y;
220 - } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
221 + } catch (boost::numeric::interval_lib::comparison_error&) {
222 return false;
223 }
224 }
225 @@ -294,13 +294,13 @@
226 operator ==(const FloatVal& x, const FloatVal& y) {
227 try {
228 return x.x == y.x;
229 - } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
230 + } catch (boost::numeric::interval_lib::comparison_error&) {
231 return false;
232 }
233 }
234 inline bool
235 operator ==(const FloatVal& x, const FloatNum& y) {
236 - if (!gecode_boost::numeric::interval_lib::checking_strict<FloatNum>
237 + if (!boost::numeric::interval_lib::checking_strict<FloatNum>
238 ::is_empty(x.x.lower(), x.x.upper())) {
239 if ((x.x.lower() == y) && (x.x.upper() == y))
240 return true;
241 @@ -317,7 +317,7 @@
242 operator !=(const FloatVal& x, const FloatVal& y) {
243 try {
244 return x.x != y.x;
245 - } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
246 + } catch (boost::numeric::interval_lib::comparison_error&) {
247 return false;
248 }
249 }
250 @@ -325,7 +325,7 @@
251 operator !=(const FloatVal& x, const FloatNum& y) {
252 try {
253 return x.x != y;
254 - } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
255 + } catch (boost::numeric::interval_lib::comparison_error&) {
256 return false;
257 }
258 }