Skip to content

Commit 8ba0b1c

Browse files
committed
check for octave_base_value m_count
* src/configure.ac: add detect for octave_base_value m_count * src/octave_sqlite.cc: use OV_COUNT instead of count
1 parent 2241321 commit 8ba0b1c

File tree

2 files changed

+27
-3
lines changed

2 files changed

+27
-3
lines changed

src/configure.ac

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,38 @@ OF_OCTAVE_LIST_ALT_SYMS([
9292
[dnl
9393
[octave_base_value],
9494
[octave_base_dld_value],
95-
[[octave_base_dld_value tmp();]],
95+
[[octave_base_dld_value tmp;]],
9696
[OCTAVE_BASE_CLASS],
9797
[],
9898
[]
9999
]
100100
101101
],[oct-alt-includes.h])
102102

103+
AC_MSG_CHECKING([for octave_base_value count field])
104+
octave_count_field=count
105+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
106+
#include <octave/oct.h>
107+
#ifdef HAVE_CONFIG_H
108+
# include "config.h"
109+
#endif
110+
class test_base_class : public octave_base_value
111+
{
112+
public:
113+
test_base_class() {}
114+
~test_base_class() {}
115+
void test() { m_count ++; }
116+
bool is_object (void) const { return true; }
117+
};
118+
]], [
119+
test_base_class t; t.is_object();
120+
])],
121+
[octave_count_field=m_count],
122+
[octave_count_field=count]
123+
)
124+
AC_MSG_RESULT([$octave_count_field])
125+
AC_DEFINE_UNQUOTED([OV_COUNT],$octave_count_field,[octave_base_value ref count field])
126+
103127
CC=$save_CXX
104128
CXXFLAGS=$save_CXXFLAGS
105129
LIBS="$save_LIBS"

src/octave_sqlite.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ octave_sqlite::clone (void) const
8989
octave_base_value *
9090
octave_sqlite::unique_clone (void)
9191
{
92-
count++;
92+
OV_COUNT++;
9393
return this;
9494
}
9595

@@ -198,7 +198,7 @@ octave_sqlite::subsasgn (const std::string& type, const std::list<octave_value_l
198198
}
199199
}
200200
}
201-
count++;
201+
OV_COUNT++;
202202
retval = octave_value (this);
203203
}
204204
}

0 commit comments

Comments
 (0)