Mercurial > mxe-octave

annotate src/msvc-octave-1.patch @ 3319:2636b3458f4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/msvc-octave-1.patch: Update to octave 3.7.7.
author Michael Goffioul <michael.goffioul@gmail.com>
date Tue, 12 Nov 2013 20:54:29 -0500
parents 2069703f3826
children b251f4358147
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur octave-3.7.5-orig/configure.ac octave-3.7.5/configure.ac
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- octave-3.7.5-orig/configure.ac 2013-05-14 03:12:10 -0400
3151
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3144
diff changeset
3 +++ octave-3.7.5/configure.ac 2013-07-18 11:27:26 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -752,7 +752,7 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 dnl Use -isystem so we don't get warnings from llvm headers
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`"
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7 LLVM_CXXFLAGS=
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 - LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`"
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 + LLVM_LDFLAGS="`$LLVM_CONFIG --ldflags`"
3319
2636b3458f4d * src/msvc-octave-1.patch: Update to octave 3.7.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3151
diff changeset
10
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11
3319
2636b3458f4d * src/msvc-octave-1.patch: Update to octave 3.7.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3151
diff changeset
12 LDFLAGS="$LDFLAGS $LLVM_LDFLAGS"
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 @@ -1186,7 +1186,7 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 XTRA_CRUFT_SH_LDFLAGS=
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15 if test $have_msvc = yes; then
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 FLIBS="$FLIBS -lkernel32"
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 - XTRA_CRUFT_SH_LDFLAGS="-Wl,-def:cruft/cruft.def"
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
18 + XTRA_CRUFT_SH_LDFLAGS="-Wl,cruft/cruft.def"
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19 fi
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20 AC_SUBST(XTRA_CRUFT_SH_LDFLAGS)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22 diff -ur octave-3.7.5-orig/libgui/qterminal-module.mk octave-3.7.5/libgui/qterminal-module.mk
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
23 --- octave-3.7.5-orig/libgui/qterminal-module.mk 2013-05-12 15:01:12 -0400
3151
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3144
diff changeset
24 +++ octave-3.7.5/libgui/qterminal-module.mk 2013-07-18 11:27:26 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
25 @@ -50,7 +50,7 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
26 qterminal_libqterminal_la_MOC += \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
27 qterminal/libqterminal/win32/moc-QWinTerminalImpl.cc
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
28
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
29 -qterminal_libqterminal_la_CPPFLAGS += -DUNICODE
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
30 +qterminal_libqterminal_la_CPPFLAGS += -DUNICODE -Zc:wchar_t-
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
31
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
32 # This flag is required to let MOC know about Q_OS_WIN32.
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
33 MOC_CPPFLAGS += -DQ_OS_WIN32
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
34 diff -ur octave-3.7.5-orig/libgui/src/module.mk octave-3.7.5/libgui/src/module.mk
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
35 --- octave-3.7.5-orig/libgui/src/module.mk 2013-05-12 17:21:10 -0400
3151
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3144
diff changeset
36 +++ octave-3.7.5/libgui/src/module.mk 2013-07-18 11:27:26 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
37 @@ -152,7 +152,7 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
38
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
39 nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
40
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
41 -src_libgui_src_la_CPPFLAGS = \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
42 +src_libgui_src_la_CPPFLAGS = -DQSCINTILLA_DLL \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
43 $(AM_CPPFLAGS) \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
44 @OCTGUI_DLL_DEFS@ \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
45 @QT_CPPFLAGS@ \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
46 diff -ur octave-3.7.5-orig/libinterp/Makefile.am octave-3.7.5/libinterp/Makefile.am
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
47 --- octave-3.7.5-orig/libinterp/Makefile.am 2013-04-16 11:26:09 -0400
3151
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3144
diff changeset
48 +++ octave-3.7.5/libinterp/Makefile.am 2013-07-18 11:27:26 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
49 @@ -185,6 +185,7 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
50 corefcn/libcorefcn.la \
3319
2636b3458f4d * src/msvc-octave-1.patch: Update to octave 3.7.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3151
diff changeset
51 corefcn/libtex_parser.la \
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
52 $(top_builddir)/liboctave/liboctave.la \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
53 + $(top_builddir)/libgnu/libgnu.la \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
54 $(LIBOCTINTERP_LINK_DEPS)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
55
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
56 # Increment these as needed and according to the rules in the libtool manual:
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
57 diff -ur octave-3.7.5-orig/libinterp/corefcn/gcd.cc octave-3.7.5/libinterp/corefcn/gcd.cc
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
58 --- octave-3.7.5-orig/libinterp/corefcn/gcd.cc 2013-02-16 18:52:27 -0500
3151
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3144
diff changeset
59 +++ octave-3.7.5/libinterp/corefcn/gcd.cc 2013-07-18 11:27:26 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
60 @@ -74,7 +74,7 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
61
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
62 template <typename FP>
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
63 static std::complex<FP>
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
64 -simple_gcd (const std::complex<FP>& a, const std::complex<FP>& b)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
65 +simple_gcd_cplx (const std::complex<FP>& a, const std::complex<FP>& b)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
66 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
67 if (! xisinteger (a.real ()) || ! xisinteger (a.imag ())
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
68 || ! xisinteger (b.real ()) || ! xisinteger (b.imag ()))
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
69 @@ -100,7 +100,7 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
70
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
71 template <class T>
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
72 static octave_int<T>
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
73 -simple_gcd (const octave_int<T>& a, const octave_int<T>& b)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
74 +simple_gcd_int (const octave_int<T>& a, const octave_int<T>& b)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
75 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
76 T aa = a.abs ().value ();
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
77 T bb = b.abs ().value ();
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
78 @@ -153,8 +153,8 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
79
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
80 template <typename FP>
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
81 static std::complex<FP>
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
82 -extended_gcd (const std::complex<FP>& a, const std::complex<FP>& b,
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
83 - std::complex<FP>& x, std::complex<FP>& y)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
84 +extended_gcd_cplx (const std::complex<FP>& a, const std::complex<FP>& b,
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
85 + std::complex<FP>& x, std::complex<FP>& y)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
86 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
87 if (! xisinteger (a.real ()) || ! xisinteger (a.imag ())
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
88 || ! xisinteger (b.real ()) || ! xisinteger (b.imag ()))
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
89 @@ -199,8 +199,8 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
90
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
91 template <class T>
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
92 static octave_int<T>
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
93 -extended_gcd (const octave_int<T>& a, const octave_int<T>& b,
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
94 - octave_int<T>& x, octave_int<T>& y)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
95 +extended_gcd_int (const octave_int<T>& a, const octave_int<T>& b,
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
96 + octave_int<T>& x, octave_int<T>& y)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
97 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
98 T aa = a.abs ().value ();
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
99 T bb = b.abs ().value ();
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
100 @@ -229,9 +229,9 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
101 return aa;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
102 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
103
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
104 -template<class NDA>
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
105 +template<class NDA, class F>
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
106 static octave_value
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
107 -do_simple_gcd (const octave_value& a, const octave_value& b)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
108 +do_simple_gcd (const octave_value& a, const octave_value& b, F fcn)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
109 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
110 typedef typename NDA::element_type T;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
111 octave_value retval;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
112 @@ -241,13 +241,13 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
113 // Optimize scalar case.
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
114 T aa = octave_value_extract<T> (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
115 T bb = octave_value_extract<T> (b);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
116 - retval = simple_gcd (aa, bb);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
117 + retval = fcn (aa, bb);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
118 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
119 else
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
120 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
121 NDA aa = octave_value_extract<NDA> (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
122 NDA bb = octave_value_extract<NDA> (b);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
123 - retval = binmap<T> (aa, bb, simple_gcd, "gcd");
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
124 + retval = binmap<T> (aa, bb, fcn, "gcd");
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
125 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
126
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
127 return retval;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
128 @@ -265,18 +265,18 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
129 case btyp_double:
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
130 if (a.is_sparse_type () && b.is_sparse_type ())
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
131 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
132 - retval = do_simple_gcd<SparseMatrix> (a, b);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
133 + retval = do_simple_gcd<SparseMatrix> (a, b, simple_gcd);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
134 break;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
135 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
136 // fall through!
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
137
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
138 case btyp_float:
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
139 - retval = do_simple_gcd<NDArray> (a, b);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
140 + retval = do_simple_gcd<NDArray> (a, b, simple_gcd);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
141 break;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
142
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
143 #define MAKE_INT_BRANCH(X) \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
144 case btyp_ ## X: \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
145 - retval = do_simple_gcd<X ## NDArray> (a, b); \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
146 + retval = do_simple_gcd<X ## NDArray> (a, b, simple_gcd_int<X ## _t>); \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
147 break
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
148
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
149 MAKE_INT_BRANCH (int8);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
150 @@ -291,11 +291,11 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
151 #undef MAKE_INT_BRANCH
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
152
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
153 case btyp_complex:
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
154 - retval = do_simple_gcd<ComplexNDArray> (a, b);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
155 + retval = do_simple_gcd<ComplexNDArray> (a, b, simple_gcd_cplx<double>);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
156 break;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
157
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
158 case btyp_float_complex:
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
159 - retval = do_simple_gcd<FloatComplexNDArray> (a, b);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
160 + retval = do_simple_gcd<FloatComplexNDArray> (a, b, simple_gcd_cplx<float>);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
161 break;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
162
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
163 default:
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
164 @@ -309,10 +309,10 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
165 return retval;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
166 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
167
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
168 -template<class NDA>
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
169 +template<class NDA, class F>
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
170 static octave_value
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
171 do_extended_gcd (const octave_value& a, const octave_value& b,
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
172 - octave_value& x, octave_value& y)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
173 + octave_value& x, octave_value& y, F fcn)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
174 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
175 typedef typename NDA::element_type T;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
176 octave_value retval;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
177 @@ -323,7 +323,7 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
178 T aa = octave_value_extract<T> (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
179 T bb = octave_value_extract<T> (b);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
180 T xx, yy;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
181 - retval = extended_gcd (aa, bb, xx, yy);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
182 + retval = fcn (aa, bb, xx, yy);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
183 x = xx;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
184 y = yy;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
185 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
186 @@ -354,7 +354,7 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
187 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
188 octave_quit ();
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
189
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
190 - *gptr++ = extended_gcd (*aptr, *bptr, *xptr++, *yptr++);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
191 + *gptr++ = fcn (*aptr, *bptr, *xptr++, *yptr++);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
192
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
193 aptr += inca;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
194 bptr += incb;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
195 @@ -382,12 +382,12 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
196 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
197 case btyp_double:
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
198 case btyp_float:
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
199 - retval = do_extended_gcd<NDArray> (a, b, x, y);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
200 + retval = do_extended_gcd<NDArray> (a, b, x, y, extended_gcd);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
201 break;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
202
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
203 #define MAKE_INT_BRANCH(X) \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
204 case btyp_ ## X: \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
205 - retval = do_extended_gcd<X ## NDArray> (a, b, x, y); \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
206 + retval = do_extended_gcd<X ## NDArray> (a, b, x, y, extended_gcd_int<X ## _t>); \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
207 break
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
208
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
209 MAKE_INT_BRANCH (int8);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
210 @@ -402,11 +402,11 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
211 #undef MAKE_INT_BRANCH
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
212
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
213 case btyp_complex:
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
214 - retval = do_extended_gcd<ComplexNDArray> (a, b, x, y);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
215 + retval = do_extended_gcd<ComplexNDArray> (a, b, x, y, extended_gcd_cplx<double>);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
216 break;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
217
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
218 case btyp_float_complex:
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
219 - retval = do_extended_gcd<FloatComplexNDArray> (a, b, x, y);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
220 + retval = do_extended_gcd<FloatComplexNDArray> (a, b, x, y, extended_gcd_cplx<float>);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
221 break;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
222
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
223 default:
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
224 diff -ur octave-3.7.5-orig/libinterp/dldfcn/config-module.awk octave-3.7.5/libinterp/dldfcn/config-module.awk
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
225 --- octave-3.7.5-orig/libinterp/dldfcn/config-module.awk 2013-02-16 18:52:27 -0500
3151
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3144
diff changeset
226 +++ octave-3.7.5/libinterp/dldfcn/config-module.awk 2013-07-18 11:27:26 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
227 @@ -71,7 +71,7 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
228 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
229 printf ("dldfcn_%s_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED_LDFLAG) %s $(OCT_LINK_OPTS)\n",
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
230 basename, ldflags[i]);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
231 - printf ("dldfcn_%s_la_LIBADD = $(DLD_LIBOCTINTERP_LIBADD) ../liboctave/liboctave.la %s $(OCT_LINK_DEPS)\n",
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
232 + printf ("dldfcn_%s_la_LIBADD = $(DLD_LIBOCTINTERP_LIBADD) ../liboctave/liboctave.la ../libgnu/libgnu.la %s $(OCT_LINK_DEPS)\n",
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
233 basename, libraries[i]);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
234 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
235 }
3319
2636b3458f4d * src/msvc-octave-1.patch: Update to octave 3.7.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3151
diff changeset
236 diff -ur octave-3.7.5-orig/libinterp/corefcn/graphics.cc octave-3.7.5/libinterp/corefcn/graphics.cc
2636b3458f4d * src/msvc-octave-1.patch: Update to octave 3.7.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3151
diff changeset
237 --- octave-3.7.5-orig/libinterp/corefcn/graphics.cc 2013-04-16 11:26:09 -0400
2636b3458f4d * src/msvc-octave-1.patch: Update to octave 3.7.7.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3151
diff changeset
238 +++ octave-3.7.5/libinterp/corefcn/graphics.cc 2013-07-18 11:27:26 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
239 @@ -10304,7 +10304,11 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
240 break;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
241 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
242
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
243 +#if defined (WIN32) && ! defined (__CYGWIN__)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
244 + Sleep (100);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
245 +#else
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
246 octave_usleep (100000);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
247 +#endif
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
248
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
249 OCTAVE_QUIT;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
250
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
251 diff -ur octave-3.7.5-orig/liboctave/array/CColVector.cc octave-3.7.5/liboctave/array/CColVector.cc
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
252 --- octave-3.7.5-orig/liboctave/array/CColVector.cc 2013-02-16 18:52:27 -0500
3151
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3144
diff changeset
253 +++ octave-3.7.5/liboctave/array/CColVector.cc 2013-07-18 11:27:26 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
254 @@ -236,13 +236,13 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
255 ColumnVector
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
256 ComplexColumnVector::abs (void) const
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
257 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
258 - return do_mx_unary_map<double, Complex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
259 + return do_mx_unary_map_ref<double, Complex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
260 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
261
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
262 ComplexColumnVector
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
263 conj (const ComplexColumnVector& a)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
264 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
265 - return do_mx_unary_map<Complex, Complex, std::conj<double> > (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
266 + return do_mx_unary_map_ref<Complex, Complex, std::conj<double> > (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
267 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
268
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
269 // resize is the destructive equivalent for this one
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
270 diff -ur octave-3.7.5-orig/liboctave/array/CMatrix.cc octave-3.7.5/liboctave/array/CMatrix.cc
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
271 --- octave-3.7.5-orig/liboctave/array/CMatrix.cc 2013-04-16 11:26:09 -0400
3151
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3144
diff changeset
272 +++ octave-3.7.5/liboctave/array/CMatrix.cc 2013-07-18 11:27:26 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
273 @@ -921,7 +921,7 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
274 ComplexMatrix
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
275 conj (const ComplexMatrix& a)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
276 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
277 - return do_mx_unary_map<Complex, Complex, std::conj<double> > (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
278 + return do_mx_unary_map_ref<Complex, Complex, std::conj<double> > (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
279 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
280
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
281 // resize is the destructive equivalent for this one
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
282 @@ -3219,7 +3219,7 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
283
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
284 Matrix ComplexMatrix::abs (void) const
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
285 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
286 - return do_mx_unary_map<double, Complex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
287 + return do_mx_unary_map_ref<double, Complex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
288 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
289
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
290 ComplexMatrix
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
291 diff -ur octave-3.7.5-orig/liboctave/array/CNDArray.cc octave-3.7.5/liboctave/array/CNDArray.cc
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
292 --- octave-3.7.5-orig/liboctave/array/CNDArray.cc 2013-02-16 18:52:27 -0500
3151
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3144
diff changeset
293 +++ octave-3.7.5/liboctave/array/CNDArray.cc 2013-07-18 11:27:26 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
294 @@ -720,31 +720,31 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
295 NDArray
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
296 ComplexNDArray::abs (void) const
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
297 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
298 - return do_mx_unary_map<double, Complex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
299 + return do_mx_unary_map_ref<double, Complex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
300 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
301
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
302 boolNDArray
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
303 ComplexNDArray::isnan (void) const
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
304 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
305 - return do_mx_unary_map<bool, Complex, xisnan> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
306 + return do_mx_unary_map_ref<bool, Complex, xisnan> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
307 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
308
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
309 boolNDArray
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
310 ComplexNDArray::isinf (void) const
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
311 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
312 - return do_mx_unary_map<bool, Complex, xisinf> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
313 + return do_mx_unary_map_ref<bool, Complex, xisinf> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
314 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
315
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
316 boolNDArray
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
317 ComplexNDArray::isfinite (void) const
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
318 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
319 - return do_mx_unary_map<bool, Complex, xfinite> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
320 + return do_mx_unary_map_ref<bool, Complex, xfinite> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
321 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
322
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
323 ComplexNDArray
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
324 conj (const ComplexNDArray& a)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
325 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
326 - return do_mx_unary_map<Complex, Complex, std::conj<double> > (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
327 + return do_mx_unary_map_ref<Complex, Complex, std::conj<double> > (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
328 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
329
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
330 ComplexNDArray&
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
331 diff -ur octave-3.7.5-orig/liboctave/array/CRowVector.cc octave-3.7.5/liboctave/array/CRowVector.cc
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
332 --- octave-3.7.5-orig/liboctave/array/CRowVector.cc 2013-02-16 18:52:27 -0500
3151
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3144
diff changeset
333 +++ octave-3.7.5/liboctave/array/CRowVector.cc 2013-07-18 11:27:26 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
334 @@ -234,7 +234,7 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
335 ComplexRowVector
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
336 conj (const ComplexRowVector& a)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
337 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
338 - return do_mx_unary_map<Complex, Complex, std::conj<double> > (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
339 + return do_mx_unary_map_ref<Complex, Complex, std::conj<double> > (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
340 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
341
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
342 // resize is the destructive equivalent for this one
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
343 diff -ur octave-3.7.5-orig/liboctave/array/fCColVector.cc octave-3.7.5/liboctave/array/fCColVector.cc
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
344 --- octave-3.7.5-orig/liboctave/array/fCColVector.cc 2013-02-16 18:52:27 -0500
3151
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3144
diff changeset
345 +++ octave-3.7.5/liboctave/array/fCColVector.cc 2013-07-18 11:27:26 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
346 @@ -236,13 +236,13 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
347 FloatColumnVector
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
348 FloatComplexColumnVector::abs (void) const
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
349 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
350 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
351 + return do_mx_unary_map_ref<float, FloatComplex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
352 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
353
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
354 FloatComplexColumnVector
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
355 conj (const FloatComplexColumnVector& a)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
356 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
357 - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
358 + return do_mx_unary_map_ref<FloatComplex, FloatComplex, std::conj<float> > (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
359 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
360
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
361 // resize is the destructive equivalent for this one
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
362 diff -ur octave-3.7.5-orig/liboctave/array/fCMatrix.cc octave-3.7.5/liboctave/array/fCMatrix.cc
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
363 --- octave-3.7.5-orig/liboctave/array/fCMatrix.cc 2013-04-16 11:26:09 -0400
3151
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3144
diff changeset
364 +++ octave-3.7.5/liboctave/array/fCMatrix.cc 2013-07-18 11:27:26 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
365 @@ -923,7 +923,7 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
366 FloatComplexMatrix
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
367 conj (const FloatComplexMatrix& a)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
368 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
369 - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
370 + return do_mx_unary_map_ref<FloatComplex, FloatComplex, std::conj<float> > (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
371 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
372
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
373 // resize is the destructive equivalent for this one
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
374 @@ -3215,7 +3215,7 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
375
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
376 FloatMatrix FloatComplexMatrix::abs (void) const
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
377 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
378 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
379 + return do_mx_unary_map_ref<float, FloatComplex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
380 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
381
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
382 FloatComplexMatrix
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
383 diff -ur octave-3.7.5-orig/liboctave/array/fCNDArray.cc octave-3.7.5/liboctave/array/fCNDArray.cc
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
384 --- octave-3.7.5-orig/liboctave/array/fCNDArray.cc 2013-02-16 18:52:27 -0500
3151
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3144
diff changeset
385 +++ octave-3.7.5/liboctave/array/fCNDArray.cc 2013-07-18 11:27:26 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
386 @@ -717,31 +717,31 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
387 FloatNDArray
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
388 FloatComplexNDArray::abs (void) const
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
389 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
390 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
391 + return do_mx_unary_map_ref<float, FloatComplex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
392 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
393
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
394 boolNDArray
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
395 FloatComplexNDArray::isnan (void) const
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
396 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
397 - return do_mx_unary_map<bool, FloatComplex, xisnan> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
398 + return do_mx_unary_map_ref<bool, FloatComplex, xisnan> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
399 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
400
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
401 boolNDArray
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
402 FloatComplexNDArray::isinf (void) const
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
403 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
404 - return do_mx_unary_map<bool, FloatComplex, xisinf> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
405 + return do_mx_unary_map_ref<bool, FloatComplex, xisinf> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
406 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
407
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
408 boolNDArray
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
409 FloatComplexNDArray::isfinite (void) const
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
410 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
411 - return do_mx_unary_map<bool, FloatComplex, xfinite> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
412 + return do_mx_unary_map_ref<bool, FloatComplex, xfinite> (*this);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
413 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
414
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
415 FloatComplexNDArray
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
416 conj (const FloatComplexNDArray& a)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
417 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
418 - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
419 + return do_mx_unary_map_ref<FloatComplex, FloatComplex, std::conj<float> > (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
420 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
421
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
422 FloatComplexNDArray&
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
423 diff -ur octave-3.7.5-orig/liboctave/array/fCRowVector.cc octave-3.7.5/liboctave/array/fCRowVector.cc
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
424 --- octave-3.7.5-orig/liboctave/array/fCRowVector.cc 2013-02-16 18:52:27 -0500
3151
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3144
diff changeset
425 +++ octave-3.7.5/liboctave/array/fCRowVector.cc 2013-07-18 11:27:26 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
426 @@ -234,7 +234,7 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
427 FloatComplexRowVector
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
428 conj (const FloatComplexRowVector& a)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
429 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
430 - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
431 + return do_mx_unary_map_ref<FloatComplex, FloatComplex, std::conj<float> > (a);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
432 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
433
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
434 // resize is the destructive equivalent for this one
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
435 diff -ur octave-3.7.5-orig/liboctave/numeric/dbleQR.cc octave-3.7.5/liboctave/numeric/dbleQR.cc
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
436 --- octave-3.7.5-orig/liboctave/numeric/dbleQR.cc 2013-02-16 18:52:27 -0500
3151
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3144
diff changeset
437 +++ octave-3.7.5/liboctave/numeric/dbleQR.cc 2013-07-18 11:27:26 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
438 @@ -95,7 +95,9 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
439 #endif
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
440 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
441
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
442 -const QR::type QR::raw, QR::std, QR::economy;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
443 +const QR::type QR::raw = qr_type_raw;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
444 +const QR::type QR::std = qr_type_std;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
445 +const QR::type QR::economy = qr_type_economy;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
446
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
447 QR::QR (const Matrix& a, qr_type_t qr_type)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
448 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
449 diff -ur octave-3.7.5-orig/liboctave/numeric/dbleQR.h octave-3.7.5/liboctave/numeric/dbleQR.h
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
450 --- octave-3.7.5-orig/liboctave/numeric/dbleQR.h 2013-02-16 18:52:27 -0500
3151
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3144
diff changeset
451 +++ octave-3.7.5/liboctave/numeric/dbleQR.h 2013-07-18 11:27:26 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
452 @@ -40,9 +40,9 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
453 // Import them here to allow the QR:: prefix.
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
454 typedef qr_type_t type;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
455
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
456 - static const type std = qr_type_std;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
457 - static const type raw = qr_type_raw;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
458 - static const type economy = qr_type_economy;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
459 + static const type std;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
460 + static const type raw;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
461 + static const type economy;
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
462
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
463 QR (void) : base_qr<Matrix> () { }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
464
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
465 diff -ur octave-3.7.5-orig/liboctave/operators/mx-inlines.cc octave-3.7.5/liboctave/operators/mx-inlines.cc
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
466 --- octave-3.7.5-orig/liboctave/operators/mx-inlines.cc 2013-02-16 18:52:27 -0500
3151
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3144
diff changeset
467 +++ octave-3.7.5/liboctave/operators/mx-inlines.cc 2013-07-18 11:27:27 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
468 @@ -316,7 +316,7 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
469 { for (size_t i = 0; i < n; i++) r[i] = fun (x[i]); }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
470
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
471 template <class R, class X, R fun (const X& x)>
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
472 -inline void mx_inline_map (size_t n, R *r, const X *x) throw ()
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
473 +inline void mx_inline_map_ref (size_t n, R *r, const X *x) throw ()
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
474 { for (size_t i = 0; i < n; i++) r[i] = fun (x[i]); }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
475
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
476 // Appliers. Since these call the operation just once, we pass it as
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
477 @@ -343,9 +343,9 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
478
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
479 template <class R, class X, R fun (const X&)>
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
480 inline Array<R>
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
481 -do_mx_unary_map (const Array<X>& x)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
482 +do_mx_unary_map_ref (const Array<X>& x)
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
483 {
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
484 - return do_mx_unary_op<R, X> (x, mx_inline_map<R, X, fun>);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
485 + return do_mx_unary_op<R, X> (x, mx_inline_map_ref<R, X, fun>);
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
486 }
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
487
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
488 template <class R>
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
489 diff -ur octave-3.7.5-orig/src/Makefile.am octave-3.7.5/src/Makefile.am
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
490 --- octave-3.7.5-orig/src/Makefile.am 2013-04-16 11:26:10 -0400
3151
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3144
diff changeset
491 +++ octave-3.7.5/src/Makefile.am 2013-07-18 11:27:27 -0400
3144
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
492 @@ -49,7 +49,8 @@
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
493
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
494 OCTAVE_CORE_LIBS = \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
495 $(top_builddir)/libinterp/liboctinterp.la \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
496 - $(top_builddir)/liboctave/liboctave.la
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
497 + $(top_builddir)/liboctave/liboctave.la \
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
498 + $(top_builddir)/libgnu/libgnu.la
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
499
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
500 include ../libgui/link-deps.mk
433d1bb3cafb [MSVC] enable octave compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
501