Mercurial > octave-nkf
changeset 7549:ff9c2bb7abc7
workaround to enable compiling with Intel C++ 10.1
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Tue, 04 Mar 2008 14:18:52 -0500 |
| parents | 9cbf1e2011a3 |
| children | bffb1e2ab732 |
| files | liboctave/Array-C.cc liboctave/ChangeLog liboctave/Sparse-C.cc |
| diffstat | 3 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Array-C.cc Tue Mar 04 14:16:16 2008 -0500 +++ b/liboctave/Array-C.cc Tue Mar 04 14:18:52 2008 -0500 @@ -31,7 +31,6 @@ #include "Array.h" #include "Array.cc" -#include "oct-sort.cc" static double xabs (const Complex& x) @@ -53,6 +52,10 @@ || ((xabs (a) == xabs (b)) && (arg (a) > arg (b)))); } +// This file must be included after the < and > operators are +// defined to avoid errors with the Intel C++ compiler. +#include "oct-sort.cc" + template <> bool ascending_compare (Complex a, Complex b)
--- a/liboctave/ChangeLog Tue Mar 04 14:16:16 2008 -0500 +++ b/liboctave/ChangeLog Tue Mar 04 14:18:52 2008 -0500 @@ -1,3 +1,8 @@ +2008-03-04 Jaroslav Hajek <highegg@gmail.com> + + * Array-C.cc, Sparse-C.cc: Include oct-sort.cc after definitions + of < and > operators. + 2008-03-03 David Bateman <dbateman@free.fr> * Sparse.cc (assign1, assign1): Take care of repeated index
--- a/liboctave/Sparse-C.cc Tue Mar 04 14:16:16 2008 -0500 +++ b/liboctave/Sparse-C.cc Tue Mar 04 14:18:52 2008 -0500 @@ -33,7 +33,6 @@ #include "Sparse.h" #include "Sparse.cc" -#include "oct-sort.cc" static double xabs (const Complex& x) @@ -55,6 +54,10 @@ || ((xabs (a) == xabs (b)) && (arg (a) > arg (b)))); } +// This file must be included after the < and > operators are +// defined to avoid errors with the Intel C++ compiler. +#include "oct-sort.cc" + template <> bool sparse_ascending_compare (Complex a, Complex b)