* Another grand 2003 update.

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

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index a5c80e1281ac9be7882767871d36f519f433dc25..61294e885ed74aae57b6811dd73ffbc36c1042d5 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--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,23 +11,40 @@
 #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*);
+demangle_classname (std::type_info const &);
 
 /**
 
    Virtual copy constructor. Make up for C++'s lack of a standard
-   clone() function.  Uses a typeof hack.  Usage:
+   clone () function.  Uses a typeof hack.  Usage:
 
    class Foo : Baseclass {
-       VIRTUAL_COPY_CONS(Baseclass);
+       VIRTUAL_COPY_CONS (Baseclass);
    };
    
  */
-#define VIRTUAL_COPY_CONS(base)   virtual base *clone () const { return new typeof(*this) (*this); }
 
-#endif 
+/*
+  fix constness: gcc-2.95 is correct in defining
+  
+    typeof (*this)
+    
+  in a const member function to be const
+*/
+#define VIRTUAL_COPY_CONS(base) \
+  virtual base* clone_const_helper () \
+    { \
+      return new typeof (*this) (*this); \
+    } \
+  virtual base* clone () const \
+    { \
+      base* urg = (base*)this; \
+      return urg->clone_const_helper (); \
+    }
+
+
+#endif /* VIRTUAL_METHODS_HH */