Mercurial > octave-nkf
changeset 19429:fb09907f4e49
Remove single line makro INSTANTIATE_ARRAY_SORT.
* Array.cc: removed makro INSTANTIATE_ARRAY_SORT definition.
* Array-*.cc: replaced makro INSTANTIATE_ARRAY_SORT with definition.
author | Kai T. Ohlhus <k.ohlhus@gmail.com> |
---|---|
date | Thu, 11 Dec 2014 00:15:03 +0100 |
parents | b39cbe9f3bb0 |
children | 50d4fd16fb3a |
files | liboctave/array/Array-C.cc liboctave/array/Array-b.cc liboctave/array/Array-ch.cc liboctave/array/Array-d.cc liboctave/array/Array-f.cc liboctave/array/Array-fC.cc liboctave/array/Array-i.cc liboctave/array/Array-s.cc liboctave/array/Array-str.cc liboctave/array/Array.cc |
diffstat | 10 files changed, 19 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/array/Array-C.cc Mon Dec 08 12:59:47 2014 -0500 +++ b/liboctave/array/Array-C.cc Thu Dec 11 00:15:03 2014 +0100 @@ -88,7 +88,7 @@ return result; } -INSTANTIATE_ARRAY_SORT (Complex); +template class OCTAVE_API octave_sort<Complex>; INSTANTIATE_ARRAY (Complex, OCTAVE_API);
--- a/liboctave/array/Array-b.cc Mon Dec 08 12:59:47 2014 -0500 +++ b/liboctave/array/Array-b.cc Thu Dec 11 00:15:03 2014 +0100 @@ -104,7 +104,7 @@ do_bool_partition<true> (data, idx, nel); } -INSTANTIATE_ARRAY_SORT (bool); +template class OCTAVE_API octave_sort<bool>; INSTANTIATE_ARRAY (bool, OCTAVE_API);
--- a/liboctave/array/Array-ch.cc Mon Dec 08 12:59:47 2014 -0500 +++ b/liboctave/array/Array-ch.cc Thu Dec 11 00:15:03 2014 +0100 @@ -32,7 +32,7 @@ #define INLINE_DESCENDING_SORT #include "oct-sort.cc" -INSTANTIATE_ARRAY_SORT (char); +template class OCTAVE_API octave_sort<char>; INSTANTIATE_ARRAY (char, OCTAVE_API);
--- a/liboctave/array/Array-d.cc Mon Dec 08 12:59:47 2014 -0500 +++ b/liboctave/array/Array-d.cc Thu Dec 11 00:15:03 2014 +0100 @@ -155,7 +155,7 @@ return mode; } -INSTANTIATE_ARRAY_SORT (double); +template class OCTAVE_API octave_sort<double>; INSTANTIATE_ARRAY (double, OCTAVE_API);
--- a/liboctave/array/Array-f.cc Mon Dec 08 12:59:47 2014 -0500 +++ b/liboctave/array/Array-f.cc Thu Dec 11 00:15:03 2014 +0100 @@ -155,7 +155,7 @@ return mode; } -INSTANTIATE_ARRAY_SORT (float); +template class OCTAVE_API octave_sort<float>; INSTANTIATE_ARRAY (float, OCTAVE_API);
--- a/liboctave/array/Array-fC.cc Mon Dec 08 12:59:47 2014 -0500 +++ b/liboctave/array/Array-fC.cc Thu Dec 11 00:15:03 2014 +0100 @@ -88,7 +88,7 @@ return result; } -INSTANTIATE_ARRAY_SORT (FloatComplex); +template class OCTAVE_API octave_sort<FloatComplex>; INSTANTIATE_ARRAY (FloatComplex, OCTAVE_API);
--- a/liboctave/array/Array-i.cc Mon Dec 08 12:59:47 2014 -0500 +++ b/liboctave/array/Array-i.cc Thu Dec 11 00:15:03 2014 +0100 @@ -35,10 +35,10 @@ #define INLINE_DESCENDING_SORT #include "oct-sort.cc" -INSTANTIATE_ARRAY_SORT (int); -INSTANTIATE_ARRAY_SORT (long); +template class OCTAVE_API octave_sort<int>; +template class OCTAVE_API octave_sort<long>; #if defined (HAVE_LONG_LONG_INT) -INSTANTIATE_ARRAY_SORT (long long); +template class OCTAVE_API octave_sort<long long>; #endif INSTANTIATE_ARRAY (int, OCTAVE_API); @@ -47,20 +47,20 @@ INSTANTIATE_ARRAY (long long, OCTAVE_API); #endif -INSTANTIATE_ARRAY_SORT (octave_int8); -INSTANTIATE_ARRAY_SORT (octave_int16); -INSTANTIATE_ARRAY_SORT (octave_int32); -INSTANTIATE_ARRAY_SORT (octave_int64); +template class OCTAVE_API octave_sort<octave_int8>; +template class OCTAVE_API octave_sort<octave_int16>; +template class OCTAVE_API octave_sort<octave_int32>; +template class OCTAVE_API octave_sort<octave_int64>; INSTANTIATE_ARRAY (octave_int8, OCTAVE_API); INSTANTIATE_ARRAY (octave_int16, OCTAVE_API); INSTANTIATE_ARRAY (octave_int32, OCTAVE_API); INSTANTIATE_ARRAY (octave_int64, OCTAVE_API); -INSTANTIATE_ARRAY_SORT (octave_uint8); -INSTANTIATE_ARRAY_SORT (octave_uint16); -INSTANTIATE_ARRAY_SORT (octave_uint32); -INSTANTIATE_ARRAY_SORT (octave_uint64); +template class OCTAVE_API octave_sort<octave_uint8>; +template class OCTAVE_API octave_sort<octave_uint16>; +template class OCTAVE_API octave_sort<octave_uint32>; +template class OCTAVE_API octave_sort<octave_uint64>; INSTANTIATE_ARRAY (octave_uint8, OCTAVE_API); INSTANTIATE_ARRAY (octave_uint16, OCTAVE_API);
--- a/liboctave/array/Array-s.cc Mon Dec 08 12:59:47 2014 -0500 +++ b/liboctave/array/Array-s.cc Thu Dec 11 00:15:03 2014 +0100 @@ -33,7 +33,7 @@ #define INLINE_DESCENDING_SORT #include "oct-sort.cc" -INSTANTIATE_ARRAY_SORT (short); +template class OCTAVE_API octave_sort<short>; INSTANTIATE_ARRAY (short, OCTAVE_API);
--- a/liboctave/array/Array-str.cc Mon Dec 08 12:59:47 2014 -0500 +++ b/liboctave/array/Array-str.cc Thu Dec 11 00:15:03 2014 +0100 @@ -32,6 +32,6 @@ #include "Array.cc" #include "oct-sort.cc" -INSTANTIATE_ARRAY_SORT (std::string); +template class OCTAVE_API octave_sort<std::string>; INSTANTIATE_ARRAY (std::string, OCTAVE_API);
--- a/liboctave/array/Array.cc Mon Dec 08 12:59:47 2014 -0500 +++ b/liboctave/array/Array.cc Thu Dec 11 00:15:03 2014 +0100 @@ -2478,9 +2478,6 @@ return m; } - -#define INSTANTIATE_ARRAY_SORT(T) template class OCTAVE_API octave_sort<T>; - #define NO_INSTANTIATE_ARRAY_SORT(T) \ \ template <> Array<T> \