Mercurial > mxe-octave

annotate src/of-windows-1-fixes.patch @ 4612:56320dd51677

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nsis: plugin requires static gcc linking * src/nsis-2-fixes.patch: add back static linking against libgcc
author John D
date Sat, 03 Mar 2018 19:42:43 -0500
parents 8c51e3a9d984
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4413
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
1 diff -r e250da446676 src/Makeconf.in
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
2 --- a/src/Makeconf.in Tue Jul 11 08:15:24 2017 -0400
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
3 +++ b/src/Makeconf.in Tue Jul 11 11:07:30 2017 -0400
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
4 @@ -59,8 +59,6 @@
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
5 MPATH = @mpath@
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
6 OPATH = @opath@
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
7 XPATH = @xpath@
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
8 -ALTMPATH = @altmpath@
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
9 -ALTOPATH = @altopath@
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
10
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
11 %.o: %.c ; $(MKOCTFILE) -c $<
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
12 %.o: %.f ; $(MKOCTFILE) -c $<
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
13 diff -r e250da446676 src/configure.base
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
14 --- a/src/configure.base Tue Jul 11 08:15:24 2017 -0400
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
15 +++ b/src/configure.base Tue Jul 11 11:07:30 2017 -0400
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
16 @@ -53,13 +53,9 @@
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
17 test -z "$OCTAVE_CONFIG" && AC_MSG_WARN([no octave-config found on path])
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
18
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
19 AC_SUBST(ver)
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
20 -AC_SUBST(subver)
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
21 AC_SUBST(mpath)
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
22 AC_SUBST(opath)
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
23 AC_SUBST(xpath)
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
24 -AC_SUBST(altpath)
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
25 -AC_SUBST(altmpath)
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
26 -AC_SUBST(altopath)
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
27
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
28 AC_ARG_WITH(path,
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
29 [ --with-path install path prefix],
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
30 @@ -73,83 +69,11 @@
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
31 AC_ARG_WITH(xpath,
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
32 [ --with-xpath override path for executables],
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
33 [xpath=$withval])
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
34 -AC_ARG_WITH(altpath,
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
35 - [ --with-altpath alternative functions install path prefix],
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
36 - [ altpath=$withval ])
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
37 -AC_ARG_WITH(altmpath,
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
38 - [ --with-altmpath override path for alternative m-files],
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
39 - [altmpath=$withval])
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
40 -AC_ARG_WITH(altopath,
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
41 - [ --with-altopath override path for alternative oct-files],
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
42 - [altopath=$withval])
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
43
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
44 if test -n "$path" ; then
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
45 test -z "$mpath" && mpath=$path
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
46 test -z "$opath" && opath=$path/oct
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
47 test -z "$xpath" && xpath=$path/bin
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
48 - test -z "$altpath" && altpath=$path-alternatives
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
49 -fi
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
50 -
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
51 -if test -n "$altpath" ; then
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
52 - test -z "$altmpath" && altmpath=$altpath
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
53 - test -z "$altopath" && altopath=$altpath/oct
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
54 -fi
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
55 -
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
56 -dnl Don't query if path/ver are given in the configure environment
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
57 -#if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$altmpath" || test -z "$altopath" || test -z "$ver" ; then
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
58 -if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$ver" ; then
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
59 - dnl Construct program to get mkoctfile version and local install paths
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
60 - cat > conftest.cc <<EOF
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
61 -#include <octave/oct.h>
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
62 -#include <octave/version.h>
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
63 -#include <octave/defaults.h>
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
64 -
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
65 -#define INFOV "\nINFOV=" OCTAVE_VERSION "\n"
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
66 -
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
67 -#define INFOH "\nINFOH=" OCTAVE_CANONICAL_HOST_TYPE "\n"
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
68 -
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
69 -#ifdef OCTAVE_LOCALVERFCNFILEDIR
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
70 -# define INFOM "\nINFOM=" OCTAVE_LOCALVERFCNFILEDIR "\n"
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
71 -#else
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
72 -# define INFOM "\nINFOM=" OCTAVE_LOCALFCNFILEPATH "\n"
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
73 -#endif
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
74 -
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
75 -#ifdef OCTAVE_LOCALVEROCTFILEDIR
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
76 -# define INFOO "\nINFOO=" OCTAVE_LOCALVEROCTFILEDIR "\n"
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
77 -#else
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
78 -# define INFOO "\nINFOO=" OCTAVE_LOCALOCTFILEPATH "\n"
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
79 -#endif
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
80 -
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
81 -#ifdef OCTAVE_LOCALVERARCHLIBDIR
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
82 -# define INFOX "\nINFOX=" OCTAVE_LOCALVERARCHLIBDIR "\n"
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
83 -#else
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
84 -# define INFOX "\nINFOX=" OCTAVE_LOCALARCHLIBDIR "\n"
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
85 -#endif
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
86 -
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
87 -const char *infom = INFOM;
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
88 -const char *infoo = INFOO;
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
89 -const char *infox = INFOX;
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
90 -const char *infoh = INFOH;
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
91 -const char *infov = INFOV;
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
92 -EOF
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
93 -
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
94 - dnl Compile program perhaps with a special version of mkoctfile
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
95 - $MKOCTFILE conftest.cc || AC_MSG_ERROR(Could not run $MKOCTFILE)
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
96 -
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
97 - dnl Strip the config info from the compiled file
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
98 - eval `strings conftest.o | grep "^INFO.=" | sed -e "s,//.*$,,"`
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
99 - rm -rf conftest*
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
100 -
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
101 - dnl set the appropriate variables if they are not already set
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
102 - ver=`echo $INFOV | sed -e "s/\.//" -e "s/\..*$//"`
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
103 - subver=`echo $INFOV | sed -e "[s/^[^.]*[.][^.]*[.]//]"`
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
104 - alt_mbase=`echo $INFOM | sed -e "[s,\/[^\/]*$,,]"`
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
105 - alt_obase=`echo $INFOO | sed -e "[s,/site.*$,/site,]"`
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
106 - test -z "$mpath" && mpath=$INFOM/octave-forge
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
107 - test -z "$opath" && opath=$INFOO/octave-forge
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
108 - test -z "$xpath" && xpath=$INFOX
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
109 - test -z "$altmpath" && altmpath=$alt_mbase/octave-forge-alternatives/m
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
110 - test -z "$altopath" && altopath=$alt_obase/octave-forge-alternatives/oct/$INFOH
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
111 fi
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
112
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
113 dnl *******************************************************************
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
114 @@ -268,7 +192,10 @@
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
115
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
116 dnl should check that $(OCTAVE) --version matches $(MKOCTFILE) --version
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
117 AC_CHECK_PROG(OCTAVE,octave,octave)
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
118 +
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
119 OCTAVE_CONFIG_EVAL(VERSION,OCTAVE_VERSION)
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
120 +dnl get major ver part as used for a HAVE_OCTAVE_XXX define
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
121 +ver=`echo $OCTAVE_VERSION | sed -e "s/\.//" -e "s/\..*$//"`
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
122
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
123 dnl grab canonical host type so we can write system specific install stuff
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
124 OCTAVE_CONFIG_EVAL(CANONICAL_HOST_TYPE,canonical_host_type)
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
125 @@ -276,6 +203,16 @@
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
126 dnl grab SHLEXT from octave config
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
127 OCTAVE_CONFIG_EVAL(SHLEXT,SHLEXT)
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
128
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
129 +if test -z "$mpath"; then
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
130 +OCTAVE_CONFIG_EVAL(LOCALVERFCNFILEDIR,mpath)
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
131 +fi
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
132 +if test -z "$opath"; then
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
133 +OCTAVE_CONFIG_EVAL(LOCALVEROCTFILEDIR,opath)
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
134 +fi
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
135 +if test -z "$xpath"; then
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
136 +OCTAVE_CONFIG_EVAL(LOCALVERARCHLIBDIR,xpath)
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
137 +fi
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
138 +
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
139 AC_PROG_LN_S
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
140
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
141 AC_PROG_RANLIB
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
142 @@ -348,9 +285,6 @@
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
143 m-files: $mpath
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
144 oct-files: $opath
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
145 binaries: $xpath
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
146 -alternatives:
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
147 - m-files: $altmpath
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
148 - oct-files: $altopath
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
149
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
150 shell commands will install into the following directories:
d9eba31bd16b of-windows: add patch so compiled with octave 4.3.0+
John D
parents:
diff changeset
151 binaries: $bindir
4425
8c51e3a9d984 of-windows: octave_com_object marked as an object in base_value (Bug #51470)
John D
parents: 4413
diff changeset
152 diff -r caf31352f49e src/__COM__.cc
8c51e3a9d984 of-windows: octave_com_object marked as an object in base_value (Bug #51470)
John D
parents: 4413
diff changeset
153 --- a/src/__COM__.cc Tue Jul 11 12:46:02 2017 -0400
8c51e3a9d984 of-windows: octave_com_object marked as an object in base_value (Bug #51470)
John D
parents: 4413
diff changeset
154 +++ b/src/__COM__.cc Mon Jul 17 11:50:43 2017 -0400
8c51e3a9d984 of-windows: octave_com_object marked as an object in base_value (Bug #51470)
John D
parents: 4413
diff changeset
155 @@ -151,6 +151,8 @@
8c51e3a9d984 of-windows: octave_com_object marked as an object in base_value (Bug #51470)
John D
parents: 4413
diff changeset
156
8c51e3a9d984 of-windows: octave_com_object marked as an object in base_value (Bug #51470)
John D
parents: 4413
diff changeset
157 bool is_defined(void) const { return true; }
8c51e3a9d984 of-windows: octave_com_object marked as an object in base_value (Bug #51470)
John D
parents: 4413
diff changeset
158
8c51e3a9d984 of-windows: octave_com_object marked as an object in base_value (Bug #51470)
John D
parents: 4413
diff changeset
159 + bool isobject (void) const { return true; }
8c51e3a9d984 of-windows: octave_com_object marked as an object in base_value (Bug #51470)
John D
parents: 4413
diff changeset
160 +
8c51e3a9d984 of-windows: octave_com_object marked as an object in base_value (Bug #51470)
John D
parents: 4413
diff changeset
161 bool is_map (void) const { return true; }
8c51e3a9d984 of-windows: octave_com_object marked as an object in base_value (Bug #51470)
John D
parents: 4413
diff changeset
162
8c51e3a9d984 of-windows: octave_com_object marked as an object in base_value (Bug #51470)
John D
parents: 4413
diff changeset
163 string_vector map_keys(void) const;