Mercurial > octave-nkf

comparison liboctave/Array-f.cc @ 9003:0631d397fbe0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replace lo_ieee_isnan by xisnan, add missing includes
author Jaroslav Hajek <highegg@gmail.com>
date Sat, 21 Mar 2009 20:46:21 +0100
parents eb63fbe60fab
children 3c1762c7e787
comparison
equal deleted inserted replaced
9002:5cc15e4b4e5c 9003:0631d397fbe0
25 #include <config.h> 25 #include <config.h>
26 #endif 26 #endif
27 27
28 // Instantiate Arrays of float values. 28 // Instantiate Arrays of float values.
29 29
30 #include "lo-ieee.h" 30 #include "lo-mappers.h"
31 #include "Array.h" 31 #include "Array.h"
32 #include "Array.cc" 32 #include "Array.cc"
33 #include "oct-locbuf.h" 33 #include "oct-locbuf.h"
34 34
35 #define INLINE_ASCENDING_SORT 35 #define INLINE_ASCENDING_SORT
38 38
39 template <> 39 template <>
40 inline bool 40 inline bool
41 sort_isnan<float> (float x) 41 sort_isnan<float> (float x)
42 { 42 {
43 return lo_ieee_isnan (x); 43 return xisnan (x);
44 } 44 }
45 45
46 static bool 46 static bool
47 nan_ascending_compare (float x, float y) 47 nan_ascending_compare (float x, float y)
48 { 48 {
49 return lo_ieee_isnan (y) ? ! lo_ieee_isnan (x) : x < y; 49 return xisnan (y) ? ! xisnan (x) : x < y;
50 } 50 }
51 51
52 static bool 52 static bool
53 nan_descending_compare (float x, float y) 53 nan_descending_compare (float x, float y)
54 { 54 {
55 return lo_ieee_isnan (x) ? ! lo_ieee_isnan (y) : x > y; 55 return xisnan (x) ? ! xisnan (y) : x > y;
56 } 56 }
57 57
58 Array<float>::compare_fcn_type 58 Array<float>::compare_fcn_type
59 sortrows_comparator (sortmode mode, const Array<float>& a , bool allow_chk) 59 sortrows_comparator (sortmode mode, const Array<float>& a , bool allow_chk)
60 { 60 {