A better return_type_tinfo() mechanism.

[ginac.git] / ginac / integral.h

diff --git a/ginac/integral.h b/ginac/integral.h
index ef2e66269cb212c9219c023ade51d2e41719337d..e2843c82055e9326b6ef73d4bd726e564f8498a6 100644 (file)
--- a/ginac/integral.h
+++ b/ginac/integral.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's symbolic  integral. */
 
 /*
- *  GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2008 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_INTEGRAL_H__
@@ -28,7 +28,7 @@
 
 namespace GiNaC {
 
-/** Product of expressions. */
+/** Symbolic integral. */
 class integral : public basic
 {
        GINAC_DECLARE_REGISTERED_CLASS(integral, basic)
@@ -51,11 +51,12 @@ public:
        ex expand(unsigned options = 0) const;
        exvector get_free_indices() const;
        unsigned return_type() const;
-       unsigned return_type_tinfo() const;
+       return_type_t return_type_tinfo() const;
        ex conjugate() const;
        ex eval_integ() const;
 protected:
        ex derivative(const symbol & s) const;
+       ex series(const relational & r, int order, unsigned options = 0) const;
 
        // new virtual functions which can be overridden by derived classes
        // none
@@ -76,13 +77,6 @@ private:
 
 // utility functions
 
-/** Specialization of is_exactly_a<integral>(obj) for integral objects. */
-template<> inline bool is_exactly_a<integral>(const basic & obj)
-{
-       return obj.tinfo()==TINFO_integral;
-}
-
-
 GiNaC::ex adaptivesimpson(
        const GiNaC::ex &x,
        const GiNaC::ex &a,