X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fvirtual-methods.hh;h=dc91d7b6696f41cccee3e5832e888c71c991ef87;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=9a5a3c1e64cc9bcb7f9cdb57a64da2d63062e19e;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh index 9a5a3c1e64..dc91d7b669 100644 --- a/flower/include/virtual-methods.hh +++ b/flower/include/virtual-methods.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2010 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,13 +23,7 @@ #include using namespace std; -#define classname(class_ptr) demangle_classname (typeid (* (class_ptr))) - -char const * -demangle_classname (type_info const &); - /* - Virtual copy constructor. Make up for C++'s lack of a standard factory or clone () function. Usage: @@ -37,19 +31,18 @@ class Foo : Baseclass { VIRTUAL_COPY_CONSTRUCTOR (Baseclass, Foo); }; - */ #define DECLARE_CLASSNAME(name) \ - virtual const char *class_name () const { \ + virtual const char *class_name () const { \ return #name; \ } -#define VIRTUAL_COPY_CONSTRUCTOR(Base, name) \ +#define VIRTUAL_COPY_CONSTRUCTOR(Base, name) \ DECLARE_CLASSNAME(name);\ - virtual Base *clone () const \ - { \ - return new name (*this); \ + virtual Base *clone () const \ + { \ + return new name (*this); \ } #endif /* VIRTUAL_METHODS_HH */