X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=inline;f=ginac%2Fpseries.h;h=20005473baada848c5e8306a85bd4bb450bc0639;hb=d1f1d71f9cb477a1931ecf47d9fe78d020bb0dfa;hp=cdae3caa8b5566225d823dff12c580c0c47d7cf6;hpb=9e2d60e206395fc9908e1f9025e50c76b3d7c182;p=ginac.git

diff --git a/ginac/pseries.h b/ginac/pseries.h
index cdae3caa..20005473 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-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -26,9 +26,7 @@
 #include "basic.h"
 #include "expairseq.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 /** This class holds a extended truncated power series (positive and negative
  *  integer powers). It consists of expression coefficients (only non-zero
@@ -38,23 +36,12 @@ class pseries : public basic
 {
 	GINAC_DECLARE_REGISTERED_CLASS(pseries, basic)
 
-	// default constructor, destructor, copy constructor, assignment operator and helpers
-public:
-	pseries();
-	~pseries();
-	pseries(const pseries &other);
-	const pseries &operator=(const pseries &other);
-protected:
-	void copy(const pseries &other);
-	void destroy(bool call_parent);
-
-	// other constructors
+	// other ctors
 public:
 	pseries(const ex &rel_, const epvector &ops_);
 
 	// functions overriding virtual functions from base classes
 public:
-	basic *duplicate() const;
 	void print(std::ostream &os, unsigned upper_precedence = 0) const;
 	void printraw(std::ostream &os) const;
 	void printtree(std::ostream & os, unsigned indent) const;
@@ -95,11 +82,9 @@ protected:
 
 	/** Expansion point */
 	ex point;
-};
 
-// global constants
-extern const pseries some_pseries;
-extern const std::type_info & typeid_pseries;
+	static unsigned precedence;
+};
 
 /** Return a reference to the pseries object embedded in an expression.
  *  The result is undefined if the expression does not contain a pseries
@@ -131,8 +116,6 @@ inline bool is_terminating(const pseries & s)
 	return s.is_terminating();
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_SERIES_H__