* The grand 2005-2006 replace.

[lilypond.git] / flower / include / virtual-methods.hh

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index 47113cc06de944f50b38419f22b5a647dccbb81b..67dabc91d1bedae2fdf69c123095b6d65431b4ac 100644 (file)
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -3,18 +3,19 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef VIRTUAL_METHODS_HH
 #define VIRTUAL_METHODS_HH
 
 #include <typeinfo>
+using namespace std;
 
 #define classname(class_ptr) demangle_classname (typeid (* (class_ptr)))
 
 char const *
-demangle_classname (std::type_info const &);
+demangle_classname (type_info const &);
 
 /* Virtual copy constructor.  Make up for C++'s lack of a standard
    factory or clone () function.  Uses a typeof hack.  Usage:
@@ -24,10 +25,16 @@ demangle_classname (std::type_info const &);
    VIRTUAL_COPY_CONSTRUCTOR (Baseclass, Foo);
    }; */
 
-#define VIRTUAL_COPY_CONSTRUCTOR(Base, name)                   \
-  virtual Base *clone () const                                 \
-  {                                                            \
-    return new name (*this);                                   \
+#define DECLARE_CLASSNAME(name) \
+  virtual const char *class_name () const {    \
+    return #name; \
+}
+
+#define VIRTUAL_COPY_CONSTRUCTOR(Base, name)   \
+  DECLARE_CLASSNAME(name);\
+  virtual Base *clone () const                 \
+  {                                            \
+    return new name (*this);                   \
   }
 
 #endif /* VIRTUAL_METHODS_HH */