(new_lyrics): \addlyrics -> \oldaddlyrics,

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

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index 792c06f28077e218d4bd1686b146452e13dd6988..05642bee82c6bfbd7a9bfc79e6ec687549bb2410 100644 (file)
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,23 +11,32 @@
 #define VIRTUAL_METHODS_HH
 
 #include <typeinfo>
-#include "stdlib.h"            // size_t
 
-#define classname(class_ptr)   demangle_classname(typeid(*(class_ptr)).name())
+#define classname(class_ptr) demangle_classname (typeid (*(class_ptr)))
 
 const char *
-demangle_classname (const char*);
-
-/**
-
-   Virtual copy constructor. Make up for C++'s lack of a standard
-   clone() function.  Uses a typeof hack.  Usage:
-
-   class Foo : Baseclass {
-       VIRTUAL_COPY_CONS(Baseclass);
-   };
-   
- */
-#define VIRTUAL_COPY_CONS(base)   virtual base *clone () const { return new typeof(*this) (*this); }
-
-#endif 
+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 (); \
+    }
+
+#endif /* VIRTUAL_METHODS_HH */