// default constructor
//////////
-wildcard::wildcard() : inherited(&wildcard::tinfo_static), label(0)
+wildcard::wildcard() : label(0)
{
setflag(status_flags::evaluated | status_flags::expanded);
}
// other constructors
//////////
-wildcard::wildcard(unsigned l) : inherited(&wildcard::tinfo_static), label(l)
+wildcard::wildcard(unsigned l) : label(l)
{
setflag(status_flags::evaluated | status_flags::expanded);
}
// archiving
//////////
-wildcard::wildcard(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
+void wildcard::read_archive(const archive_node& n, lst& sym_lst)
{
+ inherited::read_archive(n, sym_lst);
n.find_unsigned("label", label);
setflag(status_flags::evaluated | status_flags::expanded);
}
+GINAC_BIND_UNARCHIVER(wildcard);
void wildcard::archive(archive_node &n) const
{
n.add_unsigned("label", label);
}
-DEFAULT_UNARCHIVE(wildcard)
-
//////////
// functions overriding virtual functions from base classes
//////////
unsigned wildcard::calchash() const
{
// this is where the schoolbook method
- // (golden_ratio_hash(tinfo()) ^ label)
+ // (golden_ratio_hash(typeid(*this).name()) ^ label)
// is not good enough yet...
- hashvalue = golden_ratio_hash(golden_ratio_hash((p_int)tinfo()) ^ label);
+ const void* this_tinfo = (const void*)typeid(*this).name();
+ hashvalue = golden_ratio_hash(golden_ratio_hash((p_int)this_tinfo) ^ label);
setflag(status_flags::hash_calculated);
return hashvalue;
}