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 dd18a37f404ddd2af7d8d66ee9b6809ed61d5b96..57431f49082de48e222e6801fdc2fa2e89fdb356 100644 (file)
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -3,52 +3,42 @@
 
   source file of the Flower Library
 
-  (c)  1997--2000 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)))
+#define classname(class_ptr) demangle_classname (typeid (* (class_ptr)))
 
-const char *
+char const *
 demangle_classname (type_info const &);
 
-/**
+/*
+
+Virtual copy constructor.  Make up for C++'s lack of a standard
+factory or clone () function.  Usage:
 
-   Virtual copy constructor. Make up for C++'s lack of a standard
-   clone() function.  Uses a typeof hack.  Usage:
+class Foo : Baseclass
+{
+VIRTUAL_COPY_CONSTRUCTOR (Baseclass, Foo);
+};
 
-   class Foo : Baseclass {
-       VIRTUAL_COPY_CONS(Baseclass);
-   };
-   
- */
+*/
 
-// fix constness: gcc-2.95 is correct in defining
-//    typeof (*this)
-// in a const member function to be const
+#define DECLARE_CLASSNAME(name) \
+  virtual const char *class_name () const {    \
+    return #name; \
+}
 
-#if 0
-#define VIRTUAL_COPY_CONS(base) \
-  virtual base *clone () const \
-  { \
-    return new typeof(*this) (*this); \
+#define VIRTUAL_COPY_CONSTRUCTOR(Base, name)   \
+  DECLARE_CLASSNAME(name);\
+  virtual Base *clone () const                 \
+  {                                            \
+    return new name (*this);                   \
   }
-#else
-#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 
 
 #endif /* VIRTUAL_METHODS_HH */