Mercurial > forge

comparison main/fixed/src/int/fixed.h @ 9481:d84d2fea3c90 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Re-enable compilation of fixed package
author jordigh
date Wed, 22 Feb 2012 22:07:33 +0000
parents f8d77845533f
children
comparison
equal deleted inserted replaced
9480:954f2f00d782 9481:d84d2fea3c90
156 156
157 FixedPoint (const double x); 157 FixedPoint (const double x);
158 158
159 #ifdef _MSC_VER 159 #ifdef _MSC_VER
160 FixedPoint (const long double x) { *this = FixedPoint((const double)x); } 160 FixedPoint (const long double x) { *this = FixedPoint((const double)x); }
161
162 operator double () const { return fixedpoint(); }
163 #endif 161 #endif
164 162
165 FixedPoint (const FixedPoint &x) : number(x.number), decsize(x.decsize), 163 FixedPoint (const FixedPoint &x) : number(x.number), decsize(x.decsize),
166 intsize(x.intsize), filter(x.filter), 164 intsize(x.intsize), filter(x.filter),
167 value(x.value) { } 165 value(x.value) { }
168 166
167 operator double () const { return fixedpoint(); }
168
169 // Changing FixedPoint dynamic 169 // Changing FixedPoint dynamic
170 170
171 FixedPoint chintsize (const int n) { 171 FixedPoint chintsize (const int n) {
172 return (FixedPoint (n, decsize, *this)); 172 return (FixedPoint (n, decsize, *this));
173 } 173 }
227 227
228 friend OCTAVE_FIXED_API FixedPoint operator ! (const FixedPoint &x); 228 friend OCTAVE_FIXED_API FixedPoint operator ! (const FixedPoint &x);
229 229
230 // FixedPoint operators 230 // FixedPoint operators
231 231
232 friend FixedPoint operator + (const FixedPoint &x, int y) { return x + FixedPoint (y); }
233
234 friend FixedPoint operator - (const FixedPoint &x, int y) { return x - FixedPoint (y); }
235
236 friend FixedPoint operator * (const FixedPoint &x, int y) { return x * FixedPoint (y); }
237
238 friend FixedPoint operator / (const FixedPoint &x, int y) { return x / FixedPoint (y); }
239
240 friend FixedPoint operator + (int x, const FixedPoint &y) { return FixedPoint (x) + y; }
241
242 friend FixedPoint operator - (int x, const FixedPoint &y) { return FixedPoint (x) - y; }
243
244 friend FixedPoint operator * (int x, const FixedPoint &y) { return FixedPoint (x) * y; }
245
246 friend FixedPoint operator / (int x, const FixedPoint &y) { return FixedPoint (x) / y; }
247
248
232 friend FixedPoint operator + (const FixedPoint &x, const FixedPoint &y); 249 friend FixedPoint operator + (const FixedPoint &x, const FixedPoint &y);
233 250
234 friend FixedPoint operator - (const FixedPoint &x, const FixedPoint &y); 251 friend FixedPoint operator - (const FixedPoint &x, const FixedPoint &y);
235 252
236 friend FixedPoint operator * (const FixedPoint &x, const FixedPoint &y); 253 friend FixedPoint operator * (const FixedPoint &x, const FixedPoint &y);
240 friend FixedPoint operator << (const FixedPoint &x, const int s); 257 friend FixedPoint operator << (const FixedPoint &x, const int s);
241 258
242 friend FixedPoint operator >> (const FixedPoint &x, const int s); 259 friend FixedPoint operator >> (const FixedPoint &x, const int s);
243 260
244 // FixedPoint comparators 261 // FixedPoint comparators
262
263 friend OCTAVE_FIXED_API bool operator == (int x, const FixedPoint &y) { return FixedPoint (x) == y; }
264
265 friend OCTAVE_FIXED_API bool operator != (int x, const FixedPoint &y) { return FixedPoint (x) != y; }
266
267 friend OCTAVE_FIXED_API bool operator > (int x, const FixedPoint &y) { return FixedPoint (x) > y; }
268
269 friend OCTAVE_FIXED_API bool operator >= (int x, const FixedPoint &y) { return FixedPoint (x) >= y; }
270
271 friend OCTAVE_FIXED_API bool operator < (int x, const FixedPoint &y) { return FixedPoint (x) < y; }
272
273 friend OCTAVE_FIXED_API bool operator <= (int x, const FixedPoint &y) { return FixedPoint (x) <= y; }
274
275 friend OCTAVE_FIXED_API bool operator == (const FixedPoint& y, int x) { return x == FixedPoint (y); }
276
277 friend OCTAVE_FIXED_API bool operator != (const FixedPoint& y, int x) { return x != FixedPoint (y); }
278
279 friend OCTAVE_FIXED_API bool operator > (const FixedPoint& y, int x) { return x > FixedPoint (y); }
280
281 friend OCTAVE_FIXED_API bool operator >= (const FixedPoint& y, int x) { return x >= FixedPoint (y); }
282
283 friend OCTAVE_FIXED_API bool operator < (const FixedPoint& y, int x) { return x < FixedPoint (y); }
284
285 friend OCTAVE_FIXED_API bool operator <= (const FixedPoint& y, int x) { return x <= FixedPoint (y); }
245 286
246 friend OCTAVE_FIXED_API bool operator == (const FixedPoint &x, const FixedPoint &y); 287 friend OCTAVE_FIXED_API bool operator == (const FixedPoint &x, const FixedPoint &y);
247 288
248 friend OCTAVE_FIXED_API bool operator != (const FixedPoint &x, const FixedPoint &y); 289 friend OCTAVE_FIXED_API bool operator != (const FixedPoint &x, const FixedPoint &y);
249 290