Compilation for GCC 4.2.

[ginac.git] / ginac / registrar.h

diff --git a/ginac/registrar.h b/ginac/registrar.h
index 50dbbb549a80cdd374b4d2553808dfdc1992c40e..bd4ddb03ad7375775494cc698e207c601a094fcd 100644 (file)
--- a/ginac/registrar.h
+++ b/ginac/registrar.h
@@ -35,7 +35,7 @@ namespace GiNaC {
 class ex;
 class archive_node;
 
-template <template <class> class> class container;
+template <template <class T, class = std::allocator<T> > class> class container;
 typedef container<std::list> lst;
 
 /** Definitions for the tinfo mechanism. */
@@ -101,7 +101,7 @@ typedef class_info<registered_class_options> registered_class_info;
 #define GINAC_DECLARE_REGISTERED_CLASS_NO_CTORS(classname, supername) \
 public: \
        typedef supername inherited; \
-    static const tinfo_static_t tinfo_static; \
+    static const GiNaC::tinfo_static_t tinfo_static; \
 private: \
        static GiNaC::registered_class_info reg_info; \
 public: \
@@ -145,19 +145,19 @@ private:
 /** Macro for inclusion in the implementation of each registered class. */
 #define GINAC_IMPLEMENT_REGISTERED_CLASS(classname, supername) \
        GiNaC::registered_class_info classname::reg_info = GiNaC::registered_class_info(GiNaC::registered_class_options(#classname, #supername, &classname::tinfo_static, &classname::unarchive)); \
-       const tinfo_static_t classname::tinfo_static = {};
+       const GiNaC::tinfo_static_t classname::tinfo_static = {};
 
 /** Macro for inclusion in the implementation of each registered class.
  *  Additional options can be specified. */
 #define GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(classname, supername, options) \
        GiNaC::registered_class_info classname::reg_info = GiNaC::registered_class_info(GiNaC::registered_class_options(#classname, #supername, &classname::tinfo_static, &classname::unarchive).options); \
-       const tinfo_static_t classname::tinfo_static = {};
+       const GiNaC::tinfo_static_t classname::tinfo_static = {};
 
 /** Macro for inclusion in the implementation of each registered class.
  *  Additional options can be specified. */
 #define GINAC_IMPLEMENT_REGISTERED_CLASS_OPT_T(classname, supername, options) \
        GiNaC::registered_class_info classname::reg_info = GiNaC::registered_class_info(GiNaC::registered_class_options(#classname, #supername, &classname::tinfo_static, &classname::unarchive).options); \
-       template<> const tinfo_static_t classname::tinfo_static = {};
+       template<> const GiNaC::tinfo_static_t classname::tinfo_static = {};
 
 
 /** Find type information key by class name. */