* scripts/lilypond-invoke-editor.scm (dissect-uri): Handle URIs

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

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index eb144367a9ae1116ba1d69e5071a12b33bfdcdfc..76ed3e9ea38baeb12846fb67cff101c6d97685ef 100644 (file)
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -3,48 +3,31 @@
 
   source file of the Flower Library
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #ifndef VIRTUAL_METHODS_HH
 #define VIRTUAL_METHODS_HH
 
 #include <typeinfo>
 
-#define classname(class_ptr)   demangle_classname (typeid (* (class_ptr)))
+#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
-   clone () function.  Uses a typeof hack.  Usage:
-
-   class Foo : Baseclass {
-       VIRTUAL_COPY_CONS (Baseclass);
-   };
-   
- */
+/* Virtual copy constructor.  Make up for C++'s lack of a standard
+   factory or clone () function.  Uses a typeof hack.  Usage:
 
-/*
-  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 (); \
-    }
+   class Foo : Baseclass
+   {
+   VIRTUAL_COPY_CONSTRUCTOR (Baseclass, Foo);
+   }; */
 
+#define VIRTUAL_COPY_CONSTRUCTOR(Base, name)                   \
+  virtual Base *clone () const                                 \
+  {                                                            \
+    return new name (*this);                                   \
+  }
 
 #endif /* VIRTUAL_METHODS_HH */