Mercurial > mxe-octave

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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
comparison
equal deleted inserted replaced
3150:65fc638bdd8e 3151:2069703f3826
1 diff -ur octave-3.7.5-orig/configure.ac octave-3.7.5/configure.ac 1 diff -ur octave-3.7.5-orig/configure.ac octave-3.7.5/configure.ac
2 --- octave-3.7.5-orig/configure.ac 2013-05-14 03:12:10 -0400 2 --- octave-3.7.5-orig/configure.ac 2013-05-14 03:12:10 -0400
3 +++ octave-3.7.5/configure.ac 2013-07-15 20:59:36 -0400 3 +++ octave-3.7.5/configure.ac 2013-07-18 11:27:26 -0400
4 @@ -752,7 +752,7 @@ 4 @@ -752,7 +752,7 @@
5 dnl Use -isystem so we don't get warnings from llvm headers 5 dnl Use -isystem so we don't get warnings from llvm headers
6 LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`" 6 LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`"
7 LLVM_CXXFLAGS= 7 LLVM_CXXFLAGS=
8 - LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`" 8 - LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`"
17 - XTRA_CRUFT_SH_LDFLAGS="-Wl,-def:cruft/cruft.def" 17 - XTRA_CRUFT_SH_LDFLAGS="-Wl,-def:cruft/cruft.def"
18 + XTRA_CRUFT_SH_LDFLAGS="-Wl,cruft/cruft.def" 18 + XTRA_CRUFT_SH_LDFLAGS="-Wl,cruft/cruft.def"
19 fi 19 fi
20 AC_SUBST(XTRA_CRUFT_SH_LDFLAGS) 20 AC_SUBST(XTRA_CRUFT_SH_LDFLAGS)
21 21
22 diff -ur octave-3.7.5-orig/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp octave-3.7.5/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp
23 --- octave-3.7.5-orig/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp 2013-05-13 05:58:35 -0400
24 +++ octave-3.7.5/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp 2013-07-18 11:28:12 -0400
25 @@ -40,7 +40,9 @@
26 #include <stdio.h>
27 #include <stdarg.h>
28 #define WIN32_LEAN_AND_MEAN
29 +#if ! defined (_WIN32_WINNT) && ! defined (NTDDI_VERSION)
30 #define _WIN32_WINNT 0x0500
31 +#endif
32 #include <windows.h>
33 #include <cstring>
34 #include <csignal>
22 diff -ur octave-3.7.5-orig/libgui/qterminal-module.mk octave-3.7.5/libgui/qterminal-module.mk 35 diff -ur octave-3.7.5-orig/libgui/qterminal-module.mk octave-3.7.5/libgui/qterminal-module.mk
23 --- octave-3.7.5-orig/libgui/qterminal-module.mk 2013-05-12 15:01:12 -0400 36 --- octave-3.7.5-orig/libgui/qterminal-module.mk 2013-05-12 15:01:12 -0400
24 +++ octave-3.7.5/libgui/qterminal-module.mk 2013-07-15 20:59:36 -0400 37 +++ octave-3.7.5/libgui/qterminal-module.mk 2013-07-18 11:27:26 -0400
25 @@ -50,7 +50,7 @@ 38 @@ -50,7 +50,7 @@
26 qterminal_libqterminal_la_MOC += \ 39 qterminal_libqterminal_la_MOC += \
27 qterminal/libqterminal/win32/moc-QWinTerminalImpl.cc 40 qterminal/libqterminal/win32/moc-QWinTerminalImpl.cc
28 41
29 -qterminal_libqterminal_la_CPPFLAGS += -DUNICODE 42 -qterminal_libqterminal_la_CPPFLAGS += -DUNICODE
31 44
32 # This flag is required to let MOC know about Q_OS_WIN32. 45 # This flag is required to let MOC know about Q_OS_WIN32.
33 MOC_CPPFLAGS += -DQ_OS_WIN32 46 MOC_CPPFLAGS += -DQ_OS_WIN32
34 diff -ur octave-3.7.5-orig/libgui/src/module.mk octave-3.7.5/libgui/src/module.mk 47 diff -ur octave-3.7.5-orig/libgui/src/module.mk octave-3.7.5/libgui/src/module.mk
35 --- octave-3.7.5-orig/libgui/src/module.mk 2013-05-12 17:21:10 -0400 48 --- octave-3.7.5-orig/libgui/src/module.mk 2013-05-12 17:21:10 -0400
36 +++ octave-3.7.5/libgui/src/module.mk 2013-07-15 20:59:36 -0400 49 +++ octave-3.7.5/libgui/src/module.mk 2013-07-18 11:27:26 -0400
37 @@ -152,7 +152,7 @@ 50 @@ -152,7 +152,7 @@
38 51
39 nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC) 52 nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC)
40 53
41 -src_libgui_src_la_CPPFLAGS = \ 54 -src_libgui_src_la_CPPFLAGS = \
43 $(AM_CPPFLAGS) \ 56 $(AM_CPPFLAGS) \
44 @OCTGUI_DLL_DEFS@ \ 57 @OCTGUI_DLL_DEFS@ \
45 @QT_CPPFLAGS@ \ 58 @QT_CPPFLAGS@ \
46 diff -ur octave-3.7.5-orig/libinterp/Makefile.am octave-3.7.5/libinterp/Makefile.am 59 diff -ur octave-3.7.5-orig/libinterp/Makefile.am octave-3.7.5/libinterp/Makefile.am
47 --- octave-3.7.5-orig/libinterp/Makefile.am 2013-04-16 11:26:09 -0400 60 --- octave-3.7.5-orig/libinterp/Makefile.am 2013-04-16 11:26:09 -0400
48 +++ octave-3.7.5/libinterp/Makefile.am 2013-07-15 20:59:36 -0400 61 +++ octave-3.7.5/libinterp/Makefile.am 2013-07-18 11:27:26 -0400
49 @@ -185,6 +185,7 @@ 62 @@ -185,6 +185,7 @@
50 interpfcn/libinterpfcn.la \ 63 interpfcn/libinterpfcn.la \
51 corefcn/libcorefcn.la \ 64 corefcn/libcorefcn.la \
52 $(top_builddir)/liboctave/liboctave.la \ 65 $(top_builddir)/liboctave/liboctave.la \
53 + $(top_builddir)/libgnu/libgnu.la \ 66 + $(top_builddir)/libgnu/libgnu.la \
54 $(LIBOCTINTERP_LINK_DEPS) 67 $(LIBOCTINTERP_LINK_DEPS)
55 68
56 # Increment these as needed and according to the rules in the libtool manual: 69 # Increment these as needed and according to the rules in the libtool manual:
57 diff -ur octave-3.7.5-orig/libinterp/corefcn/gcd.cc octave-3.7.5/libinterp/corefcn/gcd.cc 70 diff -ur octave-3.7.5-orig/libinterp/corefcn/gcd.cc octave-3.7.5/libinterp/corefcn/gcd.cc
58 --- octave-3.7.5-orig/libinterp/corefcn/gcd.cc 2013-02-16 18:52:27 -0500 71 --- octave-3.7.5-orig/libinterp/corefcn/gcd.cc 2013-02-16 18:52:27 -0500
59 +++ octave-3.7.5/libinterp/corefcn/gcd.cc 2013-07-15 20:59:36 -0400 72 +++ octave-3.7.5/libinterp/corefcn/gcd.cc 2013-07-18 11:27:26 -0400
60 @@ -74,7 +74,7 @@ 73 @@ -74,7 +74,7 @@
61 74
62 template <typename FP> 75 template <typename FP>
63 static std::complex<FP> 76 static std::complex<FP>
64 -simple_gcd (const std::complex<FP>& a, const std::complex<FP>& b) 77 -simple_gcd (const std::complex<FP>& a, const std::complex<FP>& b)
221 break; 234 break;
222 235
223 default: 236 default:
224 diff -ur octave-3.7.5-orig/libinterp/dldfcn/config-module.awk octave-3.7.5/libinterp/dldfcn/config-module.awk 237 diff -ur octave-3.7.5-orig/libinterp/dldfcn/config-module.awk octave-3.7.5/libinterp/dldfcn/config-module.awk
225 --- octave-3.7.5-orig/libinterp/dldfcn/config-module.awk 2013-02-16 18:52:27 -0500 238 --- octave-3.7.5-orig/libinterp/dldfcn/config-module.awk 2013-02-16 18:52:27 -0500
226 +++ octave-3.7.5/libinterp/dldfcn/config-module.awk 2013-07-15 20:59:36 -0400 239 +++ octave-3.7.5/libinterp/dldfcn/config-module.awk 2013-07-18 11:27:26 -0400
227 @@ -71,7 +71,7 @@ 240 @@ -71,7 +71,7 @@
228 } 241 }
229 printf ("dldfcn_%s_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED_LDFLAG) %s $(OCT_LINK_OPTS)\n", 242 printf ("dldfcn_%s_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED_LDFLAG) %s $(OCT_LINK_OPTS)\n",
230 basename, ldflags[i]); 243 basename, ldflags[i]);
231 - printf ("dldfcn_%s_la_LIBADD = $(DLD_LIBOCTINTERP_LIBADD) ../liboctave/liboctave.la %s $(OCT_LINK_DEPS)\n", 244 - printf ("dldfcn_%s_la_LIBADD = $(DLD_LIBOCTINTERP_LIBADD) ../liboctave/liboctave.la %s $(OCT_LINK_DEPS)\n",
233 basename, libraries[i]); 246 basename, libraries[i]);
234 } 247 }
235 } 248 }
236 diff -ur octave-3.7.5-orig/libinterp/interpfcn/graphics.cc octave-3.7.5/libinterp/interpfcn/graphics.cc 249 diff -ur octave-3.7.5-orig/libinterp/interpfcn/graphics.cc octave-3.7.5/libinterp/interpfcn/graphics.cc
237 --- octave-3.7.5-orig/libinterp/interpfcn/graphics.cc 2013-04-16 11:26:09 -0400 250 --- octave-3.7.5-orig/libinterp/interpfcn/graphics.cc 2013-04-16 11:26:09 -0400
238 +++ octave-3.7.5/libinterp/interpfcn/graphics.cc 2013-07-15 20:59:36 -0400 251 +++ octave-3.7.5/libinterp/interpfcn/graphics.cc 2013-07-18 11:27:26 -0400
239 @@ -10304,7 +10304,11 @@ 252 @@ -10304,7 +10304,11 @@
240 break; 253 break;
241 } 254 }
242 255
243 +#if defined (WIN32) && ! defined (__CYGWIN__) 256 +#if defined (WIN32) && ! defined (__CYGWIN__)
248 261
249 OCTAVE_QUIT; 262 OCTAVE_QUIT;
250 263
251 diff -ur octave-3.7.5-orig/liboctave/array/CColVector.cc octave-3.7.5/liboctave/array/CColVector.cc 264 diff -ur octave-3.7.5-orig/liboctave/array/CColVector.cc octave-3.7.5/liboctave/array/CColVector.cc
252 --- octave-3.7.5-orig/liboctave/array/CColVector.cc 2013-02-16 18:52:27 -0500 265 --- octave-3.7.5-orig/liboctave/array/CColVector.cc 2013-02-16 18:52:27 -0500
253 +++ octave-3.7.5/liboctave/array/CColVector.cc 2013-07-15 20:59:36 -0400 266 +++ octave-3.7.5/liboctave/array/CColVector.cc 2013-07-18 11:27:26 -0400
254 @@ -236,13 +236,13 @@ 267 @@ -236,13 +236,13 @@
255 ColumnVector 268 ColumnVector
256 ComplexColumnVector::abs (void) const 269 ComplexColumnVector::abs (void) const
257 { 270 {
258 - return do_mx_unary_map<double, Complex, std::abs> (*this); 271 - return do_mx_unary_map<double, Complex, std::abs> (*this);
267 } 280 }
268 281
269 // resize is the destructive equivalent for this one 282 // resize is the destructive equivalent for this one
270 diff -ur octave-3.7.5-orig/liboctave/array/CMatrix.cc octave-3.7.5/liboctave/array/CMatrix.cc 283 diff -ur octave-3.7.5-orig/liboctave/array/CMatrix.cc octave-3.7.5/liboctave/array/CMatrix.cc
271 --- octave-3.7.5-orig/liboctave/array/CMatrix.cc 2013-04-16 11:26:09 -0400 284 --- octave-3.7.5-orig/liboctave/array/CMatrix.cc 2013-04-16 11:26:09 -0400
272 +++ octave-3.7.5/liboctave/array/CMatrix.cc 2013-07-15 20:59:36 -0400 285 +++ octave-3.7.5/liboctave/array/CMatrix.cc 2013-07-18 11:27:26 -0400
273 @@ -921,7 +921,7 @@ 286 @@ -921,7 +921,7 @@
274 ComplexMatrix 287 ComplexMatrix
275 conj (const ComplexMatrix& a) 288 conj (const ComplexMatrix& a)
276 { 289 {
277 - return do_mx_unary_map<Complex, Complex, std::conj<double> > (a); 290 - return do_mx_unary_map<Complex, Complex, std::conj<double> > (a);
288 } 301 }
289 302
290 ComplexMatrix 303 ComplexMatrix
291 diff -ur octave-3.7.5-orig/liboctave/array/CNDArray.cc octave-3.7.5/liboctave/array/CNDArray.cc 304 diff -ur octave-3.7.5-orig/liboctave/array/CNDArray.cc octave-3.7.5/liboctave/array/CNDArray.cc
292 --- octave-3.7.5-orig/liboctave/array/CNDArray.cc 2013-02-16 18:52:27 -0500 305 --- octave-3.7.5-orig/liboctave/array/CNDArray.cc 2013-02-16 18:52:27 -0500
293 +++ octave-3.7.5/liboctave/array/CNDArray.cc 2013-07-15 20:59:36 -0400 306 +++ octave-3.7.5/liboctave/array/CNDArray.cc 2013-07-18 11:27:26 -0400
294 @@ -720,31 +720,31 @@ 307 @@ -720,31 +720,31 @@
295 NDArray 308 NDArray
296 ComplexNDArray::abs (void) const 309 ComplexNDArray::abs (void) const
297 { 310 {
298 - return do_mx_unary_map<double, Complex, std::abs> (*this); 311 - return do_mx_unary_map<double, Complex, std::abs> (*this);
328 } 341 }
329 342
330 ComplexNDArray& 343 ComplexNDArray&
331 diff -ur octave-3.7.5-orig/liboctave/array/CRowVector.cc octave-3.7.5/liboctave/array/CRowVector.cc 344 diff -ur octave-3.7.5-orig/liboctave/array/CRowVector.cc octave-3.7.5/liboctave/array/CRowVector.cc
332 --- octave-3.7.5-orig/liboctave/array/CRowVector.cc 2013-02-16 18:52:27 -0500 345 --- octave-3.7.5-orig/liboctave/array/CRowVector.cc 2013-02-16 18:52:27 -0500
333 +++ octave-3.7.5/liboctave/array/CRowVector.cc 2013-07-15 20:59:36 -0400 346 +++ octave-3.7.5/liboctave/array/CRowVector.cc 2013-07-18 11:27:26 -0400
334 @@ -234,7 +234,7 @@ 347 @@ -234,7 +234,7 @@
335 ComplexRowVector 348 ComplexRowVector
336 conj (const ComplexRowVector& a) 349 conj (const ComplexRowVector& a)
337 { 350 {
338 - return do_mx_unary_map<Complex, Complex, std::conj<double> > (a); 351 - return do_mx_unary_map<Complex, Complex, std::conj<double> > (a);
340 } 353 }
341 354
342 // resize is the destructive equivalent for this one 355 // resize is the destructive equivalent for this one
343 diff -ur octave-3.7.5-orig/liboctave/array/fCColVector.cc octave-3.7.5/liboctave/array/fCColVector.cc 356 diff -ur octave-3.7.5-orig/liboctave/array/fCColVector.cc octave-3.7.5/liboctave/array/fCColVector.cc
344 --- octave-3.7.5-orig/liboctave/array/fCColVector.cc 2013-02-16 18:52:27 -0500 357 --- octave-3.7.5-orig/liboctave/array/fCColVector.cc 2013-02-16 18:52:27 -0500
345 +++ octave-3.7.5/liboctave/array/fCColVector.cc 2013-07-15 20:59:36 -0400 358 +++ octave-3.7.5/liboctave/array/fCColVector.cc 2013-07-18 11:27:26 -0400
346 @@ -236,13 +236,13 @@ 359 @@ -236,13 +236,13 @@
347 FloatColumnVector 360 FloatColumnVector
348 FloatComplexColumnVector::abs (void) const 361 FloatComplexColumnVector::abs (void) const
349 { 362 {
350 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this); 363 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this);
359 } 372 }
360 373
361 // resize is the destructive equivalent for this one 374 // resize is the destructive equivalent for this one
362 diff -ur octave-3.7.5-orig/liboctave/array/fCMatrix.cc octave-3.7.5/liboctave/array/fCMatrix.cc 375 diff -ur octave-3.7.5-orig/liboctave/array/fCMatrix.cc octave-3.7.5/liboctave/array/fCMatrix.cc
363 --- octave-3.7.5-orig/liboctave/array/fCMatrix.cc 2013-04-16 11:26:09 -0400 376 --- octave-3.7.5-orig/liboctave/array/fCMatrix.cc 2013-04-16 11:26:09 -0400
364 +++ octave-3.7.5/liboctave/array/fCMatrix.cc 2013-07-15 20:59:36 -0400 377 +++ octave-3.7.5/liboctave/array/fCMatrix.cc 2013-07-18 11:27:26 -0400
365 @@ -923,7 +923,7 @@ 378 @@ -923,7 +923,7 @@
366 FloatComplexMatrix 379 FloatComplexMatrix
367 conj (const FloatComplexMatrix& a) 380 conj (const FloatComplexMatrix& a)
368 { 381 {
369 - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a); 382 - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a);
380 } 393 }
381 394
382 FloatComplexMatrix 395 FloatComplexMatrix
383 diff -ur octave-3.7.5-orig/liboctave/array/fCNDArray.cc octave-3.7.5/liboctave/array/fCNDArray.cc 396 diff -ur octave-3.7.5-orig/liboctave/array/fCNDArray.cc octave-3.7.5/liboctave/array/fCNDArray.cc
384 --- octave-3.7.5-orig/liboctave/array/fCNDArray.cc 2013-02-16 18:52:27 -0500 397 --- octave-3.7.5-orig/liboctave/array/fCNDArray.cc 2013-02-16 18:52:27 -0500
385 +++ octave-3.7.5/liboctave/array/fCNDArray.cc 2013-07-15 20:59:36 -0400 398 +++ octave-3.7.5/liboctave/array/fCNDArray.cc 2013-07-18 11:27:26 -0400
386 @@ -717,31 +717,31 @@ 399 @@ -717,31 +717,31 @@
387 FloatNDArray 400 FloatNDArray
388 FloatComplexNDArray::abs (void) const 401 FloatComplexNDArray::abs (void) const
389 { 402 {
390 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this); 403 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this);
420 } 433 }
421 434
422 FloatComplexNDArray& 435 FloatComplexNDArray&
423 diff -ur octave-3.7.5-orig/liboctave/array/fCRowVector.cc octave-3.7.5/liboctave/array/fCRowVector.cc 436 diff -ur octave-3.7.5-orig/liboctave/array/fCRowVector.cc octave-3.7.5/liboctave/array/fCRowVector.cc
424 --- octave-3.7.5-orig/liboctave/array/fCRowVector.cc 2013-02-16 18:52:27 -0500 437 --- octave-3.7.5-orig/liboctave/array/fCRowVector.cc 2013-02-16 18:52:27 -0500
425 +++ octave-3.7.5/liboctave/array/fCRowVector.cc 2013-07-15 20:59:36 -0400 438 +++ octave-3.7.5/liboctave/array/fCRowVector.cc 2013-07-18 11:27:26 -0400
426 @@ -234,7 +234,7 @@ 439 @@ -234,7 +234,7 @@
427 FloatComplexRowVector 440 FloatComplexRowVector
428 conj (const FloatComplexRowVector& a) 441 conj (const FloatComplexRowVector& a)
429 { 442 {
430 - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a); 443 - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a);
432 } 445 }
433 446
434 // resize is the destructive equivalent for this one 447 // resize is the destructive equivalent for this one
435 diff -ur octave-3.7.5-orig/liboctave/numeric/dbleQR.cc octave-3.7.5/liboctave/numeric/dbleQR.cc 448 diff -ur octave-3.7.5-orig/liboctave/numeric/dbleQR.cc octave-3.7.5/liboctave/numeric/dbleQR.cc
436 --- octave-3.7.5-orig/liboctave/numeric/dbleQR.cc 2013-02-16 18:52:27 -0500 449 --- octave-3.7.5-orig/liboctave/numeric/dbleQR.cc 2013-02-16 18:52:27 -0500
437 +++ octave-3.7.5/liboctave/numeric/dbleQR.cc 2013-07-15 20:59:36 -0400 450 +++ octave-3.7.5/liboctave/numeric/dbleQR.cc 2013-07-18 11:27:26 -0400
438 @@ -95,7 +95,9 @@ 451 @@ -95,7 +95,9 @@
439 #endif 452 #endif
440 } 453 }
441 454
442 -const QR::type QR::raw, QR::std, QR::economy; 455 -const QR::type QR::raw, QR::std, QR::economy;
446 459
447 QR::QR (const Matrix& a, qr_type_t qr_type) 460 QR::QR (const Matrix& a, qr_type_t qr_type)
448 { 461 {
449 diff -ur octave-3.7.5-orig/liboctave/numeric/dbleQR.h octave-3.7.5/liboctave/numeric/dbleQR.h 462 diff -ur octave-3.7.5-orig/liboctave/numeric/dbleQR.h octave-3.7.5/liboctave/numeric/dbleQR.h
450 --- octave-3.7.5-orig/liboctave/numeric/dbleQR.h 2013-02-16 18:52:27 -0500 463 --- octave-3.7.5-orig/liboctave/numeric/dbleQR.h 2013-02-16 18:52:27 -0500
451 +++ octave-3.7.5/liboctave/numeric/dbleQR.h 2013-07-15 20:59:37 -0400 464 +++ octave-3.7.5/liboctave/numeric/dbleQR.h 2013-07-18 11:27:26 -0400
452 @@ -40,9 +40,9 @@ 465 @@ -40,9 +40,9 @@
453 // Import them here to allow the QR:: prefix. 466 // Import them here to allow the QR:: prefix.
454 typedef qr_type_t type; 467 typedef qr_type_t type;
455 468
456 - static const type std = qr_type_std; 469 - static const type std = qr_type_std;
462 475
463 QR (void) : base_qr<Matrix> () { } 476 QR (void) : base_qr<Matrix> () { }
464 477
465 diff -ur octave-3.7.5-orig/liboctave/operators/mx-inlines.cc octave-3.7.5/liboctave/operators/mx-inlines.cc 478 diff -ur octave-3.7.5-orig/liboctave/operators/mx-inlines.cc octave-3.7.5/liboctave/operators/mx-inlines.cc
466 --- octave-3.7.5-orig/liboctave/operators/mx-inlines.cc 2013-02-16 18:52:27 -0500 479 --- octave-3.7.5-orig/liboctave/operators/mx-inlines.cc 2013-02-16 18:52:27 -0500
467 +++ octave-3.7.5/liboctave/operators/mx-inlines.cc 2013-07-15 20:59:37 -0400 480 +++ octave-3.7.5/liboctave/operators/mx-inlines.cc 2013-07-18 11:27:27 -0400
468 @@ -316,7 +316,7 @@ 481 @@ -316,7 +316,7 @@
469 { for (size_t i = 0; i < n; i++) r[i] = fun (x[i]); } 482 { for (size_t i = 0; i < n; i++) r[i] = fun (x[i]); }
470 483
471 template <class R, class X, R fun (const X& x)> 484 template <class R, class X, R fun (const X& x)>
472 -inline void mx_inline_map (size_t n, R *r, const X *x) throw () 485 -inline void mx_inline_map (size_t n, R *r, const X *x) throw ()
486 } 499 }
487 500
488 template <class R> 501 template <class R>
489 diff -ur octave-3.7.5-orig/src/Makefile.am octave-3.7.5/src/Makefile.am 502 diff -ur octave-3.7.5-orig/src/Makefile.am octave-3.7.5/src/Makefile.am
490 --- octave-3.7.5-orig/src/Makefile.am 2013-04-16 11:26:10 -0400 503 --- octave-3.7.5-orig/src/Makefile.am 2013-04-16 11:26:10 -0400
491 +++ octave-3.7.5/src/Makefile.am 2013-07-15 20:59:37 -0400 504 +++ octave-3.7.5/src/Makefile.am 2013-07-18 11:27:27 -0400
492 @@ -49,7 +49,8 @@ 505 @@ -49,7 +49,8 @@
493 506
494 OCTAVE_CORE_LIBS = \ 507 OCTAVE_CORE_LIBS = \
495 $(top_builddir)/libinterp/liboctinterp.la \ 508 $(top_builddir)/libinterp/liboctinterp.la \
496 - $(top_builddir)/liboctave/liboctave.la 509 - $(top_builddir)/liboctave/liboctave.la