diff options
-rw-r--r-- | math/octave/Makefile | 8 | ||||
-rw-r--r-- | math/octave/PLIST | 19 | ||||
-rw-r--r-- | math/octave/distinfo | 20 | ||||
-rw-r--r-- | math/octave/patches/patch-libgnu_stdio.in.h | 8 | ||||
-rw-r--r-- | math/octave/patches/patch-libgnu_string.in.h | 48 | ||||
-rw-r--r-- | math/octave/patches/patch-libgui_src_octave-gui.cc | 21 | ||||
-rw-r--r-- | math/octave/patches/patch-libgui_src_workspace-model.cc | 4 | ||||
-rw-r--r-- | math/octave/patches/patch-libgui_src_workspace-view.cc | 17 | ||||
-rw-r--r-- | math/octave/patches/patch-libinterp_octave-value_ov-classdef.cc | 16 | ||||
-rw-r--r-- | math/octave/patches/patch-libinterp_octave-value_ov-classdef.h | 13 |
10 files changed, 59 insertions, 115 deletions
diff --git a/math/octave/Makefile b/math/octave/Makefile index 2b4f545cb3c..f9561b3ddcf 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.138 2016/08/04 17:03:36 ryoon Exp $ +# $NetBSD: Makefile,v 1.139 2016/08/06 13:03:35 prlw1 Exp $ -DISTNAME= octave-4.0.0 -PKGREVISION= 4 +DISTNAME= octave-4.0.3 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_GNU:=octave/} EXTRACT_SUFX= .tar.xz @@ -71,7 +70,7 @@ SUBST_CLASSES+= fix-make SUBST_STAGE.fix-make= pre-configure SUBST_MESSAGE.fix-make= Fixing path to gmake. SUBST_FILES.fix-make= scripts/pkg/private/configure_make.m -SUBST_SED.fix-make= -e 's:@GMAKE@:$(GMAKE):g' +SUBST_SED.fix-make= -e 's:@GMAKE@:${GMAKE}:g' SUBST_CLASSES+= qt5-pkg-config SUBST_STAGE.qt5-pkg-config= pre-configure @@ -106,6 +105,7 @@ post-install: .include "../../devel/pcre/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../math/arpack/buildlink3.mk" .include "../../math/blas/buildlink3.mk" .include "../../math/fftw/buildlink3.mk" diff --git a/math/octave/PLIST b/math/octave/PLIST index ea056723b03..c2c2393182a 100644 --- a/math/octave/PLIST +++ b/math/octave/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.26 2016/02/16 04:21:40 dbj Exp $ +@comment $NetBSD: PLIST,v 1.27 2016/08/06 13:03:35 prlw1 Exp $ bin/mkoctfile bin/mkoctfile-${PKGVERSION} bin/octave @@ -786,13 +786,13 @@ include/${PKGNAME}/octave/xpow.h include/${PKGNAME}/octave/zfstream.h info/liboctave.info info/octave.info +lib/charset.alias lib/octave/${PKGVERSION}/__delaunayn__.a lib/octave/${PKGVERSION}/__eigs__.a lib/octave/${PKGVERSION}/__fltk_uigetfile__.a lib/octave/${PKGVERSION}/__glpk__.a lib/octave/${PKGVERSION}/__init_fltk__.a lib/octave/${PKGVERSION}/__init_gnuplot__.a -lib/octave/${PKGVERSION}/__magick_read__.a lib/octave/${PKGVERSION}/__osmesa_print__.a lib/octave/${PKGVERSION}/__voronoi__.a lib/octave/${PKGVERSION}/amd.a @@ -814,7 +814,6 @@ lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__fltk_uigetfile__.oct lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__glpk__.oct lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__init_fltk__.oct lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__init_gnuplot__.oct -lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__magick_read__.oct lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__osmesa_print__.oct lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__voronoi__.oct lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/amd.oct @@ -941,6 +940,9 @@ share/octave/${PKGVERSION}/etc/tests/fixed/classes/@Pork/get.m share/octave/${PKGVERSION}/etc/tests/fixed/classes/@Pork/gurk.m share/octave/${PKGVERSION}/etc/tests/fixed/classes/@Pork/private/myStash.m share/octave/${PKGVERSION}/etc/tests/fixed/classes/@Pork/set.m +share/octave/${PKGVERSION}/etc/tests/fixed/classes/@SizeTester/SizeTester.m +share/octave/${PKGVERSION}/etc/tests/fixed/classes/@SizeTester/numel.m +share/octave/${PKGVERSION}/etc/tests/fixed/classes/@SizeTester/size.m share/octave/${PKGVERSION}/etc/tests/fixed/classes/@Sneetch/Sneetch.m share/octave/${PKGVERSION}/etc/tests/fixed/classes/@Sneetch/display.m share/octave/${PKGVERSION}/etc/tests/fixed/classes/@Snork/Snork.m @@ -1043,6 +1045,7 @@ share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/__dsearchn__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/__ichol__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/__ilu__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/__lin_interpn__.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/__magick_read__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/__pchip_deriv__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/__qp__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/besselj.cc-tst @@ -1060,6 +1063,7 @@ share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/dlmread.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/dot.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/eig.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/ellipj.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/error.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/fft.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/fft2.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/file-io.cc-tst @@ -1116,7 +1120,6 @@ share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/variables.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/__delaunayn__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/__fltk_uigetfile__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/__glpk__.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/__magick_read__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/__osmesa_print__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/__voronoi__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/amd.cc-tst @@ -2205,3 +2208,11 @@ share/octave/${PKGVERSION}/m/time/is_leap_year.m share/octave/${PKGVERSION}/m/time/now.m share/octave/${PKGVERSION}/m/time/weekday.m share/octave/site/m/startup/octaverc +@pkgdir share/octave/site/api-v50+/m +@pkgdir share/octave/${PKGVERSION}/site/m +@pkgdir libexec/octave/site/exec/${MACHINE_GNU_PLATFORM} +@pkgdir libexec/octave/api-v50+/site/exec/${MACHINE_GNU_PLATFORM} +@pkgdir libexec/octave/${PKGVERSION}/site/exec/${MACHINE_GNU_PLATFORM} +@pkgdir lib/octave/site/oct/${MACHINE_GNU_PLATFORM} +@pkgdir lib/octave/site/oct/api-v50+/${MACHINE_GNU_PLATFORM} +@pkgdir lib/octave/${PKGVERSION}/site/oct/${MACHINE_GNU_PLATFORM} diff --git a/math/octave/distinfo b/math/octave/distinfo index 85a12edeab1..43a8c9b9431 100644 --- a/math/octave/distinfo +++ b/math/octave/distinfo @@ -1,15 +1,14 @@ -$NetBSD: distinfo,v 1.46 2016/03/01 20:13:19 joerg Exp $ +$NetBSD: distinfo,v 1.47 2016/08/06 13:03:35 prlw1 Exp $ -SHA1 (octave-4.0.0.tar.xz) = 795c7ef1fb8d92f4cf9cae9eabba374a0328b1a9 -RMD160 (octave-4.0.0.tar.xz) = 57a4c6a90fbe49ad5268b257a4847788061daa49 -SHA512 (octave-4.0.0.tar.xz) = 54559686d017b7fe731a89a24e74d08781365028d2799a86f25ebf4c433013eab03e5b4381a992b79e40bce1827a6eee2aefd0798b739128dd8dd7b41d936b89 -Size (octave-4.0.0.tar.xz) = 15759196 bytes +SHA1 (octave-4.0.3.tar.xz) = c798346a8271e0141d9dbe5610584dabb8311277 +RMD160 (octave-4.0.3.tar.xz) = 32bad5cdb6b832d651183b92f59b396940d6ec04 +SHA512 (octave-4.0.3.tar.xz) = bad009235b04be09c051dd27ebef7df2542adec0a0b57c070662deebe33a0cdceb7d6816653f5afc3fc0cc1287ba1ca1a5c50858169004210224039374c9c55d +Size (octave-4.0.3.tar.xz) = 15697064 bytes SHA1 (patch-configure) = b79c490c85ca422fedf6ca7da472255196e00325 SHA1 (patch-configure.ac) = d70f77d12a660bf9542725c8085fb525f138ce75 SHA1 (patch-fflush-fpos_t.c) = 83d3d731042862920de68f0457fea4f95568125c SHA1 (patch-fseeko-fpos_t.c) = b38e7a38be2e0b323cd7f168f1d22d3df998691c -SHA1 (patch-libgnu_stdio.in.h) = 9b01e1e131b39ef69607387adefc679e0e11d653 -SHA1 (patch-libgnu_string.in.h) = feac8dd3c9873d93918f9b5810c28a80f953a80a +SHA1 (patch-libgnu_stdio.in.h) = 112a424655d46c75fb68531fe7a84d9a0e97a984 SHA1 (patch-libgui_graphics_Canvas.cc) = b8161fc9248af2160c6fea012bac85e2128dbad7 SHA1 (patch-libgui_graphics_Object.cc) = f0c0064793d4650e845e217806597bb956cb49fd SHA1 (patch-libgui_qterminal_libqterminal_QTerminal.cc) = 48827b415a142518a6d764f670db0ce640cf4da4 @@ -17,18 +16,17 @@ SHA1 (patch-libgui_qterminal_libqterminal_unix_TerminalView.cpp) = 45c425a030591 SHA1 (patch-libgui_qterminal_libqterminal_unix_Vt102Emulation.cpp) = 36aaf960d0fc8c9809ef5937c82fc394a0ded8ac SHA1 (patch-libgui_qterminal_libqterminal_unix_konsole__wcwidth.h) = 6f12b058cb10e3a01306e9973f4e2574cf596da7 SHA1 (patch-libgui_src_find-files-dialog.cc) = 438694fc44a9fe8393ccb2606de71b32196f7058 -SHA1 (patch-libgui_src_octave-gui.cc) = 7418e6d6f19fe70179f5de91a9877d0ea3067e7b +SHA1 (patch-libgui_src_octave-gui.cc) = 7b596955210052bde684bb5420743d74728c0735 SHA1 (patch-libgui_src_resource-manager.cc) = 09560d42bdf4c00f4e438f40ffb3ae0b9037ee85 SHA1 (patch-libgui_src_shortcut-manager.cc) = 2faf15cc4c779eb3cf32152abd369bf968e1bf18 -SHA1 (patch-libgui_src_workspace-model.cc) = d24ec317a55639017649a1654cd1a088e226edc1 +SHA1 (patch-libgui_src_workspace-model.cc) = bb5a875fcb09064c37572d066a25bb2011ee91cc +SHA1 (patch-libgui_src_workspace-view.cc) = 4be02918359fbb6d4b0dcbc1fcddb63bb3d00b4d SHA1 (patch-libinterp_Makefile.am) = 29a8b034c743bed2570c90e8ef7a17bc2cf70dfe SHA1 (patch-libinterp_Makefile.in) = 7fb118b9e2969b54b2510c57a4a7beb16f679bcd SHA1 (patch-libinterp_corefcn_rand.cc) = e2a33ee323e904e4f3980f49ac363c4a42e5641d SHA1 (patch-libinterp_dldfcn_config-module.awk) = 50d7173114f597038b01ed4479583c86ed78c3fe SHA1 (patch-libinterp_dldfcn_module.mk) = 7627fa6132036f26b77743d30dbbe99ed6442b42 SHA1 (patch-libinterp_oct-conf.in.h) = 9a6b0e8d38bc2f9da916cb3d8145307e7a415f4f -SHA1 (patch-libinterp_octave-value_ov-classdef.cc) = 777b447a587825ca53e7d4d1344a0a75ea44bd23 -SHA1 (patch-libinterp_octave-value_ov-classdef.h) = 5d73fb7751aad0ef4880874ac2ed27df4a76a43c SHA1 (patch-liboctave_numeric_oct-fftw.h) = b152566ad3fcf6c5c1808f4428e6d51966ca1daf SHA1 (patch-liboctave_operators_mx-inlines.cc) = 3f01077700a3b8f51a3a171fdc11bafd784e3ea3 SHA1 (patch-liboctave_system_oct-time.cc) = 7b8a33911c69861572e35320e13c6c777048bc6c diff --git a/math/octave/patches/patch-libgnu_stdio.in.h b/math/octave/patches/patch-libgnu_stdio.in.h index 124a0f8bce0..006b48b0af1 100644 --- a/math/octave/patches/patch-libgnu_stdio.in.h +++ b/math/octave/patches/patch-libgnu_stdio.in.h @@ -1,8 +1,8 @@ -$NetBSD: patch-libgnu_stdio.in.h,v 1.2 2016/02/16 04:21:40 dbj Exp $ +$NetBSD: patch-libgnu_stdio.in.h,v 1.3 2016/08/06 13:03:35 prlw1 Exp $ Do not re-define gets() on SunOS, incompatible prototype. ---- libgnu/stdio.in.h.orig 2015-05-23 14:36:17.000000000 +0000 +--- libgnu/stdio.in.h.orig 2016-07-01 18:43:45.000000000 +0000 +++ libgnu/stdio.in.h @@ -722,10 +722,12 @@ _GL_WARN_ON_USE (getline, "getline is un /* It is very rare that the developer ever has full control of stdin, @@ -10,10 +10,10 @@ Do not re-define gets() on SunOS, incompatible prototype. removed it. */ +#ifndef __sun #undef gets - #if HAVE_RAW_DECL_GETS + #if HAVE_RAW_DECL_GETS && !defined __cplusplus _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); #endif +#endif - #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ + struct obstack; diff --git a/math/octave/patches/patch-libgnu_string.in.h b/math/octave/patches/patch-libgnu_string.in.h deleted file mode 100644 index 4a5bdf90ebe..00000000000 --- a/math/octave/patches/patch-libgnu_string.in.h +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-libgnu_string.in.h,v 1.3 2016/03/01 20:13:19 joerg Exp $ - -The "split" include guards fails miserable on NetBSD since by default -string.h will include strings.h, which goes back to string.h. Now due to -the lovely magic here, the rest of the file will be processed before the -real header. - ---- libgnu/string.in.h.orig 2015-05-23 14:36:17.000000000 +0000 -+++ libgnu/string.in.h -@@ -22,11 +22,8 @@ - #endif - @PRAGMA_COLUMNS@ - --/* The include_next requires a split double-inclusion guard. */ --#@INCLUDE_NEXT@ @NEXT_STRING_H@ -- --#ifndef _@GUARD_PREFIX@_STRING_H - #define _@GUARD_PREFIX@_STRING_H -+#@INCLUDE_NEXT@ @NEXT_STRING_H@ - - /* NetBSD 5.0 mis-defines NULL. */ - #include <stddef.h> -@@ -184,6 +181,12 @@ _GL_WARN_ON_USE (mempcpy, "mempcpy is un - #endif - - /* Search backwards through a block for a byte (specified as an int). */ -+#if defined(__NetBSD__) -+#if defined(__cplusplus) -+extern "C" -+#endif -+void * memrchr(const void *b, int c, size_t len); -+#else - #if @GNULIB_MEMRCHR@ - # if ! @HAVE_DECL_MEMRCHR@ - _GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t) -@@ -210,6 +213,7 @@ _GL_WARN_ON_USE (memrchr, "memrchr is un - "use gnulib module memrchr for portability"); - # endif - #endif -+#endif - - /* Find the first occurrence of C in S. More efficient than - memchr(S,C,N), at the expense of undefined behavior if C does not -@@ -1026,4 +1030,3 @@ _GL_WARN_ON_USE (strverscmp, "strverscmp - - - #endif /* _@GUARD_PREFIX@_STRING_H */ --#endif /* _@GUARD_PREFIX@_STRING_H */ diff --git a/math/octave/patches/patch-libgui_src_octave-gui.cc b/math/octave/patches/patch-libgui_src_octave-gui.cc index 49df51558e3..64f721cdfa2 100644 --- a/math/octave/patches/patch-libgui_src_octave-gui.cc +++ b/math/octave/patches/patch-libgui_src_octave-gui.cc @@ -1,8 +1,8 @@ -$NetBSD: patch-libgui_src_octave-gui.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $ +$NetBSD: patch-libgui_src_octave-gui.cc,v 1.2 2016/08/06 13:03:35 prlw1 Exp $ Changes for compiling with Qt5 instead of Qt4 ---- libgui/src/octave-gui.cc.orig 2015-05-23 14:21:54.000000000 +0000 +--- libgui/src/octave-gui.cc.orig 2016-04-20 18:23:57.000000000 +0000 +++ libgui/src/octave-gui.cc @@ -92,7 +92,7 @@ private: // Disable all Qt messages by default. @@ -22,15 +22,12 @@ Changes for compiling with Qt5 instead of Qt4 install___init_qt___functions (); -@@ -117,11 +117,6 @@ octave_start_gui (int argc, char *argv[] - QApplication application (argc, argv); - QTranslator gui_tr, qt_tr, qsci_tr; +@@ -119,7 +119,7 @@ octave_start_gui (int argc, char *argv[] -- // Set the codec for all strings (before wizard) --#if ! defined (Q_OS_WIN32) + // Set the codec for all strings (before wizard) + #if ! defined (Q_OS_WIN32) - QTextCodec::setCodecForCStrings (QTextCodec::codecForName ("UTF-8")); --#endif -- - if (start_gui) - { - // show wizard if this is the first run ++ QTextCodec::setCodecForLocale (QTextCodec::codecForName ("UTF-8")); + #endif + + // show wizard if this is the first run diff --git a/math/octave/patches/patch-libgui_src_workspace-model.cc b/math/octave/patches/patch-libgui_src_workspace-model.cc index ed16f5d0b0b..39697810daf 100644 --- a/math/octave/patches/patch-libgui_src_workspace-model.cc +++ b/math/octave/patches/patch-libgui_src_workspace-model.cc @@ -1,9 +1,7 @@ -$NetBSD: patch-libgui_src_workspace-model.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $ +$NetBSD: patch-libgui_src_workspace-model.cc,v 1.2 2016/08/06 13:03:35 prlw1 Exp $ Changes for compiling with Qt5 instead of Qt4 -$NetBSD: patch-libgui_src_workspace-model.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $ - --- libgui/src/workspace-model.cc.orig 2015-05-23 14:21:53.000000000 +0000 +++ libgui/src/workspace-model.cc @@ -132,7 +132,7 @@ workspace_model::data (const QModelIndex diff --git a/math/octave/patches/patch-libgui_src_workspace-view.cc b/math/octave/patches/patch-libgui_src_workspace-view.cc new file mode 100644 index 00000000000..4fbf5702f37 --- /dev/null +++ b/math/octave/patches/patch-libgui_src_workspace-view.cc @@ -0,0 +1,17 @@ +$NetBSD: patch-libgui_src_workspace-view.cc,v 1.1 2016/08/06 13:03:35 prlw1 Exp $ + +Changes for compiling with Qt5 instead of Qt4 + +--- libgui/src/workspace-view.cc.orig 2016-04-20 18:23:57.000000000 +0000 ++++ libgui/src/workspace-view.cc +@@ -98,8 +98,8 @@ workspace_view::workspace_view (QWidget + view->horizontalHeader ()->restoreState ( + settings->value ("workspaceview/column_state").toByteArray ()); + // Set header properties for sorting +- view->horizontalHeader ()->setClickable (true); +- view->horizontalHeader ()->setMovable (true); ++ view->horizontalHeader ()->setSectionsClickable (true); ++ view->horizontalHeader ()->setSectionsMovable (true); + view->horizontalHeader ()->setSortIndicator ( + settings->value ("workspaceview/sort_by_column",0).toInt (), + static_cast<Qt::SortOrder> diff --git a/math/octave/patches/patch-libinterp_octave-value_ov-classdef.cc b/math/octave/patches/patch-libinterp_octave-value_ov-classdef.cc deleted file mode 100644 index 05b0e8c8881..00000000000 --- a/math/octave/patches/patch-libinterp_octave-value_ov-classdef.cc +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-libinterp_octave-value_ov-classdef.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $ - ---- libinterp/octave-value/ov-classdef.cc.orig 2015-05-23 14:21:53.000000000 +0000 -+++ libinterp/octave-value/ov-classdef.cc -@@ -1937,6 +1937,11 @@ cdef_object_scalar::is_partially_constru - return true; - } - -+void cdef_object_scalar::mark_as_constructed (const cdef_class& cls) -+{ -+ ctor_list.erase (cls); -+} -+ - handle_cdef_object::~handle_cdef_object (void) - { - #if DEBUG_TRACE diff --git a/math/octave/patches/patch-libinterp_octave-value_ov-classdef.h b/math/octave/patches/patch-libinterp_octave-value_ov-classdef.h deleted file mode 100644 index 61afcab05ef..00000000000 --- a/math/octave/patches/patch-libinterp_octave-value_ov-classdef.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-libinterp_octave-value_ov-classdef.h,v 1.1 2016/02/16 04:21:40 dbj Exp $ - ---- libinterp/octave-value/ov-classdef.h.orig 2015-05-23 14:21:53.000000000 +0000 -+++ libinterp/octave-value/ov-classdef.h -@@ -438,7 +438,7 @@ public: - - void mark_as_constructed (void) { ctor_list.clear (); } - -- void mark_as_constructed (const cdef_class& cls) { ctor_list.erase (cls); } -+ void mark_as_constructed (const cdef_class& cls); - - bool is_constructed (void) const { return ctor_list.empty (); } - |