X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fvirtual-methods.hh;h=aa76632a9d3469f5824ddc84c83251882be6c913;hb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;hp=ff13f106835f4462a535c0af0b6ff0a70e0495b1;hpb=36b3ffc5bb31c29faaafa523376cde8b4c844572;p=lilypond.git

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index ff13f10683..aa76632a9d 100644
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -1,41 +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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 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>
+using namespace std;
+
+/*
+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);
+};
+*/
+
+#define DECLARE_CLASSNAME(name) \
+  virtual const char *class_name () const {     \
+    return #name; \
+}
 
-#define classname(class_ptr) demangle_classname (typeid (* (class_ptr)))
-
-const char *
-demangle_classname (std::type_info const &);
-
-/* Virtual copy constructor.  Make up for C++'s lack of a standard
-   factory or clone () function.  Uses a typeof hack.  Usage:
-
-   class Foo : Baseclass
-   {
-   VIRTUAL_COPY_CONSTRUCTOR (Baseclass, Foo);
-   }; */
-
-#define VIRTUAL_COPY_CONSTRUCTOR(Base, name)			\
-  /* Hack to fix constness: gcc >= 2.95 is correct in defining	\
-     typeof (*this) in a const member function to be const.  */	\
-  virtual Base *clone_const_helper ()				\
-  {								\
-    return new name (*this);					\
-  }								\
-  virtual Base *clone () const					\
-  {								\
-    /* return new name (*this); */				\
-    Base *urg = (base*) this;					\
-    return urg->clone_const_helper ();				\
+#define VIRTUAL_COPY_CONSTRUCTOR(Base, name)    \
+  DECLARE_CLASSNAME(name);\
+  virtual Base *clone () const                  \
+  {                                             \
+    return new name (*this);                    \
   }
 
 #endif /* VIRTUAL_METHODS_HH */