Run `make grand-replace'.

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

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index ff13f106835f4462a535c0af0b6ff0a70e0495b1..57431f49082de48e222e6801fdc2fa2e89fdb356 100644 (file)
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -3,39 +3,42 @@
 
   source file of the Flower Library
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 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)))
 
-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 ();                         \
+char const *
+demangle_classname (type_info const &);
+
+/*
+
+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 VIRTUAL_COPY_CONSTRUCTOR(Base, name)   \
+  DECLARE_CLASSNAME(name);\
+  virtual Base *clone () const                 \
+  {                                            \
+    return new name (*this);                   \
   }
 
 #endif /* VIRTUAL_METHODS_HH */