-const char *
-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 (); \
+char const *
+demangle_classname (type_info const &);
+
+/*
+
+Virtual copy constructor. Make up for C++'s lack of a standard
+factory or clone () function. Usage:
+
+class Foo : Baseclass
+{
+VIRTUAL_COPY_CONSTRUCTOR (Baseclass, Foo);
+};
+
+*/
+
+#define DECLARE_CLASSNAME(name) \
+ virtual const char *class_name () const { \
+ return #name; \
+}
+
+#define VIRTUAL_COPY_CONSTRUCTOR(Base, name) \
+ DECLARE_CLASSNAME(name);\
+ virtual Base *clone () const \
+ { \
+ return new name (*this); \