fixed another power::series() bug [Alexei Sheplyakov]

[ginac.git] / ginac / print.h

diff --git a/ginac/print.h b/ginac/print.h
index 6b80d488dded42fbacb017bf8ad7bb53e6c0568b..85e0fad78a1a590f63e8c1de006609e92f51828d 100644 (file)
--- a/ginac/print.h
+++ b/ginac/print.h
@@ -3,7 +3,7 @@
  *  Definition of helper classes for expression output. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -69,19 +69,23 @@ public: \
        typedef supername inherited; \
        friend class function_options; \
        friend class registered_class_options; \
-private: \
-       static GiNaC::print_context_class_info reg_info; \
 public: \
-       virtual const GiNaC::print_context_class_info &get_class_info() const { return reg_info; } \
-       virtual const char *class_name() const { return reg_info.options.get_name(); } \
+       static const GiNaC::print_context_class_info &get_class_info_static(); \
+       virtual const GiNaC::print_context_class_info &get_class_info() const { return classname::get_class_info_static(); } \
+       virtual const char *class_name() const { return classname::get_class_info_static().options.get_name(); } \
        \
        classname(); \
-       classname * duplicate() const { return new classname(*this); } \
+       virtual classname * duplicate() const { return new classname(*this); } \
 private:
 
 /** Macro for inclusion in the implementation of each print_context class. */
 #define GINAC_IMPLEMENT_PRINT_CONTEXT(classname, supername) \
-       GiNaC::print_context_class_info classname::reg_info = GiNaC::print_context_class_info(print_context_options(#classname, #supername, next_print_context_id++));
+const GiNaC::print_context_class_info &classname::get_class_info_static() \
+{ \
+       static GiNaC::print_context_class_info reg_info = GiNaC::print_context_class_info(GiNaC::print_context_options(#classname, #supername, GiNaC::next_print_context_id++)); \
+       return reg_info; \
+}
+
 
 extern unsigned next_print_context_id;