X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fpseries.h;h=e0c9443a0468a38439d9e9d49282c690c71a4d92;hp=ddbdcfa772ac91c5924ce61c21069dc081bd2ea8;hb=c12c8ec3c5cf0c75f061f6c52d04206277bbdcca;hpb=95ede03f00106be5fb087d76c86ca5c27edb9122

diff --git a/ginac/pseries.h b/ginac/pseries.h
index ddbdcfa7..e0c9443a 100644
--- a/ginac/pseries.h
+++ b/ginac/pseries.h
@@ -3,7 +3,7 @@
  *  Interface to class for extended truncated power series. */
 
 /*
- *  GiNaC Copyright (C) 1999-2010 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2016 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
@@ -39,33 +39,34 @@ class pseries : public basic
 	// other constructors
 public:
 	pseries(const ex &rel_, const epvector &ops_);
+	pseries(const ex &rel_, epvector &&ops_);
 
 	// functions overriding virtual functions from base classes
 public:
-	unsigned precedence() const {return 38;} // for clarity just below add::precedence
-	size_t nops() const;
-	ex op(size_t i) const;
-	int degree(const ex &s) const;
-	int ldegree(const ex &s) const;
-	ex coeff(const ex &s, int n = 1) const;
-	ex collect(const ex &s, bool distributed = false) const;
-	ex eval(int level=0) const;
-	ex evalf(int level=0) const;
-	ex series(const relational & r, int order, unsigned options = 0) const;
-	ex subs(const exmap & m, unsigned options = 0) const;
-	ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const;
-	ex expand(unsigned options = 0) const;
-	ex conjugate() const;
-	ex real_part() const;
-	ex imag_part() const;
-	ex eval_integ() const;
-	ex evalm() const;
+	unsigned precedence() const override {return 38;} // for clarity just below add::precedence
+	size_t nops() const override;
+	ex op(size_t i) const override;
+	int degree(const ex &s) const override;
+	int ldegree(const ex &s) const override;
+	ex coeff(const ex &s, int n = 1) const override;
+	ex collect(const ex &s, bool distributed = false) const override;
+	ex eval() const override;
+	ex evalf() const override;
+	ex series(const relational & r, int order, unsigned options = 0) const override;
+	ex subs(const exmap & m, unsigned options = 0) const override;
+	ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const override;
+	ex expand(unsigned options = 0) const override;
+	ex conjugate() const override;
+	ex real_part() const override;
+	ex imag_part() const override;
+	ex eval_integ() const override;
+	ex evalm() const override;
 	/** Save (a.k.a. serialize) object into archive. */
-	void archive(archive_node& n) const;
+	void archive(archive_node& n) const override;
 	/** Read (a.k.a. deserialize) object from archive. */
-	void read_archive(const archive_node& n, lst& syms);
+	void read_archive(const archive_node& n, lst& syms) override;
 protected:
-	ex derivative(const symbol & s) const;
+	ex derivative(const symbol & s) const override;
 
 	// non-virtual functions in this class
 public: