* Happy New Year(s)!

[ginac.git] / ginac / fderivative.cpp

diff --git a/ginac/fderivative.cpp b/ginac/fderivative.cpp
index 6bb252f5d4acd4d2f7507479aca901a1606a0b9c..48a8e75fecd7f448279743d642dde17cee761266 100644 (file)
--- a/ginac/fderivative.cpp
+++ b/ginac/fderivative.cpp
@@ -3,7 +3,7 @@
  *  Implementation of abstract derivatives of functions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2007 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
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <iostream>
@@ -39,7 +39,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(fderivative, function,
 
 fderivative::fderivative()
 {
-       tinfo_key = TINFO_fderivative;
+       tinfo_key = &fderivative::tinfo_static;
 }
 
 //////////
@@ -49,17 +49,17 @@ fderivative::fderivative()
 fderivative::fderivative(unsigned ser, unsigned param, const exvector & args) : function(ser, args)
 {
        parameter_set.insert(param);
-       tinfo_key = TINFO_fderivative;
+       tinfo_key = &fderivative::tinfo_static;
 }
 
 fderivative::fderivative(unsigned ser, const paramset & params, const exvector & args) : function(ser, args), parameter_set(params)
 {
-       tinfo_key = TINFO_fderivative;
+       tinfo_key = &fderivative::tinfo_static;
 }
 
 fderivative::fderivative(unsigned ser, const paramset & params, std::auto_ptr<exvector> vp) : function(ser, vp), parameter_set(params)
 {
-       tinfo_key = TINFO_fderivative;
+       tinfo_key = &fderivative::tinfo_static;
 }
 
 //////////
@@ -214,7 +214,7 @@ bool fderivative::match_same_type(const basic & other) const
        GINAC_ASSERT(is_a<fderivative>(other));
        const fderivative & o = static_cast<const fderivative &>(other);
 
-       return parameter_set == o.parameter_set;
+       return parameter_set == o.parameter_set && inherited::match_same_type(other);
 }
 
 } // namespace GiNaC