Mercurial > octave

annotate liboctave/numeric/oct-convn.h @ 30508:6f07492c9c20 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Provide header file with forward declarations of matrix types (bug #59820). * liboctave/array/mx-fwd.h: New file. * liboctave/array/module.mk: Add new file to build system. * other files in liboctave: Include mx-fwd.h instead of forward declaring matrix types.
author Markus Mützel <markus.muetzel@gmx.de>
date Mon, 06 Dec 2021 19:27:28 +0100
parents f3f3e3793fb5
children 796f54d4ddbf
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
2 //
29358
0a5b15007766 update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
3 // Copyright (C) 2009-2021 The Octave Project Developers
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
4 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
7 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
9 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
14 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
19 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
23 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
24 ////////////////////////////////////////////////////////////////////////
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
25
20791
f7084eae3318 maint: Use Octave coding conventions for #if statements.
Rik <rik@octave.org>
parents: 19697
diff changeset
26 #if ! defined (octave_oct_convn_h)
17822
ebb3ef964372 maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents: 17744
diff changeset
27 #define octave_oct_convn_h 1
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
28
21244
1473547f50f5 include octave-config.h in public header files
John W. Eaton <jwe@octave.org>
parents: 20791
diff changeset
29 #include "octave-config.h"
1473547f50f5 include octave-config.h in public header files
John W. Eaton <jwe@octave.org>
parents: 20791
diff changeset
30
30508
6f07492c9c20 Provide header file with forward declarations of matrix types (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents: 30394
diff changeset
31 #include "mx-fwd.h"
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
32
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
33 // The remaining includes can be removed when the global enum
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
34 // declaration, the convert_enum function, and the deprecated functions
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
35 // at the end of this file are removed.
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
36
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
37 #include <cstdlib>
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
38 #include "dMatrix.h"
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
39 #include "dNDArray.h"
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
40 #include "CMatrix.h"
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
41 #include "CNDArray.h"
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
42 #include "fMatrix.h"
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
43 #include "fNDArray.h"
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
44 #include "fCMatrix.h"
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
45 #include "fCNDArray.h"
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
46
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
47 // FIXME: Is there any sane way to move a global enum to a namespace and
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
48 // tag the global one as deprecated when it is used as a parameter in
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
49 // public functions that also need to be tagged as deprecated?
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
50
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
51 enum convn_type
30394
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29954
diff changeset
52 {
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29954
diff changeset
53 convn_full,
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29954
diff changeset
54 convn_same,
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29954
diff changeset
55 convn_valid
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29954
diff changeset
56 };
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29954
diff changeset
57
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29954
diff changeset
58 namespace octave
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29954
diff changeset
59 {
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29954
diff changeset
60 enum convn_type
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
61 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
62 convn_full,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
63 convn_same,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
64 convn_valid
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
65 };
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
66
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
67 // double real X double real
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
68
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
69 extern OCTAVE_API NDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
70 convn (const NDArray& a, const NDArray& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
71
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
72 extern OCTAVE_API Matrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
73 convn (const Matrix& a, const Matrix& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
74
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
75 extern OCTAVE_API Matrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
76 convn (const Matrix& a, const ColumnVector& c, const RowVector& r,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
77 convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
78
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
79 // double complex X double real
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
80
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
81 extern OCTAVE_API ComplexNDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
82 convn (const ComplexNDArray& a, const NDArray& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
83
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
84 extern OCTAVE_API ComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
85 convn (const ComplexMatrix& a, const Matrix& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
86
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
87 extern OCTAVE_API ComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
88 convn (const ComplexMatrix& a, const ColumnVector& c, const RowVector& r,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
89 convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
90
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
91 // double complex X double complex
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
92
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
93 extern OCTAVE_API ComplexNDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
94 convn (const ComplexNDArray& a, const ComplexNDArray& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
95
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
96 extern OCTAVE_API ComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
97 convn (const ComplexMatrix& a, const ComplexMatrix& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
98
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
99 extern OCTAVE_API ComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
100 convn (const ComplexMatrix& a, const ComplexColumnVector& c,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
101 const ComplexRowVector& r, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
102
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
103 // float real X float real
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
104
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
105 extern OCTAVE_API FloatNDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
106 convn (const FloatNDArray& a, const FloatNDArray& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
107
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
108 extern OCTAVE_API FloatMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
109 convn (const FloatMatrix& a, const FloatMatrix& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
110
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
111 extern OCTAVE_API FloatMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
112 convn (const FloatMatrix& a, const FloatColumnVector& c,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
113 const FloatRowVector& r, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
114
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
115 // float complex X float real
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
116
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
117 extern OCTAVE_API FloatComplexNDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
118 convn (const FloatComplexNDArray& a, const FloatNDArray& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
119
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
120 extern OCTAVE_API FloatComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
121 convn (const FloatComplexMatrix& a, const FloatMatrix& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
122
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
123 extern OCTAVE_API FloatComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
124 convn (const FloatComplexMatrix& a, const FloatColumnVector& c,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
125 const FloatRowVector& r, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
126
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
127 // float complex X float complex
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
128
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
129 extern OCTAVE_API FloatComplexNDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
130 convn (const FloatComplexNDArray& a, const FloatComplexNDArray& b,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
131 convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
132
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
133 extern OCTAVE_API FloatComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
134 convn (const FloatComplexMatrix& a, const FloatComplexMatrix& b,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
135 convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
136
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
137 extern OCTAVE_API FloatComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
138 convn (const FloatComplexMatrix& a, const FloatComplexColumnVector& c,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
139 const FloatComplexRowVector& r, convn_type ct);
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
140
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
141 convn_type convert_enum (::convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
142 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
143 switch (ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
144 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
145 case ::convn_full:
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
146 return convn_full;
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
147
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
148 case ::convn_same:
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
149 return convn_same;
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
150
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
151 case ::convn_valid:
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
152 return convn_valid;
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
153
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
154 default:
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
155 abort ();
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
156 }
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
157 }
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
158 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
159
29954
4c88a452519c rename OCTAVE_USE_DEPRECATED_FUNCTIONS macro and attempt to make it work
John W. Eaton <jwe@octave.org>
parents: 29876
diff changeset
160 #if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS)
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
161 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
162 inline NDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
163 convn (const NDArray& a, const NDArray& b, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
164 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
165 return octave::convn (a, b, static_cast<octave::convn_type> (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
166 }
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
167
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
168 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
169 inline Matrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
170 convn (const Matrix& a, const Matrix& b, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
171 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
172 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
173 }
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
174
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
175 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
176 inline Matrix
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
177 convn (const Matrix& a, const ColumnVector& c, const RowVector& r,
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
178 convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
179 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
180 return octave::convn (a, c, r, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
181 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
182
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
183 // double complex X double real
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
184
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
185 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
186 inline ComplexNDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
187 convn (const ComplexNDArray& a, const NDArray& b, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
188 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
189 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
190 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
191
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
192 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
193 inline ComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
194 convn (const ComplexMatrix& a, const Matrix& b, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
195 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
196 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
197 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
198
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
199 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
200 inline ComplexMatrix
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
201 convn (const ComplexMatrix& a, const ColumnVector& c, const RowVector& r,
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
202 convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
203 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
204 return octave::convn (a, c, r, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
205 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
206
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
207 // double complex X double complex
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
208
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
209 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
210 inline ComplexNDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
211 convn (const ComplexNDArray& a, const ComplexNDArray& b, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
212 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
213 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
214 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
215
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
216 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
217 inline ComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
218 convn (const ComplexMatrix& a, const ComplexMatrix& b, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
219 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
220 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
221 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
222
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
223 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
224 inline ComplexMatrix
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
225 convn (const ComplexMatrix& a, const ComplexColumnVector& c,
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
226 const ComplexRowVector& r, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
227 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
228 return octave::convn (a, c, r, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
229 }
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21244
diff changeset
230
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
231 // float real X float real
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
232
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
233 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
234 inline FloatNDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
235 convn (const FloatNDArray& a, const FloatNDArray& b, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
236 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
237 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
238 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
239
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
240 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
241 inline FloatMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
242 convn (const FloatMatrix& a, const FloatMatrix& b, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
243 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
244 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
245 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
246
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
247 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
248 inline FloatMatrix
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
249 convn (const FloatMatrix& a, const FloatColumnVector& c,
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
250 const FloatRowVector& r, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
251 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
252 return octave::convn (a, c, r, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
253 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
254
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
255 // float complex X float real
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
256
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
257 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
258 inline FloatComplexNDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
259 convn (const FloatComplexNDArray& a, const FloatNDArray& b,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
260 convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
261 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
262 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
263 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
264
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
265 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
266 inline FloatComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
267 convn (const FloatComplexMatrix& a, const FloatMatrix& b,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
268 convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
269 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
270 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
271 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
272
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
273 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
274 inline FloatComplexMatrix
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
275 convn (const FloatComplexMatrix& a, const FloatColumnVector& c,
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
276 const FloatRowVector& r, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
277 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
278 return octave::convn (a, c, r, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
279 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
280
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
281 // float complex X float complex
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
282
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
283 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
284 inline FloatComplexNDArray
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
285 convn (const FloatComplexNDArray& a, const FloatComplexNDArray& b,
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
286 convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
287 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
288 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
289 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
290
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
291 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
292 inline FloatComplexMatrix
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
293 convn (const FloatComplexMatrix& a, const FloatComplexMatrix& b,
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
294 convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
295 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
296 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
297 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
298
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
299 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
300 inline FloatComplexMatrix
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
301 convn (const FloatComplexMatrix& a, const FloatComplexColumnVector& c,
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
302 const FloatComplexRowVector& r, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
303 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
304 return octave::convn (a, c, r, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
305 }
29954
4c88a452519c rename OCTAVE_USE_DEPRECATED_FUNCTIONS macro and attempt to make it work
John W. Eaton <jwe@octave.org>
parents: 29876
diff changeset
306 #endif
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
307
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
308 #endif