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

annotate src/msvc-octave-1.patch @ 3151:2069703f3826

[MSVC] don't auto-define _WIN32_WINNT: include patch from upstream,

author	Michael Goffioul <michael.goffioul@gmail.com>
date	Thu, 18 Jul 2013 16:19:54 -0400
parents	433d1bb3cafb
children	2636b3458f4d

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`"
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	10 LLVM_LIBS=`$LLVM_CONFIG --libs`
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	11
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	12 dnl
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
3151 2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream, Michael Goffioul <michael.goffioul@gmail.com> parents: 3144 diff changeset	22 diff -ur octave-3.7.5-orig/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp octave-3.7.5/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream, Michael Goffioul <michael.goffioul@gmail.com> parents: 3144 diff changeset	23 --- octave-3.7.5-orig/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp 2013-05-13 05:58:35 -0400
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/libqterminal/win32/QWinTerminalImpl.cpp 2013-07-18 11:28:12 -0400
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream, Michael Goffioul <michael.goffioul@gmail.com> parents: 3144 diff changeset	25 @@ -40,7 +40,9 @@
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream, Michael Goffioul <michael.goffioul@gmail.com> parents: 3144 diff changeset	26 #include <stdio.h>
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream, Michael Goffioul <michael.goffioul@gmail.com> parents: 3144 diff changeset	27 #include <stdarg.h>
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream, Michael Goffioul <michael.goffioul@gmail.com> parents: 3144 diff changeset	28 #define WIN32_LEAN_AND_MEAN
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream, Michael Goffioul <michael.goffioul@gmail.com> parents: 3144 diff changeset	29 +#if ! defined (_WIN32_WINNT) && ! defined (NTDDI_VERSION)
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream, Michael Goffioul <michael.goffioul@gmail.com> parents: 3144 diff changeset	30 #define _WIN32_WINNT 0x0500
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream, Michael Goffioul <michael.goffioul@gmail.com> parents: 3144 diff changeset	31 +#endif
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream, Michael Goffioul <michael.goffioul@gmail.com> parents: 3144 diff changeset	32 #include <windows.h>
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream, Michael Goffioul <michael.goffioul@gmail.com> parents: 3144 diff changeset	33 #include <cstring>
2069703f3826 [MSVC] don't auto-define _WIN32_WINNT: include patch from upstream, Michael Goffioul <michael.goffioul@gmail.com> parents: 3144 diff changeset	34 #include <csignal>
3144 433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	35 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	36 --- 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	37 +++ 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	38 @@ -50,7 +50,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	39 qterminal_libqterminal_la_MOC += \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	40 qterminal/libqterminal/win32/moc-QWinTerminalImpl.cc
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	41
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	42 -qterminal_libqterminal_la_CPPFLAGS += -DUNICODE
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	43 +qterminal_libqterminal_la_CPPFLAGS += -DUNICODE -Zc:wchar_t-
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	44
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	45 # 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	46 MOC_CPPFLAGS += -DQ_OS_WIN32
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	47 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	48 --- 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	49 +++ 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	50 @@ -152,7 +152,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	51
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	52 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	53
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	54 -src_libgui_src_la_CPPFLAGS = \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	55 +src_libgui_src_la_CPPFLAGS = -DQSCINTILLA_DLL \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	56 $(AM_CPPFLAGS) \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	57 @OCTGUI_DLL_DEFS@ \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	58 @QT_CPPFLAGS@ \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	59 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	60 --- 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	61 +++ 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	62 @@ -185,6 +185,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	63 interpfcn/libinterpfcn.la \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	64 corefcn/libcorefcn.la \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	65 $(top_builddir)/liboctave/liboctave.la \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	66 + $(top_builddir)/libgnu/libgnu.la \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	67 $(LIBOCTINTERP_LINK_DEPS)
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 # 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	70 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	71 --- 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	72 +++ 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	73 @@ -74,7 +74,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	74
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	75 template <typename FP>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	76 static std::complex<FP>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	77 -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	78 +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	79 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	80 if (! xisinteger (a.real ()) \|\| ! xisinteger (a.imag ())
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	81 \|\| ! xisinteger (b.real ()) \|\| ! xisinteger (b.imag ()))
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	82 @@ -100,7 +100,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	83
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	84 template <class T>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	85 static octave_int<T>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	86 -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	87 +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	88 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	89 T aa = a.abs ().value ();
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	90 T bb = b.abs ().value ();
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	91 @@ -153,8 +153,8 @@
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 <typename FP>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	94 static std::complex<FP>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	95 -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	96 - std::complex<FP>& x, std::complex<FP>& y)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	97 +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	98 + std::complex<FP>& x, std::complex<FP>& y)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	99 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	100 if (! xisinteger (a.real ()) \|\| ! xisinteger (a.imag ())
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	101 \|\| ! xisinteger (b.real ()) \|\| ! xisinteger (b.imag ()))
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	102 @@ -199,8 +199,8 @@
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 T>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	105 static octave_int<T>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	106 -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	107 - octave_int<T>& x, octave_int<T>& y)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	108 +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	109 + octave_int<T>& x, octave_int<T>& y)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	110 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	111 T aa = a.abs ().value ();
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	112 T bb = b.abs ().value ();
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	113 @@ -229,9 +229,9 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	114 return aa;
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
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	117 -template<class NDA>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	118 +template<class NDA, class F>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	119 static octave_value
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	120 -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	121 +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	122 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	123 typedef typename NDA::element_type T;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	124 octave_value retval;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	125 @@ -241,13 +241,13 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	126 // Optimize scalar case.
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	127 T aa = octave_value_extract<T> (a);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	128 T bb = octave_value_extract<T> (b);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	129 - retval = simple_gcd (aa, bb);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	130 + retval = fcn (aa, bb);
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 else
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	133 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	134 NDA aa = octave_value_extract<NDA> (a);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	135 NDA bb = octave_value_extract<NDA> (b);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	136 - retval = binmap<T> (aa, bb, simple_gcd, "gcd");
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	137 + retval = binmap<T> (aa, bb, fcn, "gcd");
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	138 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	139
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	140 return retval;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	141 @@ -265,18 +265,18 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	142 case btyp_double:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	143 if (a.is_sparse_type () && b.is_sparse_type ())
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	144 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	145 - retval = do_simple_gcd<SparseMatrix> (a, b);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	146 + retval = do_simple_gcd<SparseMatrix> (a, b, simple_gcd);
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 // fall through!
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	150
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	151 case btyp_float:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	152 - retval = do_simple_gcd<NDArray> (a, b);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	153 + retval = do_simple_gcd<NDArray> (a, b, simple_gcd);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	154 break;
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 #define MAKE_INT_BRANCH(X) \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	157 case btyp_ ## X: \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	158 - retval = do_simple_gcd<X ## NDArray> (a, b); \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	159 + 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	160 break
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	161
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	162 MAKE_INT_BRANCH (int8);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	163 @@ -291,11 +291,11 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	164 #undef MAKE_INT_BRANCH
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	165
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	166 case btyp_complex:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	167 - retval = do_simple_gcd<ComplexNDArray> (a, b);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	168 + 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	169 break;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	170
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	171 case btyp_float_complex:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	172 - retval = do_simple_gcd<FloatComplexNDArray> (a, b);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	173 + 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	174 break;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	175
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	176 default:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	177 @@ -309,10 +309,10 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	178 return retval;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	179 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	180
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	181 -template<class NDA>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	182 +template<class NDA, class F>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	183 static octave_value
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	184 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	185 - octave_value& x, octave_value& y)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	186 + octave_value& x, octave_value& y, F fcn)
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 typedef typename NDA::element_type T;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	189 octave_value retval;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	190 @@ -323,7 +323,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	191 T aa = octave_value_extract<T> (a);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	192 T bb = octave_value_extract<T> (b);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	193 T xx, yy;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	194 - retval = extended_gcd (aa, bb, xx, yy);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	195 + retval = fcn (aa, bb, xx, yy);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	196 x = xx;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	197 y = yy;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	198 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	199 @@ -354,7 +354,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	200 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	201 octave_quit ();
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 - gptr++ = extended_gcd (aptr, bptr, xptr++, *yptr++);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	204 + gptr++ = fcn (aptr, bptr, xptr++, *yptr++);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	205
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	206 aptr += inca;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	207 bptr += incb;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	208 @@ -382,12 +382,12 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	209 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	210 case btyp_double:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	211 case btyp_float:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	212 - retval = do_extended_gcd<NDArray> (a, b, x, y);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	213 + 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	214 break;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	215
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	216 #define MAKE_INT_BRANCH(X) \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	217 case btyp_ ## X: \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	218 - retval = do_extended_gcd<X ## NDArray> (a, b, x, y); \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	219 + 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	220 break
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	221
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	222 MAKE_INT_BRANCH (int8);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	223 @@ -402,11 +402,11 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	224 #undef MAKE_INT_BRANCH
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 case btyp_complex:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	227 - retval = do_extended_gcd<ComplexNDArray> (a, b, x, y);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	228 + 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	229 break;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	230
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	231 case btyp_float_complex:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	232 - retval = do_extended_gcd<FloatComplexNDArray> (a, b, x, y);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	233 + 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	234 break;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	235
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	236 default:
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	237 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	238 --- 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	239 +++ 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	240 @@ -71,7 +71,7 @@
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 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	243 basename, ldflags[i]);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	244 - 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	245 + 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	246 basename, libraries[i]);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	247 }
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 diff -ur octave-3.7.5-orig/libinterp/interpfcn/graphics.cc octave-3.7.5/libinterp/interpfcn/graphics.cc
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	250 --- octave-3.7.5-orig/libinterp/interpfcn/graphics.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	251 +++ octave-3.7.5/libinterp/interpfcn/graphics.cc 2013-07-18 11:27:26 -0400
3144 433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	252 @@ -10304,7 +10304,11 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	253 break;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	254 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	255
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	256 +#if defined (WIN32) && ! defined (__CYGWIN__)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	257 + Sleep (100);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	258 +#else
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	259 octave_usleep (100000);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	260 +#endif
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 OCTAVE_QUIT;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	263
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	264 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	265 --- 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	266 +++ 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	267 @@ -236,13 +236,13 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	268 ColumnVector
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	269 ComplexColumnVector::abs (void) const
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	270 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	271 - return do_mx_unary_map<double, Complex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	272 + 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	273 }
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 ComplexColumnVector
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	276 conj (const ComplexColumnVector& a)
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 - 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	279 + 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	280 }
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 // resize is the destructive equivalent for this one
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	283 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	284 --- 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	285 +++ 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	286 @@ -921,7 +921,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	287 ComplexMatrix
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	288 conj (const ComplexMatrix& a)
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 - 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	291 + 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	292 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	293
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	294 // resize is the destructive equivalent for this one
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	295 @@ -3219,7 +3219,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	296
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	297 Matrix ComplexMatrix::abs (void) const
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 - return do_mx_unary_map<double, Complex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	300 + 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	301 }
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 ComplexMatrix
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	304 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	305 --- 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	306 +++ 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	307 @@ -720,31 +720,31 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	308 NDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	309 ComplexNDArray::abs (void) const
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	310 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	311 - return do_mx_unary_map<double, Complex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	312 + 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	313 }
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 boolNDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	316 ComplexNDArray::isnan (void) const
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 - return do_mx_unary_map<bool, Complex, xisnan> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	319 + return do_mx_unary_map_ref<bool, Complex, xisnan> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	320 }
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 boolNDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	323 ComplexNDArray::isinf (void) const
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	324 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	325 - return do_mx_unary_map<bool, Complex, xisinf> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	326 + return do_mx_unary_map_ref<bool, Complex, xisinf> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	327 }
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 boolNDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	330 ComplexNDArray::isfinite (void) const
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	331 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	332 - return do_mx_unary_map<bool, Complex, xfinite> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	333 + return do_mx_unary_map_ref<bool, Complex, xfinite> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	334 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	335
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	336 ComplexNDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	337 conj (const ComplexNDArray& a)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	338 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	339 - 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	340 + 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	341 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	342
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	343 ComplexNDArray&
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	344 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	345 --- 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	346 +++ 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	347 @@ -234,7 +234,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	348 ComplexRowVector
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	349 conj (const ComplexRowVector& a)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	350 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	351 - 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	352 + 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	353 }
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 // resize is the destructive equivalent for this one
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	356 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	357 --- 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	358 +++ 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	359 @@ -236,13 +236,13 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	360 FloatColumnVector
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	361 FloatComplexColumnVector::abs (void) const
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	362 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	363 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	364 + 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	365 }
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 FloatComplexColumnVector
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	368 conj (const FloatComplexColumnVector& a)
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 - 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	371 + 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	372 }
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 // resize is the destructive equivalent for this one
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	375 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	376 --- 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	377 +++ 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	378 @@ -923,7 +923,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	379 FloatComplexMatrix
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	380 conj (const FloatComplexMatrix& a)
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 - 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	383 + 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	384 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	385
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	386 // resize is the destructive equivalent for this one
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	387 @@ -3215,7 +3215,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	388
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	389 FloatMatrix FloatComplexMatrix::abs (void) const
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 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	392 + 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	393 }
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 FloatComplexMatrix
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	396 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	397 --- 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	398 +++ 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	399 @@ -717,31 +717,31 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	400 FloatNDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	401 FloatComplexNDArray::abs (void) const
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	402 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	403 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	404 + 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	405 }
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 boolNDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	408 FloatComplexNDArray::isnan (void) const
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 - return do_mx_unary_map<bool, FloatComplex, xisnan> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	411 + return do_mx_unary_map_ref<bool, FloatComplex, xisnan> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	412 }
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 boolNDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	415 FloatComplexNDArray::isinf (void) const
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	416 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	417 - return do_mx_unary_map<bool, FloatComplex, xisinf> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	418 + return do_mx_unary_map_ref<bool, FloatComplex, xisinf> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	419 }
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 boolNDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	422 FloatComplexNDArray::isfinite (void) const
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 - return do_mx_unary_map<bool, FloatComplex, xfinite> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	425 + return do_mx_unary_map_ref<bool, FloatComplex, xfinite> (*this);
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	426 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	427
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	428 FloatComplexNDArray
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	429 conj (const FloatComplexNDArray& a)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	430 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	431 - 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	432 + 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	433 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	434
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	435 FloatComplexNDArray&
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	436 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	437 --- 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	438 +++ 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	439 @@ -234,7 +234,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	440 FloatComplexRowVector
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	441 conj (const FloatComplexRowVector& a)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	442 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	443 - 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	444 + 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	445 }
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 // resize is the destructive equivalent for this one
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	448 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	449 --- 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	450 +++ 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	451 @@ -95,7 +95,9 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	452 #endif
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	453 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	454
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	455 -const QR::type QR::raw, QR::std, QR::economy;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	456 +const QR::type QR::raw = qr_type_raw;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	457 +const QR::type QR::std = qr_type_std;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	458 +const QR::type QR::economy = qr_type_economy;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	459
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	460 QR::QR (const Matrix& a, qr_type_t qr_type)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	461 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	462 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	463 --- 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	464 +++ 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	465 @@ -40,9 +40,9 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	466 // Import them here to allow the QR:: prefix.
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	467 typedef qr_type_t type;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	468
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	469 - static const type std = qr_type_std;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	470 - static const type raw = qr_type_raw;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	471 - static const type economy = qr_type_economy;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	472 + static const type std;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	473 + static const type raw;
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	474 + static const type economy;
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 QR (void) : base_qr<Matrix> () { }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	477
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	478 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	479 --- 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	480 +++ 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	481 @@ -316,7 +316,7 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	482 { 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	483
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	484 template <class R, class X, R fun (const X& x)>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	485 -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	486 +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	487 { 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	488
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	489 // 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	490 @@ -343,9 +343,9 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	491
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	492 template <class R, class X, R fun (const X&)>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	493 inline Array<R>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	494 -do_mx_unary_map (const Array<X>& x)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	495 +do_mx_unary_map_ref (const Array<X>& x)
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	496 {
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	497 - 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	498 + 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	499 }
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	500
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	501 template <class R>
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	502 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	503 --- 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	504 +++ 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	505 @@ -49,7 +49,8 @@
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	506
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	507 OCTAVE_CORE_LIBS = \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	508 $(top_builddir)/libinterp/liboctinterp.la \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	509 - $(top_builddir)/liboctave/liboctave.la
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	510 + $(top_builddir)/liboctave/liboctave.la \
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	511 + $(top_builddir)/libgnu/libgnu.la
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	512
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	513 include ../libgui/link-deps.mk
433d1bb3cafb [MSVC] enable octave compilation Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	514

Mercurial > mxe-octave

annotate src/msvc-octave-1.patch @ 3151:2069703f3826