X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fvirtual-methods.hh;h=6d4d84087941e3074c59775e00464d736d7de4c7;hb=05fabaaf86fd44f9bd903f282bb98d343a991e40;hp=b8933baa0e279d76e0ad4b8573542dad82a18e13;hpb=48bdd9154a32245a075494b403639181615864e2;p=lilypond.git

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index b8933baa0e..6d4d840879 100644
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -1,51 +1,50 @@
 /*
-  virtual-methods.hh -- declare 
+  virtual-methods.hh -- declare macros for our do-it-yourself RTTI
 
   source file of the Flower Library
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef VIRTUAL_METHODS_HH
 #define VIRTUAL_METHODS_HH
 
-/** a macro to declare the classes name as a static and virtual function.
-  The static_name() can *not* be inlined (this might have the effect that 
-  s->name() != S::static_name(). Overlapping strings need not be merged in C++
+#include <typeinfo>
+
+#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);
+   };
+   
  */
-#define NAME_MEMBERS()	\
-static char const *static_name();\
-static bool static_is_type_b(const char*s);\
-virtual bool is_type_b(const char *s)const { return static_is_type_b(s); } \
-virtual char const *name() const{ return static_name(); } \
-int a_stupid_nonexistent_function_to_allow_the_semicolon_come_out()
-
-#define IMPLEMENT_STATIC_NAME(c)\
-    char const *c::static_name() { return #c; } 
-
-#define VIRTUAL_COPY_CONS(T, R)\
-  virtual R *clone() const { return  new T(*this); } \
-  int  yet_another_stupid_function_to_allow_semicolon()
-
-#define IMPLEMENT_IS_TYPE_B(D) 							   \
-    IMPLEMENT_STATIC_NAME(D)\
-  bool D::static_is_type_b(const char *s)					   \
-{ 										   \
-    return s == static_name();							   \
-}										   
-										   
-#define IMPLEMENT_IS_TYPE_B1(D,B) 						   \
-	IMPLEMENT_STATIC_NAME(D)\
-  bool D::static_is_type_b(const char *s)						   \
-{ 										   \
-    return s == static_name() || B::static_is_type_b(s);				   \
-}										   
-#define IMPLEMENT_IS_TYPE_B2(D, BA, BB) 						   \
-	IMPLEMENT_STATIC_NAME(D)\
-  bool D::static_is_type_b(const char *s)						   \
-{ 										   \
-    return s == static_name() || BA::static_is_type_b(s) || BB::static_is_type_b(s); \
-}
-
-#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 */