Mercurial > hg > octave-terminal
changeset 3262:eaa639880b51
[project @ 1999-08-20 19:06:48 by jwe]
idx-vector.cc
author | jwe |
---|---|
date | Fri, 20 Aug 1999 19:06:50 +0000 |
parents | 49bec5dee616 |
children | 7d80b56e0dc8 |
files | liboctave/ChangeLog liboctave/idx-vector.cc liboctave/mx-inlines.cc |
diffstat | 3 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,8 @@ +Fri Aug 20 07:58:00 1999 John W. Eaton <jwe@bevo.che.wisc.edu> + + * idx-vector.cc (intcmp): Declare args as const void *, not int *, + then cast to const int * to compare. + Fri Jul 16 11:23:51 1999 John W. Eaton <jwe@bevo.che.wisc.edu> * DAEFunc.h: Remove useless preprocessor conditional.
--- a/liboctave/idx-vector.cc +++ b/liboctave/idx-vector.cc @@ -458,9 +458,9 @@ } static inline int -intcmp (int *ii, int *jj) +intcmp (const void *ii, const void *jj) { - return (*ii - *jj); + return (*(static_cast<const int *> (ii)) - *(static_cast<const int *> (jj))); } static inline void
--- a/liboctave/mx-inlines.cc +++ b/liboctave/mx-inlines.cc @@ -29,7 +29,7 @@ #define VS_OP_FCN(F, OP) \ template <class R, class V, class S> \ - static inline void \ + inline void \ F ## _vs (R *r, const V *v, size_t n, S s) \ { \ for (size_t i = 0; i < n; i++) \ @@ -42,7 +42,6 @@ VS_OP_FCN (divide, /) #define VS_OP(F, OP, R, V, S) \ - extern template void F ## _vs (R *, const V *, size_t, S); \ static inline R * \ F (const V *v, size_t n, S s) \ { \ @@ -68,7 +67,7 @@ #define SV_OP_FCN(F, OP) \ template <class R, class S, class V> \ - static inline void \ + inline void \ F ## _sv (R *r, S s, const V *v, size_t n) \ { \ for (size_t i = 0; i < n; i++) \ @@ -81,7 +80,6 @@ SV_OP_FCN (divide, /) #define SV_OP(F, OP, R, S, V) \ - extern template void F ## _sv (R *, S, const V *, size_t); \ static inline R * \ F (S s, const V *v, size_t n) \ { \ @@ -107,7 +105,7 @@ #define VV_OP_FCN(F, OP) \ template <class R, class T1, class T2> \ - static inline void \ + inline void \ F ## _vv (R *r, const T1 *v1, const T2 *v2, size_t n) \ { \ for (size_t i = 0; i < n; i++) \ @@ -120,7 +118,6 @@ VV_OP_FCN (divide, /) #define VV_OP(F, OP, R, T1, T2) \ - extern template void F ## _vv (R *, const T1 *, const T2 *, size_t); \ static inline R * \ F (const T1 *v1, const T2 *v2, size_t n) \ { \