Mercurial > octave-nkf
changeset 20523:a142b62527ef
Fix compilation of classdef with the clang compiler (bug #41178)
* ov-classdef.cc, ov-classdef.h (cdef_object_scalar::mark_as_constructed):
Move function definition out of header file to avoid dependency on incomplete
type, compilation error with clang.
| author | akira noda <you.akira.noda@gmail.com> |
|---|---|
| date | Fri, 21 Aug 2015 13:05:52 -0400 |
| parents | 4bb41929286b |
| children | ba4088aee342 |
| files | libinterp/octave-value/ov-classdef.cc libinterp/octave-value/ov-classdef.h |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-classdef.cc Wed Sep 09 18:43:52 2015 +0200 +++ b/libinterp/octave-value/ov-classdef.cc Fri Aug 21 13:05:52 2015 -0400 @@ -1946,6 +1946,12 @@ 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
--- a/libinterp/octave-value/ov-classdef.h Wed Sep 09 18:43:52 2015 +0200 +++ b/libinterp/octave-value/ov-classdef.h Fri Aug 21 13:05:52 2015 -0400 @@ -438,7 +438,7 @@ 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 (); }