Mercurial > hg > octave-nkf

diff liboctave/array/Array-i.cc @ 19590:fb09907f4e49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d63878346099
children 4197fc428c7d
line wrap: on
line diff
--- a/liboctave/array/Array-i.cc
+++ b/liboctave/array/Array-i.cc
@@ -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);