X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fvirtual-methods.hh;h=1d6b02388eb059f1d53dad8779fe929ba22b7602;hb=1881044742efa5072bad5e31189e610ed3988270;hp=792c06f28077e218d4bd1686b146452e13dd6988;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index 792c06f280..1d6b02388e 100644
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -1,33 +1,51 @@
 /*
-  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--2011 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
+using namespace std;
 
-#define classname(class_ptr)   demangle_classname(typeid(*(class_ptr)).name())
 
-const char *
-demangle_classname (const char*);
+/*
 
-/**
+Virtual copy constructor.  Make up for C++'s lack of a standard
+factory or clone () function.  Usage:
+
+class Foo : Baseclass
+{
+VIRTUAL_COPY_CONSTRUCTOR (Baseclass, Foo);
+};
+
+*/
 
-   Virtual copy constructor. Make up for C++'s lack of a standard
-   clone() function.  Uses a typeof hack.  Usage:
+#define DECLARE_CLASSNAME(name) \
+  virtual const char *class_name () const {	\
+    return #name; \
+}
 
-   class Foo : Baseclass {
-   	VIRTUAL_COPY_CONS(Baseclass);
-   };
-   
- */
-#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);			\
+  }
 
-#endif 
+#endif /* VIRTUAL_METHODS_HH */