mxe-octave: src/msvc-octave-1.patch annotate

annotate src/msvc-octave-1.patch @ 7207:9ed6500e56d3 default tip @

maint: Merge release to default.

author	Markus Mützel <markus.muetzel@gmx.de>
date	Fri, 17 May 2024 20:16:41 +0200
parents	b251f4358147
children

rev	line source
3341 b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	1 diff -ur octave-3.7.7-orig/configure.ac octave-3.7.7/configure.ac
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	2 --- octave-3.7.7-orig/configure.ac 2013-09-23 13:50:11 -0400
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	3 +++ octave-3.7.7/configure.ac 2013-11-30 11:00:38 -0500
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	4 @@ -757,7 +757,7 @@
3144 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`"
3341 b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 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"
3341 b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	13 @@ -1228,7 +1228,7 @@
3144 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
3341 b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	22 diff -ur octave-3.7.7-orig/libgui/qterminal-module.mk octave-3.7.7/libgui/qterminal-module.mk
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	23 --- octave-3.7.7-orig/libgui/qterminal-module.mk 2013-09-23 13:49:55 -0400
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	24 +++ octave-3.7.7/libgui/qterminal-module.mk 2013-11-30 11:00:38 -0500
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
3341 b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	34 diff -ur octave-3.7.7-orig/libgui/src/module.mk octave-3.7.7/libgui/src/module.mk
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	35 --- octave-3.7.7-orig/libgui/src/module.mk 2013-09-23 13:49:55 -0400
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	36 +++ octave-3.7.7/libgui/src/module.mk 2013-11-30 11:00:38 -0500
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	37 @@ -161,7 +161,7 @@
3144 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@ \
3341 b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	46 diff -ur octave-3.7.7-orig/libinterp/corefcn/gcd.cc octave-3.7.7/libinterp/corefcn/gcd.cc
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	47 --- octave-3.7.7-orig/libinterp/corefcn/gcd.cc 2013-09-23 13:49:55 -0400
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	48 +++ octave-3.7.7/libinterp/corefcn/gcd.cc 2013-11-30 11:00:38 -0500
3144 433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	49 @@ -74,7 +74,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	50
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	51 template <typename FP>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	52 static std::complex<FP>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	53 -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	54 +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	55 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	56 if (! xisinteger (a.real ()) \|\| ! xisinteger (a.imag ())
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	57 \|\| ! xisinteger (b.real ()) \|\| ! xisinteger (b.imag ()))
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	58 @@ -100,7 +100,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	59
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	60 template <class T>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	61 static octave_int<T>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	62 -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	63 +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	64 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	65 T aa = a.abs ().value ();
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	66 T bb = b.abs ().value ();
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	67 @@ -153,8 +153,8 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	68
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	69 template <typename FP>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	70 static std::complex<FP>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	71 -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	72 - std::complex<FP>& x, std::complex<FP>& y)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	73 +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	74 + std::complex<FP>& x, std::complex<FP>& y)
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 if (! xisinteger (a.real ()) \|\| ! xisinteger (a.imag ())
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	77 \|\| ! xisinteger (b.real ()) \|\| ! xisinteger (b.imag ()))
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	78 @@ -199,8 +199,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 <class T>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	81 static octave_int<T>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	82 -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	83 - octave_int<T>& x, octave_int<T>& y)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	84 +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	85 + octave_int<T>& x, octave_int<T>& 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 T aa = a.abs ().value ();
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	88 T bb = b.abs ().value ();
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	89 @@ -229,9 +229,9 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	90 return aa;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	91 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	92
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	93 -template<class NDA>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	94 +template<class NDA, class F>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	95 static octave_value
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	96 -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	97 +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	98 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	99 typedef typename NDA::element_type T;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	100 octave_value retval;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	101 @@ -241,13 +241,13 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	102 // Optimize scalar case.
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	103 T aa = octave_value_extract<T> (a);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	104 T bb = octave_value_extract<T> (b);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	105 - retval = simple_gcd (aa, bb);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	106 + retval = fcn (aa, bb);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	107 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	108 else
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 NDA aa = octave_value_extract<NDA> (a);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	111 NDA bb = octave_value_extract<NDA> (b);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	112 - retval = binmap<T> (aa, bb, simple_gcd, "gcd");
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	113 + retval = binmap<T> (aa, bb, fcn, "gcd");
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	114 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	115
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	116 return retval;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	117 @@ -265,18 +265,18 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	118 case btyp_double:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	119 if (a.is_sparse_type () && b.is_sparse_type ())
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 - retval = do_simple_gcd<SparseMatrix> (a, b);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	122 + retval = do_simple_gcd<SparseMatrix> (a, b, simple_gcd);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	123 break;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	124 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	125 // fall through!
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 case btyp_float:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	128 - retval = do_simple_gcd<NDArray> (a, b);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	129 + retval = do_simple_gcd<NDArray> (a, b, simple_gcd);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	130 break;
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 #define MAKE_INT_BRANCH(X) \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	133 case btyp_ ## X: \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	134 - retval = do_simple_gcd<X ## NDArray> (a, b); \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	135 + 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	136 break
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 MAKE_INT_BRANCH (int8);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	139 @@ -291,11 +291,11 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	140 #undef MAKE_INT_BRANCH
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	141
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	142 case btyp_complex:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	143 - retval = do_simple_gcd<ComplexNDArray> (a, b);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	144 + 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	145 break;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	146
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	147 case btyp_float_complex:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	148 - retval = do_simple_gcd<FloatComplexNDArray> (a, b);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	149 + 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	150 break;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	151
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	152 default:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	153 @@ -309,10 +309,10 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	154 return retval;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	155 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	156
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	157 -template<class NDA>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	158 +template<class NDA, class F>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	159 static octave_value
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	160 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	161 - octave_value& x, octave_value& y)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	162 + octave_value& x, octave_value& y, F fcn)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	163 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	164 typedef typename NDA::element_type T;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	165 octave_value retval;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	166 @@ -323,7 +323,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	167 T aa = octave_value_extract<T> (a);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	168 T bb = octave_value_extract<T> (b);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	169 T xx, yy;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	170 - retval = extended_gcd (aa, bb, xx, yy);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	171 + retval = fcn (aa, bb, xx, yy);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	172 x = xx;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	173 y = yy;
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 @@ -354,7 +354,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	176 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	177 octave_quit ();
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	178
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	179 - gptr++ = extended_gcd (aptr, bptr, xptr++, *yptr++);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	180 + gptr++ = fcn (aptr, bptr, xptr++, *yptr++);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	181
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	182 aptr += inca;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	183 bptr += incb;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	184 @@ -382,12 +382,12 @@
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 case btyp_double:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	187 case btyp_float:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	188 - retval = do_extended_gcd<NDArray> (a, b, x, y);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	189 + 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	190 break;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	191
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	192 #define MAKE_INT_BRANCH(X) \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	193 case btyp_ ## X: \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	194 - retval = do_extended_gcd<X ## NDArray> (a, b, x, y); \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	195 + 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	196 break
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	197
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	198 MAKE_INT_BRANCH (int8);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	199 @@ -402,11 +402,11 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	200 #undef MAKE_INT_BRANCH
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	201
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	202 case btyp_complex:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	203 - retval = do_extended_gcd<ComplexNDArray> (a, b, x, y);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	204 + 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	205 break;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	206
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	207 case btyp_float_complex:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	208 - retval = do_extended_gcd<FloatComplexNDArray> (a, b, x, y);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	209 + 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	210 break;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	211
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	212 default:
3341 b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	213 diff -ur octave-3.7.7-orig/libinterp/corefcn/graphics.cc octave-3.7.7/libinterp/corefcn/graphics.cc
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	214 --- octave-3.7.7-orig/libinterp/corefcn/graphics.cc 2013-09-23 13:49:55 -0400
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	215 +++ octave-3.7.7/libinterp/corefcn/graphics.cc 2013-11-30 11:00:38 -0500
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	216 @@ -10441,7 +10441,11 @@
3144 433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	217 break;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	218 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	219
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	220 +#if defined (WIN32) && ! defined (__CYGWIN__)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	221 + Sleep (100);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	222 +#else
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	223 octave_usleep (100000);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	224 +#endif
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	225
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	226 OCTAVE_QUIT;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	227
3341 b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	228 diff -ur octave-3.7.7-orig/liboctave/array/CColVector.cc octave-3.7.7/liboctave/array/CColVector.cc
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	229 --- octave-3.7.7-orig/liboctave/array/CColVector.cc 2013-09-23 13:49:55 -0400
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	230 +++ octave-3.7.7/liboctave/array/CColVector.cc 2013-11-30 11:00:38 -0500
3144 433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	231 @@ -236,13 +236,13 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	232 ColumnVector
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	233 ComplexColumnVector::abs (void) const
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 - return do_mx_unary_map<double, Complex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	236 + 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	237 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	238
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	239 ComplexColumnVector
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	240 conj (const ComplexColumnVector& a)
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 - 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	243 + 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	244 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	245
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	246 // resize is the destructive equivalent for this one
3341 b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	247 diff -ur octave-3.7.7-orig/liboctave/array/CMatrix.cc octave-3.7.7/liboctave/array/CMatrix.cc
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	248 --- octave-3.7.7-orig/liboctave/array/CMatrix.cc 2013-09-23 13:49:55 -0400
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	249 +++ octave-3.7.7/liboctave/array/CMatrix.cc 2013-11-30 11:00:38 -0500
3144 433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	250 @@ -921,7 +921,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	251 ComplexMatrix
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	252 conj (const ComplexMatrix& a)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	253 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	254 - 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	255 + 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	256 }
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 // resize is the destructive equivalent for this one
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	259 @@ -3219,7 +3219,7 @@
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 Matrix ComplexMatrix::abs (void) const
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	262 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	263 - return do_mx_unary_map<double, Complex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	264 + 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	265 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	266
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	267 ComplexMatrix
3341 b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	268 diff -ur octave-3.7.7-orig/liboctave/array/CNDArray.cc octave-3.7.7/liboctave/array/CNDArray.cc
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	269 --- octave-3.7.7-orig/liboctave/array/CNDArray.cc 2013-09-23 13:49:55 -0400
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	270 +++ octave-3.7.7/liboctave/array/CNDArray.cc 2013-11-30 11:00:38 -0500
3144 433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	271 @@ -720,31 +720,31 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	272 NDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	273 ComplexNDArray::abs (void) const
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	274 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	275 - return do_mx_unary_map<double, Complex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	276 + 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	277 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	278
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	279 boolNDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	280 ComplexNDArray::isnan (void) const
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	281 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	282 - return do_mx_unary_map<bool, Complex, xisnan> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	283 + return do_mx_unary_map_ref<bool, Complex, xisnan> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	284 }
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 boolNDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	287 ComplexNDArray::isinf (void) const
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 - return do_mx_unary_map<bool, Complex, xisinf> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	290 + return do_mx_unary_map_ref<bool, Complex, xisinf> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	291 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	292
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	293 boolNDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	294 ComplexNDArray::isfinite (void) const
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	295 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	296 - return do_mx_unary_map<bool, Complex, xfinite> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	297 + return do_mx_unary_map_ref<bool, Complex, xfinite> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	298 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	299
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	300 ComplexNDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	301 conj (const ComplexNDArray& a)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	302 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	303 - 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	304 + 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	305 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	306
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	307 ComplexNDArray&
3341 b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	308 diff -ur octave-3.7.7-orig/liboctave/array/CRowVector.cc octave-3.7.7/liboctave/array/CRowVector.cc
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	309 --- octave-3.7.7-orig/liboctave/array/CRowVector.cc 2013-09-23 13:49:55 -0400
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	310 +++ octave-3.7.7/liboctave/array/CRowVector.cc 2013-11-30 11:00:38 -0500
3144 433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	311 @@ -234,7 +234,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	312 ComplexRowVector
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	313 conj (const ComplexRowVector& a)
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 - 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	316 + 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	317 }
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 // resize is the destructive equivalent for this one
3341 b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	320 diff -ur octave-3.7.7-orig/liboctave/array/fCColVector.cc octave-3.7.7/liboctave/array/fCColVector.cc
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	321 --- octave-3.7.7-orig/liboctave/array/fCColVector.cc 2013-09-23 13:49:55 -0400
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	322 +++ octave-3.7.7/liboctave/array/fCColVector.cc 2013-11-30 11:00:38 -0500
3144 433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	323 @@ -236,13 +236,13 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	324 FloatColumnVector
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	325 FloatComplexColumnVector::abs (void) const
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	326 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	327 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	328 + 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	329 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	330
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	331 FloatComplexColumnVector
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	332 conj (const FloatComplexColumnVector& a)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	333 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	334 - 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	335 + 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	336 }
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 // resize is the destructive equivalent for this one
3341 b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	339 diff -ur octave-3.7.7-orig/liboctave/array/fCMatrix.cc octave-3.7.7/liboctave/array/fCMatrix.cc
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	340 --- octave-3.7.7-orig/liboctave/array/fCMatrix.cc 2013-09-23 13:49:55 -0400
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	341 +++ octave-3.7.7/liboctave/array/fCMatrix.cc 2013-11-30 11:00:38 -0500
3144 433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	342 @@ -923,7 +923,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	343 FloatComplexMatrix
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	344 conj (const FloatComplexMatrix& a)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	345 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	346 - 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	347 + 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	348 }
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 // resize is the destructive equivalent for this one
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	351 @@ -3215,7 +3215,7 @@
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 FloatMatrix FloatComplexMatrix::abs (void) const
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	354 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	355 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	356 + 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	357 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	358
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	359 FloatComplexMatrix
3341 b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	360 diff -ur octave-3.7.7-orig/liboctave/array/fCNDArray.cc octave-3.7.7/liboctave/array/fCNDArray.cc
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	361 --- octave-3.7.7-orig/liboctave/array/fCNDArray.cc 2013-09-23 13:49:55 -0400
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	362 +++ octave-3.7.7/liboctave/array/fCNDArray.cc 2013-11-30 11:00:38 -0500
3144 433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	363 @@ -717,31 +717,31 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	364 FloatNDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	365 FloatComplexNDArray::abs (void) const
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	366 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	367 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	368 + 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	369 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	370
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	371 boolNDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	372 FloatComplexNDArray::isnan (void) const
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	373 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	374 - return do_mx_unary_map<bool, FloatComplex, xisnan> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	375 + return do_mx_unary_map_ref<bool, FloatComplex, xisnan> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	376 }
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 boolNDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	379 FloatComplexNDArray::isinf (void) const
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 - return do_mx_unary_map<bool, FloatComplex, xisinf> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	382 + return do_mx_unary_map_ref<bool, FloatComplex, xisinf> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	383 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	384
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	385 boolNDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	386 FloatComplexNDArray::isfinite (void) const
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	387 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	388 - return do_mx_unary_map<bool, FloatComplex, xfinite> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	389 + return do_mx_unary_map_ref<bool, FloatComplex, xfinite> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	390 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	391
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	392 FloatComplexNDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	393 conj (const FloatComplexNDArray& a)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	394 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	395 - 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	396 + 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	397 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	398
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	399 FloatComplexNDArray&
3341 b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	400 diff -ur octave-3.7.7-orig/liboctave/array/fCRowVector.cc octave-3.7.7/liboctave/array/fCRowVector.cc
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	401 --- octave-3.7.7-orig/liboctave/array/fCRowVector.cc 2013-09-23 13:49:55 -0400
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	402 +++ octave-3.7.7/liboctave/array/fCRowVector.cc 2013-11-30 11:00:38 -0500
3144 433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	403 @@ -234,7 +234,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	404 FloatComplexRowVector
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	405 conj (const FloatComplexRowVector& a)
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 - 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	408 + 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	409 }
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 // resize is the destructive equivalent for this one
3341 b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	412 diff -ur octave-3.7.7-orig/liboctave/numeric/dbleQR.cc octave-3.7.7/liboctave/numeric/dbleQR.cc
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	413 --- octave-3.7.7-orig/liboctave/numeric/dbleQR.cc 2013-09-23 13:49:55 -0400
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	414 +++ octave-3.7.7/liboctave/numeric/dbleQR.cc 2013-11-30 11:00:38 -0500
3144 433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	415 @@ -95,7 +95,9 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	416 #endif
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
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	419 -const QR::type QR::raw, QR::std, QR::economy;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	420 +const QR::type QR::raw = qr_type_raw;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	421 +const QR::type QR::std = qr_type_std;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	422 +const QR::type QR::economy = qr_type_economy;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	423
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	424 QR::QR (const Matrix& a, qr_type_t qr_type)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	425 {
3341 b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	426 diff -ur octave-3.7.7-orig/liboctave/numeric/dbleQR.h octave-3.7.7/liboctave/numeric/dbleQR.h
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	427 --- octave-3.7.7-orig/liboctave/numeric/dbleQR.h 2013-09-23 13:49:55 -0400
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	428 +++ octave-3.7.7/liboctave/numeric/dbleQR.h 2013-11-30 11:00:38 -0500
3144 433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	429 @@ -40,9 +40,9 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	430 // Import them here to allow the QR:: prefix.
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	431 typedef qr_type_t type;
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 - static const type std = qr_type_std;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	434 - static const type raw = qr_type_raw;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	435 - static const type economy = qr_type_economy;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	436 + static const type std;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	437 + static const type raw;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	438 + static const type economy;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	439
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	440 QR (void) : base_qr<Matrix> () { }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	441
3341 b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	442 diff -ur octave-3.7.7-orig/liboctave/operators/mx-inlines.cc octave-3.7.7/liboctave/operators/mx-inlines.cc
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	443 --- octave-3.7.7-orig/liboctave/operators/mx-inlines.cc 2013-09-23 13:49:55 -0400
b251f4358147 [MSVC] auto-export gnulib symbols from liboctave. Michael Goffioul <michael.goffioul@gmail.com> parents: 3319 diff changeset	444 +++ octave-3.7.7/liboctave/operators/mx-inlines.cc 2013-11-30 11:00:38 -0500
3144 433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	445 @@ -316,7 +316,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	446 { 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	447
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	448 template <class R, class X, R fun (const X& x)>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	449 -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	450 +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	451 { 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	452
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	453 // 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	454 @@ -343,9 +343,9 @@
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 template <class R, class X, R fun (const X&)>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	457 inline Array<R>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	458 -do_mx_unary_map (const Array<X>& x)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	459 +do_mx_unary_map_ref (const Array<X>& x)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	460 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	461 - 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	462 + 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	463 }
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 template <class R>

Mercurial > mxe-octave

annotate src/msvc-octave-1.patch @ 7207:9ed6500e56d3 default tip @