X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fvirtual-methods.hh;h=dc91d7b6696f41cccee3e5832e888c71c991ef87;hb=3af0951f9a11677240efa6228683dd4fcea13eaf;hp=f150734f2bc3bc8a27db96096de79c0c8abee7f7;hpb=2fd5f86de0500ecd9a3f47a2540c3b304f835ef4;p=lilypond.git

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index f150734f2b..dc91d7b669 100644
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -1,55 +1,48 @@
 /*
-  virtual-methods.hh -- declare macros for our do-it-yourself RTTI
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the Flower Library
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #ifndef VIRTUAL_METHODS_HH
 #define VIRTUAL_METHODS_HH
 
 #include <typeinfo>
-#include <stdlib.h>		// size_t
-
-#define classname(class_ptr)   demangle_classname(typeid(*(class_ptr)))
+using namespace std;
 
-const char *
-demangle_classname (type_info const &);
-
-/**
-
-   Virtual copy constructor. Make up for C++'s lack of a standard
-   clone() function.  Uses a typeof hack.  Usage:
+/*
+Virtual copy constructor.  Make up for C++'s lack of a standard
+factory or clone () function.  Usage:
 
-   class Foo : Baseclass {
-   	VIRTUAL_COPY_CONS(Baseclass);
-   };
-   
- */
+class Foo : Baseclass
+{
+VIRTUAL_COPY_CONSTRUCTOR (Baseclass, Foo);
+};
+*/
 
-// fix constness: gcc-2.95 is correct in defining
-//    typeof (*this)
-// in a const member function to be const
+#define DECLARE_CLASSNAME(name) \
+  virtual const char *class_name () const {     \
+    return #name; \
+}
 
-#if 0
-#define VIRTUAL_COPY_CONS(base) \
-  virtual base *clone () const \
-  { \
-    return new typeof(*this) (*this); \
+#define VIRTUAL_COPY_CONSTRUCTOR(Base, name)    \
+  DECLARE_CLASSNAME(name);\
+  virtual Base *clone () const                  \
+  {                                             \
+    return new name (*this);                    \
   }
-#else
-#define VIRTUAL_COPY_CONS(base) \
-  virtual base* clone_const_helper () \
-    { \
-      return new typeof (*this) (*this); \
-    } \
-  virtual base* clone () const \
-    { \
-      base* urg = (base*)this; \
-      return urg->clone_const_helper (); \
-    }
-#endif 
 
 #endif /* VIRTUAL_METHODS_HH */