Mercurial > mxe-octave

comparison src/msvc-octave-1.patch @ 3341:b251f4358147

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[MSVC] auto-export gnulib symbols from liboctave. * src/octave.mk ($(PKG)_CONFIGURE_POST_HOOK): Remove variable, use regular CONFIGURE_POST_HOOK instead. * src /msvc-octave-1.patch: Don't link anything but liboctave against libgnu.la.
author Michael Goffioul <michael.goffioul@gmail.com>
date Sat, 30 Nov 2013 21:27:29 -0500
parents 2636b3458f4d
children
comparison
equal deleted inserted replaced
3340:098ca5276ab8 3341:b251f4358147
1 diff -ur octave-3.7.5-orig/configure.ac octave-3.7.5/configure.ac 1 diff -ur octave-3.7.7-orig/configure.ac octave-3.7.7/configure.ac
2 --- octave-3.7.5-orig/configure.ac 2013-05-14 03:12:10 -0400 2 --- octave-3.7.7-orig/configure.ac 2013-09-23 13:50:11 -0400
3 +++ octave-3.7.5/configure.ac 2013-07-18 11:27:26 -0400 3 +++ octave-3.7.7/configure.ac 2013-11-30 11:00:38 -0500
4 @@ -752,7 +752,7 @@ 4 @@ -757,7 +757,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`"
9 + LLVM_LDFLAGS="`$LLVM_CONFIG --ldflags`" 9 + LLVM_LDFLAGS="`$LLVM_CONFIG --ldflags`"
10 10
11 11
12 LDFLAGS="$LDFLAGS $LLVM_LDFLAGS" 12 LDFLAGS="$LDFLAGS $LLVM_LDFLAGS"
13 @@ -1186,7 +1186,7 @@ 13 @@ -1228,7 +1228,7 @@
14 XTRA_CRUFT_SH_LDFLAGS= 14 XTRA_CRUFT_SH_LDFLAGS=
15 if test $have_msvc = yes; then 15 if test $have_msvc = yes; then
16 FLIBS="$FLIBS -lkernel32" 16 FLIBS="$FLIBS -lkernel32"
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-module.mk octave-3.7.5/libgui/qterminal-module.mk 22 diff -ur octave-3.7.7-orig/libgui/qterminal-module.mk octave-3.7.7/libgui/qterminal-module.mk
23 --- octave-3.7.5-orig/libgui/qterminal-module.mk 2013-05-12 15:01:12 -0400 23 --- octave-3.7.7-orig/libgui/qterminal-module.mk 2013-09-23 13:49:55 -0400
24 +++ octave-3.7.5/libgui/qterminal-module.mk 2013-07-18 11:27:26 -0400 24 +++ octave-3.7.7/libgui/qterminal-module.mk 2013-11-30 11:00:38 -0500
25 @@ -50,7 +50,7 @@ 25 @@ -50,7 +50,7 @@
26 qterminal_libqterminal_la_MOC += \ 26 qterminal_libqterminal_la_MOC += \
27 qterminal/libqterminal/win32/moc-QWinTerminalImpl.cc 27 qterminal/libqterminal/win32/moc-QWinTerminalImpl.cc
28 28
29 -qterminal_libqterminal_la_CPPFLAGS += -DUNICODE 29 -qterminal_libqterminal_la_CPPFLAGS += -DUNICODE
30 +qterminal_libqterminal_la_CPPFLAGS += -DUNICODE -Zc:wchar_t- 30 +qterminal_libqterminal_la_CPPFLAGS += -DUNICODE -Zc:wchar_t-
31 31
32 # This flag is required to let MOC know about Q_OS_WIN32. 32 # This flag is required to let MOC know about Q_OS_WIN32.
33 MOC_CPPFLAGS += -DQ_OS_WIN32 33 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 34 diff -ur octave-3.7.7-orig/libgui/src/module.mk octave-3.7.7/libgui/src/module.mk
35 --- octave-3.7.5-orig/libgui/src/module.mk 2013-05-12 17:21:10 -0400 35 --- octave-3.7.7-orig/libgui/src/module.mk 2013-09-23 13:49:55 -0400
36 +++ octave-3.7.5/libgui/src/module.mk 2013-07-18 11:27:26 -0400 36 +++ octave-3.7.7/libgui/src/module.mk 2013-11-30 11:00:38 -0500
37 @@ -152,7 +152,7 @@ 37 @@ -161,7 +161,7 @@
38 38
39 nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC) 39 nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC)
40 40
41 -src_libgui_src_la_CPPFLAGS = \ 41 -src_libgui_src_la_CPPFLAGS = \
42 +src_libgui_src_la_CPPFLAGS = -DQSCINTILLA_DLL \ 42 +src_libgui_src_la_CPPFLAGS = -DQSCINTILLA_DLL \
43 $(AM_CPPFLAGS) \ 43 $(AM_CPPFLAGS) \
44 @OCTGUI_DLL_DEFS@ \ 44 @OCTGUI_DLL_DEFS@ \
45 @QT_CPPFLAGS@ \ 45 @QT_CPPFLAGS@ \
46 diff -ur octave-3.7.5-orig/libinterp/Makefile.am octave-3.7.5/libinterp/Makefile.am 46 diff -ur octave-3.7.7-orig/libinterp/corefcn/gcd.cc octave-3.7.7/libinterp/corefcn/gcd.cc
47 --- octave-3.7.5-orig/libinterp/Makefile.am 2013-04-16 11:26:09 -0400 47 --- octave-3.7.7-orig/libinterp/corefcn/gcd.cc 2013-09-23 13:49:55 -0400
48 +++ octave-3.7.5/libinterp/Makefile.am 2013-07-18 11:27:26 -0400 48 +++ octave-3.7.7/libinterp/corefcn/gcd.cc 2013-11-30 11:00:38 -0500
49 @@ -185,6 +185,7 @@
50 corefcn/libcorefcn.la \
51 corefcn/libtex_parser.la \
52 $(top_builddir)/liboctave/liboctave.la \
53 + $(top_builddir)/libgnu/libgnu.la \
54 $(LIBOCTINTERP_LINK_DEPS)
55
56 # 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
58 --- 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-18 11:27:26 -0400
60 @@ -74,7 +74,7 @@ 49 @@ -74,7 +74,7 @@
61 50
62 template <typename FP> 51 template <typename FP>
63 static std::complex<FP> 52 static std::complex<FP>
64 -simple_gcd (const std::complex<FP>& a, const std::complex<FP>& b) 53 -simple_gcd (const std::complex<FP>& a, const std::complex<FP>& b)
219 - retval = do_extended_gcd<FloatComplexNDArray> (a, b, x, y); 208 - retval = do_extended_gcd<FloatComplexNDArray> (a, b, x, y);
220 + retval = do_extended_gcd<FloatComplexNDArray> (a, b, x, y, extended_gcd_cplx<float>); 209 + retval = do_extended_gcd<FloatComplexNDArray> (a, b, x, y, extended_gcd_cplx<float>);
221 break; 210 break;
222 211
223 default: 212 default:
224 diff -ur octave-3.7.5-orig/libinterp/dldfcn/config-module.awk octave-3.7.5/libinterp/dldfcn/config-module.awk 213 diff -ur octave-3.7.7-orig/libinterp/corefcn/graphics.cc octave-3.7.7/libinterp/corefcn/graphics.cc
225 --- octave-3.7.5-orig/libinterp/dldfcn/config-module.awk 2013-02-16 18:52:27 -0500 214 --- octave-3.7.7-orig/libinterp/corefcn/graphics.cc 2013-09-23 13:49:55 -0400
226 +++ octave-3.7.5/libinterp/dldfcn/config-module.awk 2013-07-18 11:27:26 -0400 215 +++ octave-3.7.7/libinterp/corefcn/graphics.cc 2013-11-30 11:00:38 -0500
227 @@ -71,7 +71,7 @@ 216 @@ -10441,7 +10441,11 @@
228 }
229 printf ("dldfcn_%s_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED_LDFLAG) %s $(OCT_LINK_OPTS)\n",
230 basename, ldflags[i]);
231 - printf ("dldfcn_%s_la_LIBADD = $(DLD_LIBOCTINTERP_LIBADD) ../liboctave/liboctave.la %s $(OCT_LINK_DEPS)\n",
232 + printf ("dldfcn_%s_la_LIBADD = $(DLD_LIBOCTINTERP_LIBADD) ../liboctave/liboctave.la ../libgnu/libgnu.la %s $(OCT_LINK_DEPS)\n",
233 basename, libraries[i]);
234 }
235 }
236 diff -ur octave-3.7.5-orig/libinterp/corefcn/graphics.cc octave-3.7.5/libinterp/corefcn/graphics.cc
237 --- octave-3.7.5-orig/libinterp/corefcn/graphics.cc 2013-04-16 11:26:09 -0400
238 +++ octave-3.7.5/libinterp/corefcn/graphics.cc 2013-07-18 11:27:26 -0400
239 @@ -10304,7 +10304,11 @@
240 break; 217 break;
241 } 218 }
242 219
243 +#if defined (WIN32) && ! defined (__CYGWIN__) 220 +#if defined (WIN32) && ! defined (__CYGWIN__)
244 + Sleep (100); 221 + Sleep (100);
246 octave_usleep (100000); 223 octave_usleep (100000);
247 +#endif 224 +#endif
248 225
249 OCTAVE_QUIT; 226 OCTAVE_QUIT;
250 227
251 diff -ur octave-3.7.5-orig/liboctave/array/CColVector.cc octave-3.7.5/liboctave/array/CColVector.cc 228 diff -ur octave-3.7.7-orig/liboctave/array/CColVector.cc octave-3.7.7/liboctave/array/CColVector.cc
252 --- octave-3.7.5-orig/liboctave/array/CColVector.cc 2013-02-16 18:52:27 -0500 229 --- octave-3.7.7-orig/liboctave/array/CColVector.cc 2013-09-23 13:49:55 -0400
253 +++ octave-3.7.5/liboctave/array/CColVector.cc 2013-07-18 11:27:26 -0400 230 +++ octave-3.7.7/liboctave/array/CColVector.cc 2013-11-30 11:00:38 -0500
254 @@ -236,13 +236,13 @@ 231 @@ -236,13 +236,13 @@
255 ColumnVector 232 ColumnVector
256 ComplexColumnVector::abs (void) const 233 ComplexColumnVector::abs (void) const
257 { 234 {
258 - return do_mx_unary_map<double, Complex, std::abs> (*this); 235 - return do_mx_unary_map<double, Complex, std::abs> (*this);
265 - return do_mx_unary_map<Complex, Complex, std::conj<double> > (a); 242 - return do_mx_unary_map<Complex, Complex, std::conj<double> > (a);
266 + return do_mx_unary_map_ref<Complex, Complex, std::conj<double> > (a); 243 + return do_mx_unary_map_ref<Complex, Complex, std::conj<double> > (a);
267 } 244 }
268 245
269 // resize is the destructive equivalent for this one 246 // 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 247 diff -ur octave-3.7.7-orig/liboctave/array/CMatrix.cc octave-3.7.7/liboctave/array/CMatrix.cc
271 --- octave-3.7.5-orig/liboctave/array/CMatrix.cc 2013-04-16 11:26:09 -0400 248 --- octave-3.7.7-orig/liboctave/array/CMatrix.cc 2013-09-23 13:49:55 -0400
272 +++ octave-3.7.5/liboctave/array/CMatrix.cc 2013-07-18 11:27:26 -0400 249 +++ octave-3.7.7/liboctave/array/CMatrix.cc 2013-11-30 11:00:38 -0500
273 @@ -921,7 +921,7 @@ 250 @@ -921,7 +921,7 @@
274 ComplexMatrix 251 ComplexMatrix
275 conj (const ComplexMatrix& a) 252 conj (const ComplexMatrix& a)
276 { 253 {
277 - return do_mx_unary_map<Complex, Complex, std::conj<double> > (a); 254 - return do_mx_unary_map<Complex, Complex, std::conj<double> > (a);
286 - return do_mx_unary_map<double, Complex, std::abs> (*this); 263 - return do_mx_unary_map<double, Complex, std::abs> (*this);
287 + return do_mx_unary_map_ref<double, Complex, std::abs> (*this); 264 + return do_mx_unary_map_ref<double, Complex, std::abs> (*this);
288 } 265 }
289 266
290 ComplexMatrix 267 ComplexMatrix
291 diff -ur octave-3.7.5-orig/liboctave/array/CNDArray.cc octave-3.7.5/liboctave/array/CNDArray.cc 268 diff -ur octave-3.7.7-orig/liboctave/array/CNDArray.cc octave-3.7.7/liboctave/array/CNDArray.cc
292 --- octave-3.7.5-orig/liboctave/array/CNDArray.cc 2013-02-16 18:52:27 -0500 269 --- octave-3.7.7-orig/liboctave/array/CNDArray.cc 2013-09-23 13:49:55 -0400
293 +++ octave-3.7.5/liboctave/array/CNDArray.cc 2013-07-18 11:27:26 -0400 270 +++ octave-3.7.7/liboctave/array/CNDArray.cc 2013-11-30 11:00:38 -0500
294 @@ -720,31 +720,31 @@ 271 @@ -720,31 +720,31 @@
295 NDArray 272 NDArray
296 ComplexNDArray::abs (void) const 273 ComplexNDArray::abs (void) const
297 { 274 {
298 - return do_mx_unary_map<double, Complex, std::abs> (*this); 275 - return do_mx_unary_map<double, Complex, std::abs> (*this);
326 - return do_mx_unary_map<Complex, Complex, std::conj<double> > (a); 303 - return do_mx_unary_map<Complex, Complex, std::conj<double> > (a);
327 + return do_mx_unary_map_ref<Complex, Complex, std::conj<double> > (a); 304 + return do_mx_unary_map_ref<Complex, Complex, std::conj<double> > (a);
328 } 305 }
329 306
330 ComplexNDArray& 307 ComplexNDArray&
331 diff -ur octave-3.7.5-orig/liboctave/array/CRowVector.cc octave-3.7.5/liboctave/array/CRowVector.cc 308 diff -ur octave-3.7.7-orig/liboctave/array/CRowVector.cc octave-3.7.7/liboctave/array/CRowVector.cc
332 --- octave-3.7.5-orig/liboctave/array/CRowVector.cc 2013-02-16 18:52:27 -0500 309 --- octave-3.7.7-orig/liboctave/array/CRowVector.cc 2013-09-23 13:49:55 -0400
333 +++ octave-3.7.5/liboctave/array/CRowVector.cc 2013-07-18 11:27:26 -0400 310 +++ octave-3.7.7/liboctave/array/CRowVector.cc 2013-11-30 11:00:38 -0500
334 @@ -234,7 +234,7 @@ 311 @@ -234,7 +234,7 @@
335 ComplexRowVector 312 ComplexRowVector
336 conj (const ComplexRowVector& a) 313 conj (const ComplexRowVector& a)
337 { 314 {
338 - return do_mx_unary_map<Complex, Complex, std::conj<double> > (a); 315 - return do_mx_unary_map<Complex, Complex, std::conj<double> > (a);
339 + return do_mx_unary_map_ref<Complex, Complex, std::conj<double> > (a); 316 + return do_mx_unary_map_ref<Complex, Complex, std::conj<double> > (a);
340 } 317 }
341 318
342 // resize is the destructive equivalent for this one 319 // 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 320 diff -ur octave-3.7.7-orig/liboctave/array/fCColVector.cc octave-3.7.7/liboctave/array/fCColVector.cc
344 --- octave-3.7.5-orig/liboctave/array/fCColVector.cc 2013-02-16 18:52:27 -0500 321 --- octave-3.7.7-orig/liboctave/array/fCColVector.cc 2013-09-23 13:49:55 -0400
345 +++ octave-3.7.5/liboctave/array/fCColVector.cc 2013-07-18 11:27:26 -0400 322 +++ octave-3.7.7/liboctave/array/fCColVector.cc 2013-11-30 11:00:38 -0500
346 @@ -236,13 +236,13 @@ 323 @@ -236,13 +236,13 @@
347 FloatColumnVector 324 FloatColumnVector
348 FloatComplexColumnVector::abs (void) const 325 FloatComplexColumnVector::abs (void) const
349 { 326 {
350 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this); 327 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this);
357 - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a); 334 - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a);
358 + return do_mx_unary_map_ref<FloatComplex, FloatComplex, std::conj<float> > (a); 335 + return do_mx_unary_map_ref<FloatComplex, FloatComplex, std::conj<float> > (a);
359 } 336 }
360 337
361 // resize is the destructive equivalent for this one 338 // 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 339 diff -ur octave-3.7.7-orig/liboctave/array/fCMatrix.cc octave-3.7.7/liboctave/array/fCMatrix.cc
363 --- octave-3.7.5-orig/liboctave/array/fCMatrix.cc 2013-04-16 11:26:09 -0400 340 --- octave-3.7.7-orig/liboctave/array/fCMatrix.cc 2013-09-23 13:49:55 -0400
364 +++ octave-3.7.5/liboctave/array/fCMatrix.cc 2013-07-18 11:27:26 -0400 341 +++ octave-3.7.7/liboctave/array/fCMatrix.cc 2013-11-30 11:00:38 -0500
365 @@ -923,7 +923,7 @@ 342 @@ -923,7 +923,7 @@
366 FloatComplexMatrix 343 FloatComplexMatrix
367 conj (const FloatComplexMatrix& a) 344 conj (const FloatComplexMatrix& a)
368 { 345 {
369 - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a); 346 - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a);
378 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this); 355 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this);
379 + return do_mx_unary_map_ref<float, FloatComplex, std::abs> (*this); 356 + return do_mx_unary_map_ref<float, FloatComplex, std::abs> (*this);
380 } 357 }
381 358
382 FloatComplexMatrix 359 FloatComplexMatrix
383 diff -ur octave-3.7.5-orig/liboctave/array/fCNDArray.cc octave-3.7.5/liboctave/array/fCNDArray.cc 360 diff -ur octave-3.7.7-orig/liboctave/array/fCNDArray.cc octave-3.7.7/liboctave/array/fCNDArray.cc
384 --- octave-3.7.5-orig/liboctave/array/fCNDArray.cc 2013-02-16 18:52:27 -0500 361 --- octave-3.7.7-orig/liboctave/array/fCNDArray.cc 2013-09-23 13:49:55 -0400
385 +++ octave-3.7.5/liboctave/array/fCNDArray.cc 2013-07-18 11:27:26 -0400 362 +++ octave-3.7.7/liboctave/array/fCNDArray.cc 2013-11-30 11:00:38 -0500
386 @@ -717,31 +717,31 @@ 363 @@ -717,31 +717,31 @@
387 FloatNDArray 364 FloatNDArray
388 FloatComplexNDArray::abs (void) const 365 FloatComplexNDArray::abs (void) const
389 { 366 {
390 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this); 367 - return do_mx_unary_map<float, FloatComplex, std::abs> (*this);
418 - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a); 395 - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a);
419 + return do_mx_unary_map_ref<FloatComplex, FloatComplex, std::conj<float> > (a); 396 + return do_mx_unary_map_ref<FloatComplex, FloatComplex, std::conj<float> > (a);
420 } 397 }
421 398
422 FloatComplexNDArray& 399 FloatComplexNDArray&
423 diff -ur octave-3.7.5-orig/liboctave/array/fCRowVector.cc octave-3.7.5/liboctave/array/fCRowVector.cc 400 diff -ur octave-3.7.7-orig/liboctave/array/fCRowVector.cc octave-3.7.7/liboctave/array/fCRowVector.cc
424 --- octave-3.7.5-orig/liboctave/array/fCRowVector.cc 2013-02-16 18:52:27 -0500 401 --- octave-3.7.7-orig/liboctave/array/fCRowVector.cc 2013-09-23 13:49:55 -0400
425 +++ octave-3.7.5/liboctave/array/fCRowVector.cc 2013-07-18 11:27:26 -0400 402 +++ octave-3.7.7/liboctave/array/fCRowVector.cc 2013-11-30 11:00:38 -0500
426 @@ -234,7 +234,7 @@ 403 @@ -234,7 +234,7 @@
427 FloatComplexRowVector 404 FloatComplexRowVector
428 conj (const FloatComplexRowVector& a) 405 conj (const FloatComplexRowVector& a)
429 { 406 {
430 - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a); 407 - return do_mx_unary_map<FloatComplex, FloatComplex, std::conj<float> > (a);
431 + return do_mx_unary_map_ref<FloatComplex, FloatComplex, std::conj<float> > (a); 408 + return do_mx_unary_map_ref<FloatComplex, FloatComplex, std::conj<float> > (a);
432 } 409 }
433 410
434 // resize is the destructive equivalent for this one 411 // 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 412 diff -ur octave-3.7.7-orig/liboctave/numeric/dbleQR.cc octave-3.7.7/liboctave/numeric/dbleQR.cc
436 --- octave-3.7.5-orig/liboctave/numeric/dbleQR.cc 2013-02-16 18:52:27 -0500 413 --- octave-3.7.7-orig/liboctave/numeric/dbleQR.cc 2013-09-23 13:49:55 -0400
437 +++ octave-3.7.5/liboctave/numeric/dbleQR.cc 2013-07-18 11:27:26 -0400 414 +++ octave-3.7.7/liboctave/numeric/dbleQR.cc 2013-11-30 11:00:38 -0500
438 @@ -95,7 +95,9 @@ 415 @@ -95,7 +95,9 @@
439 #endif 416 #endif
440 } 417 }
441 418
442 -const QR::type QR::raw, QR::std, QR::economy; 419 -const QR::type QR::raw, QR::std, QR::economy;
444 +const QR::type QR::std = qr_type_std; 421 +const QR::type QR::std = qr_type_std;
445 +const QR::type QR::economy = qr_type_economy; 422 +const QR::type QR::economy = qr_type_economy;
446 423
447 QR::QR (const Matrix& a, qr_type_t qr_type) 424 QR::QR (const Matrix& a, qr_type_t qr_type)
448 { 425 {
449 diff -ur octave-3.7.5-orig/liboctave/numeric/dbleQR.h octave-3.7.5/liboctave/numeric/dbleQR.h 426 diff -ur octave-3.7.7-orig/liboctave/numeric/dbleQR.h octave-3.7.7/liboctave/numeric/dbleQR.h
450 --- octave-3.7.5-orig/liboctave/numeric/dbleQR.h 2013-02-16 18:52:27 -0500 427 --- octave-3.7.7-orig/liboctave/numeric/dbleQR.h 2013-09-23 13:49:55 -0400
451 +++ octave-3.7.5/liboctave/numeric/dbleQR.h 2013-07-18 11:27:26 -0400 428 +++ octave-3.7.7/liboctave/numeric/dbleQR.h 2013-11-30 11:00:38 -0500
452 @@ -40,9 +40,9 @@ 429 @@ -40,9 +40,9 @@
453 // Import them here to allow the QR:: prefix. 430 // Import them here to allow the QR:: prefix.
454 typedef qr_type_t type; 431 typedef qr_type_t type;
455 432
456 - static const type std = qr_type_std; 433 - static const type std = qr_type_std;
460 + static const type raw; 437 + static const type raw;
461 + static const type economy; 438 + static const type economy;
462 439
463 QR (void) : base_qr<Matrix> () { } 440 QR (void) : base_qr<Matrix> () { }
464 441
465 diff -ur octave-3.7.5-orig/liboctave/operators/mx-inlines.cc octave-3.7.5/liboctave/operators/mx-inlines.cc 442 diff -ur octave-3.7.7-orig/liboctave/operators/mx-inlines.cc octave-3.7.7/liboctave/operators/mx-inlines.cc
466 --- octave-3.7.5-orig/liboctave/operators/mx-inlines.cc 2013-02-16 18:52:27 -0500 443 --- octave-3.7.7-orig/liboctave/operators/mx-inlines.cc 2013-09-23 13:49:55 -0400
467 +++ octave-3.7.5/liboctave/operators/mx-inlines.cc 2013-07-18 11:27:27 -0400 444 +++ octave-3.7.7/liboctave/operators/mx-inlines.cc 2013-11-30 11:00:38 -0500
468 @@ -316,7 +316,7 @@ 445 @@ -316,7 +316,7 @@
469 { for (size_t i = 0; i < n; i++) r[i] = fun (x[i]); } 446 { for (size_t i = 0; i < n; i++) r[i] = fun (x[i]); }
470 447
471 template <class R, class X, R fun (const X& x)> 448 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 () 449 -inline void mx_inline_map (size_t n, R *r, const X *x) throw ()
484 - return do_mx_unary_op<R, X> (x, mx_inline_map<R, X, fun>); 461 - return do_mx_unary_op<R, X> (x, mx_inline_map<R, X, fun>);
485 + return do_mx_unary_op<R, X> (x, mx_inline_map_ref<R, X, fun>); 462 + return do_mx_unary_op<R, X> (x, mx_inline_map_ref<R, X, fun>);
486 } 463 }
487 464
488 template <class R> 465 template <class R>
489 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
491 +++ octave-3.7.5/src/Makefile.am 2013-07-18 11:27:27 -0400
492 @@ -49,7 +49,8 @@
493
494 OCTAVE_CORE_LIBS = \
495 $(top_builddir)/libinterp/liboctinterp.la \
496 - $(top_builddir)/liboctave/liboctave.la
497 + $(top_builddir)/liboctave/liboctave.la \
498 + $(top_builddir)/libgnu/libgnu.la
499
500 include ../libgui/link-deps.mk
501