Mercurial > jwe > octave

comparison libinterp/corefcn/filter.cc @ 21149:7962dbca527f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate obsolete CXX_NEW_FRIEND_TEMPLATE_DECL macro * acinclude.m4 (OCTAVE_CXX_NEW_FRIEND_TEMPLATE_DECL): Delete macro definition. * configure.ac: Don't use it. * filter.cc, eigs-base.cc, sparse-dmsolve.cc: Eliminate use of CXX_NEW_FRIEND_TEMPLATE_DECL macro since this feature should be present in all modern C++ compilers.
author John W. Eaton <jwe@octave.org>
date Fri, 29 Jan 2016 12:23:09 -0500
parents 538b57866b90
children fcac5dbbf9ed
comparison
equal deleted inserted replaced
21148:e8c3590da9ff 21149:7962dbca527f
35 #include "quit.h" 35 #include "quit.h"
36 36
37 #include "defun.h" 37 #include "defun.h"
38 #include "error.h" 38 #include "error.h"
39 #include "ovl.h" 39 #include "ovl.h"
40
41 #if ! defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
42 extern MArray<double>
43 filter (MArray<double>&, MArray<double>&, MArray<double>&, int dim);
44
45 extern MArray<Complex>
46 filter (MArray<Complex>&, MArray<Complex>&, MArray<Complex>&, int dim);
47
48 extern MArray<float>
49 filter (MArray<float>&, MArray<float>&, MArray<float>&, int dim);
50
51 extern MArray<FloatComplex>
52 filter (MArray<FloatComplex>&, MArray<FloatComplex>&, MArray<FloatComplex>&,
53 int dim);
54 #endif
55 40
56 template <typename T> 41 template <typename T>
57 MArray<T> 42 MArray<T>
58 filter (MArray<T>& b, MArray<T>& a, MArray<T>& x, MArray<T>& si, 43 filter (MArray<T>& b, MArray<T>& a, MArray<T>& x, MArray<T>& si,
59 int dim = 0) 44 int dim = 0)
214 } 199 }
215 } 200 }
216 201
217 return y; 202 return y;
218 } 203 }
219
220 #if ! defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
221 extern MArray<double>
222 filter (MArray<double>&, MArray<double>&, MArray<double>&,
223 MArray<double>&, int dim);
224
225 extern MArray<Complex>
226 filter (MArray<Complex>&, MArray<Complex>&, MArray<Complex>&,
227 MArray<Complex>&, int dim);
228
229 extern MArray<float>
230 filter (MArray<float>&, MArray<float>&, MArray<float>&,
231 MArray<float>&, int dim);
232
233 extern MArray<FloatComplex>
234 filter (MArray<FloatComplex>&, MArray<FloatComplex>&, MArray<FloatComplex>&,
235 MArray<FloatComplex>&, int dim);
236 #endif
237 204
238 template <typename T> 205 template <typename T>
239 MArray<T> 206 MArray<T>
240 filter (MArray<T>& b, MArray<T>& a, MArray<T>& x, int dim = -1) 207 filter (MArray<T>& b, MArray<T>& a, MArray<T>& x, int dim = -1)
241 { 208 {