# HG changeset patch # User akira noda # Date 1440176752 14400 # Node ID a142b62527efe80aa9d770f1bf13f32e75442b23 # Parent 4bb41929286b32bf0c22c5027324a10790786952 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. diff -r 4bb41929286b -r a142b62527ef libinterp/octave-value/ov-classdef.cc --- 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 diff -r 4bb41929286b -r a142b62527ef libinterp/octave-value/ov-classdef.h --- 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 (); }