Mercurial > mxe-octave

comparison src/of-windows-1-fixes.patch @ 3906:02a0022a6f75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-windows: update of-windows patch to remove print error * src/of-windows-1-fixes.patch: updated patch
author John Donoghue <john.donoghue@ieee.org>
date Wed, 15 Apr 2015 19:25:55 -0400
parents f1fa61828986
children
comparison
equal deleted inserted replaced
3905:f1fa61828986 3906:02a0022a6f75
1 diff -ur Windows.orig/src/__COM__.cc Windows/src/__COM__.cc
2 --- Windows.orig/src/__COM__.cc 2015-04-15 19:22:06.000000000 -0400
3 +++ Windows/src/__COM__.cc 2015-04-15 19:22:30.000000000 -0400
4 @@ -157,15 +157,23 @@
5
6 dim_vector dims(void) const { static dim_vector dv(1, 1); return dv; }
7
8 - void print(std::ostream& os, bool pr_as_read_syntax = false) const
9 + void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const
10 {
11 - os << "<COM object " << (com_typename.empty() ? std::string("Unknown") : com_typename) << " (0x" << (void*)iface << ")>";
12 - newline(os);
13 + os << "<COM object "
14 + << (com_typename.empty () ? std::string("Unknown") : com_typename)
15 + << " (0x" << (void*)iface << ")>";
16 + }
17 +
18 + void print (std::ostream& os, bool pr_as_read_syntax = false)
19 + {
20 + print_raw (os, pr_as_read_syntax);
21 + newline (os);
22 }
23
24 - void print_raw(std::ostream& os, bool pr_as_read_syntax = false) const
25 + void print (std::ostream& os, bool pr_as_read_syntax = false) const
26 {
27 - print(os, pr_as_read_syntax);
28 + print_raw (os, pr_as_read_syntax);
29 + newline (os);
30 }
31
32 octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout);
33 @@ -180,7 +188,9 @@
34
35 private:
36 // regular octave value declarations
37 + #if defined (DEFINE_OCTAVE_ALLOCATOR)
38 DECLARE_OCTAVE_ALLOCATOR
39 + #endif
40
41 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
42
43 @@ -189,7 +199,9 @@
44 std::string com_typename;
45 };
46
47 +#if defined (DEFINE_OCTAVE_ALLOCATOR)
48 DEFINE_OCTAVE_ALLOCATOR (octave_com_object);
49 +#endif
50
51 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_com_object,
52 "octave_com_object",
1 diff -ur Windows.orig/src/configure Windows/src/configure 53 diff -ur Windows.orig/src/configure Windows/src/configure
2 --- Windows.orig/src/configure 2015-04-14 22:06:35.000000000 -0400 54 --- Windows.orig/src/configure 2015-04-15 19:22:06.000000000 -0400
3 +++ Windows/src/configure 2015-04-14 22:14:41.000000000 -0400 55 +++ Windows/src/configure 2015-04-15 19:22:19.000000000 -0400
4 @@ -1,11 +1,9 @@ 56 @@ -1,11 +1,9 @@
5 #! /bin/sh 57 #! /bin/sh
6 # Guess values for system-dependent variables and create Makefiles. 58 # Guess values for system-dependent variables and create Makefiles.
7 -# Generated by GNU Autoconf 2.68. 59 -# Generated by GNU Autoconf 2.68.
8 +# Generated by GNU Autoconf 2.69. 60 +# Generated by GNU Autoconf 2.69.
417 469
418 octave-forge is configured with 470 octave-forge is configured with
419 octave: $OCTAVE (version $OCTAVE_VERSION) 471 octave: $OCTAVE (version $OCTAVE_VERSION)
420 - mkoctfile: $MKOCTFILE for Octave $subver" 472 - mkoctfile: $MKOCTFILE for Octave $subver"
421 + mkoctfile: $MKOCTFILE for Octave $OCTAVE_VERSION 473 + mkoctfile: $MKOCTFILE for Octave $OCTAVE_VERSION
422 + octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION 474 + octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION"
423 ac_config_files="$ac_config_files $CONFIGURE_OUTPUTS" 475 ac_config_files="$ac_config_files $CONFIGURE_OUTPUTS"
424 476
425 477
426 @@ -3382,16 +3442,16 @@ 478 @@ -3382,16 +3442,16 @@
427 # ... but there are two gotchas: 479 # ... but there are two gotchas:
513 + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion 565 + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
514 shift 566 shift
515 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 567 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
516 CONFIG_SHELL='$SHELL' 568 CONFIG_SHELL='$SHELL'
517 diff -ur Windows.orig/src/configure.base Windows/src/configure.base 569 diff -ur Windows.orig/src/configure.base Windows/src/configure.base
518 --- Windows.orig/src/configure.base 2015-04-14 22:06:35.000000000 -0400 570 --- Windows.orig/src/configure.base 2015-04-15 19:22:06.000000000 -0400
519 +++ Windows/src/configure.base 2015-04-14 22:13:09.000000000 -0400 571 +++ Windows/src/configure.base 2015-04-15 19:22:19.000000000 -0400
520 @@ -49,6 +49,8 @@ 572 @@ -49,6 +49,8 @@
521 dnl Check for mkoctfile 573 dnl Check for mkoctfile
522 AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile) 574 AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile)
523 test -z "$MKOCTFILE" && AC_MSG_WARN([no mkoctfile found on path]) 575 test -z "$MKOCTFILE" && AC_MSG_WARN([no mkoctfile found on path])
524 +AC_CHECK_PROG(OCTAVE_CONFIG,octave-config,octave-config) 576 +AC_CHECK_PROG(OCTAVE_CONFIG,octave-config,octave-config)
556 608
557 octave-forge is configured with 609 octave-forge is configured with
558 octave: $OCTAVE (version $OCTAVE_VERSION) 610 octave: $OCTAVE (version $OCTAVE_VERSION)
559 - mkoctfile: $MKOCTFILE for Octave $subver" 611 - mkoctfile: $MKOCTFILE for Octave $subver"
560 + mkoctfile: $MKOCTFILE for Octave $OCTAVE_VERSION 612 + mkoctfile: $MKOCTFILE for Octave $OCTAVE_VERSION
561 + octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION
562 diff -ur Windows.orig/src/Makeconf.in Windows/src/Makeconf.in
563 --- Windows.orig/src/Makeconf.in 2015-04-14 22:06:35.000000000 -0400
564 +++ Windows/src/Makeconf.in 2015-04-14 22:13:40.000000000 -0400
565 @@ -52,6 +52,7 @@
566 OCTAVE = @OCTAVE@
567 OCTAVE_VERSION = @OCTAVE_VERSION@
568 MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v
569 +OCTAVE_CONFIG = @OCTAVE_CONFIG@
570 SHLEXT = @SHLEXT@
571
572 ver = @ver@
573 diff -ur Windows.orig/src/configure Windows/src/configure
574 --- Windows.orig/src/configure 2015-04-14 22:26:36.000000000 -0400
575 +++ Windows/src/configure 2015-04-14 22:27:10.000000000 -0400
576 @@ -3080,7 +3080,7 @@
577 octave-forge is configured with
578 octave: $OCTAVE (version $OCTAVE_VERSION)
579 mkoctfile: $MKOCTFILE for Octave $OCTAVE_VERSION
580 - octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION
581 + octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION" 613 + octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION"
582 ac_config_files="$ac_config_files $CONFIGURE_OUTPUTS" 614 diff -ur Windows.orig/src/grab.cc Windows/src/grab.cc
583 615 --- Windows.orig/src/grab.cc 2015-04-15 19:22:06.000000000 -0400
584 616 +++ Windows/src/grab.cc 2015-04-15 19:22:19.000000000 -0400
585 diff -ur Windows.orig/src/configure.base Windows/src/configure.base
586 --- Windows.orig/src/configure.base 2015-04-14 22:26:36.000000000 -0400
587 +++ Windows/src/configure.base 2015-04-14 22:26:57.000000000 -0400
588 @@ -361,4 +361,4 @@
589 octave-forge is configured with
590 octave: $OCTAVE (version $OCTAVE_VERSION)
591 mkoctfile: $MKOCTFILE for Octave $OCTAVE_VERSION
592 - octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION
593 + octave-config: $OCTAVE_CONFIG for Octave $OCTAVE_VERSION"
594 diff -ru Windows.orig/src/grab.cc Windows/src/grab.cc
595 --- Windows.orig/src/grab.cc 2015-04-14 22:28:16.000000000 -0400
596 +++ Windows/src/grab.cc 2015-04-14 22:31:44.000000000 -0400
597 @@ -123,8 +123,8 @@ 617 @@ -123,8 +123,8 @@
598 618
599 619
600 /* Wait for a click */ 620 /* Wait for a click */
601 - MArray<int> xc(maxpoints); 621 - MArray<int> xc(maxpoints);
614 + xc.resize (dim_vector(xc.length()+maxpoints,1)); 634 + xc.resize (dim_vector(xc.length()+maxpoints,1));
615 + yc.resize (dim_vector(yc.length()+maxpoints,1)); 635 + yc.resize (dim_vector(yc.length()+maxpoints,1));
616 } 636 }
617 } 637 }
618 638
619 diff -ur Windows.orig/src/__COM__.cc Windows/src/__COM__.cc 639 diff -ur Windows.orig/src/Makeconf.in Windows/src/Makeconf.in
620 --- Windows.orig/src/__COM__.cc 2015-04-14 22:44:19.000000000 -0400 640 --- Windows.orig/src/Makeconf.in 2015-04-15 19:22:06.000000000 -0400
621 +++ Windows/src/__COM__.cc 2015-04-14 22:45:12.000000000 -0400 641 +++ Windows/src/Makeconf.in 2015-04-15 19:22:19.000000000 -0400
622 @@ -180,7 +180,9 @@ 642 @@ -52,6 +52,7 @@
623 643 OCTAVE = @OCTAVE@
624 private: 644 OCTAVE_VERSION = @OCTAVE_VERSION@
625 // regular octave value declarations 645 MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v
626 + #if defined (DEFINE_OCTAVE_ALLOCATOR) 646 +OCTAVE_CONFIG = @OCTAVE_CONFIG@
627 DECLARE_OCTAVE_ALLOCATOR 647 SHLEXT = @SHLEXT@
628 + #endif 648
629 649 ver = @ver@
630 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
631
632 @@ -189,7 +191,9 @@
633 std::string com_typename;
634 };
635
636 +#if defined (DEFINE_OCTAVE_ALLOCATOR)
637 DEFINE_OCTAVE_ALLOCATOR (octave_com_object);
638 +#endif
639
640 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_com_object,
641 "octave_com_object",