Use initializer lists to construct container<>, lst.

[ginac.git] / ginac / expairseq.h

diff --git a/ginac/expairseq.h b/ginac/expairseq.h
index 32203183de73bcd6103e7aba9ca3793a97363630..d33ff332ef59f2a9bed880a90fa3d15b84454b1a 100644 (file)
--- a/ginac/expairseq.h
+++ b/ginac/expairseq.h
@@ -26,18 +26,12 @@
 #include "expair.h"
 #include "indexed.h"
 
-// CINT needs <algorithm> to work properly with <vector> and <list>
-#include <algorithm>
-#include <list>
-#include <memory>
 #include <vector>
 
 namespace GiNaC {
 
 typedef std::vector<expair> epvector;       ///< expair-vector
 typedef epvector::iterator epp;             ///< expair-vector pointer
-typedef std::list<epp> epplist;             ///< list of expair-vector pointers
-typedef std::vector<epplist> epplistvector; ///< vector of epplist
 
 /** Complex conjugate every element of an epvector. Returns zero if this
  *  does not change anything. */
@@ -65,25 +59,25 @@ public:
        
        // functions overriding virtual functions from base classes
 public:
-       unsigned precedence() const {return 10;}
-       bool info(unsigned inf) const;
-       size_t nops() const;
-       ex op(size_t i) const;
-       ex map(map_function & f) const;
-       ex eval(int level=0) const;
-       ex to_rational(exmap & repl) const;
-       ex to_polynomial(exmap & repl) const;
-       bool match(const ex & pattern, exmap& repl_lst) const;
-       ex subs(const exmap & m, unsigned options = 0) const;
-       ex conjugate() const;
+       unsigned precedence() const override {return 10;}
+       bool info(unsigned inf) const override;
+       size_t nops() const override;
+       ex op(size_t i) const override;
+       ex map(map_function & f) const override;
+       ex eval(int level=0) const override;
+       ex to_rational(exmap & repl) const override;
+       ex to_polynomial(exmap & repl) const override;
+       bool match(const ex & pattern, exmap& repl_lst) const override;
+       ex subs(const exmap & m, unsigned options = 0) const override;
+       ex conjugate() const override;
 
-       void archive(archive_node& n) const;
-       void read_archive(const archive_node& n, lst& syms);
+       void archive(archive_node& n) const override;
+       void read_archive(const archive_node& n, lst& syms) override;
 protected:
-       bool is_equal_same_type(const basic & other) const;
-       unsigned return_type() const;
-       unsigned calchash() const;
-       ex expand(unsigned options=0) const;
+       bool is_equal_same_type(const basic & other) const override;
+       unsigned return_type() const override;
+       unsigned calchash() const override;
+       ex expand(unsigned options=0) const override;
        
        // new virtual functions which can be overridden by derived classes
 protected: