- New tinfo mechanism

[ginac.git] / ginac / ncmul.h

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index 46a7aae1bd101da1f86cab802e0bb4d4bb6a9364..c99cd7af9d301ce6a5d1b34d3e26ee61b2e7d78f 100644 (file)
--- a/ginac/ncmul.h
+++ b/ginac/ncmul.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's non-commutative products of expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2006 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
  */
 
 #ifndef __GINAC_NCMUL_H__
@@ -69,7 +69,7 @@ public:
 protected:
        ex derivative(const symbol & s) const;
        unsigned return_type() const;
-       unsigned return_type_tinfo() const;
+       const basic* return_type_tinfo() const;
        
        // new virtual functions which can be overridden by derived classes
        // none
@@ -80,7 +80,7 @@ protected:
        void do_print_csrc(const print_context & c, unsigned level) const;
        size_t count_factors(const ex & e) const;
        void append_factors(exvector & v, const ex & e) const;
-       exvector expandchildren(unsigned options) const;
+       std::auto_ptr<exvector> expandchildren(unsigned options) const;
 public:
        const exvector & get_factors() const;
 };
@@ -90,14 +90,6 @@ public:
 ex reeval_ncmul(const exvector & v);
 ex hold_ncmul(const exvector & v);
 
-// utility functions
-
-/** Specialization of is_exactly_a<ncmul>(obj) for ncmul objects. */
-template<> inline bool is_exactly_a<ncmul>(const basic & obj)
-{
-       return obj.tinfo()==TINFO_ncmul;
-}
-
 } // namespace GiNaC
 
 #endif // ndef __GINAC_NCMUL_H__