Remove 'level' argument of normal().

[ginac.git] / ginac / expairseq.h

diff --git a/ginac/expairseq.h b/ginac/expairseq.h
index d33ff332ef59f2a9bed880a90fa3d15b84454b1a..4e3a0e4b8c93c09e8a5718e3cf406991ae10a4d7 100644 (file)
--- a/ginac/expairseq.h
+++ b/ginac/expairseq.h
@@ -3,7 +3,7 @@
  *  Interface to sequences of expression pairs. */
 
 /*
- *  GiNaC Copyright (C) 1999-2015 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
@@ -64,7 +64,7 @@ public:
        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 eval() 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;
@@ -104,7 +104,6 @@ protected:
 protected:
        void do_print(const print_context & c, unsigned level) const;
        void do_print_tree(const print_tree & c, unsigned level) const;
-       void construct_from_2_ex_via_exvector(const ex & lh, const ex & rh);
        void construct_from_2_ex(const ex & lh, const ex & rh);
        void construct_from_2_expairseq(const expairseq & s1,
                                        const expairseq & s2);
@@ -119,7 +118,7 @@ protected:
        void combine_same_terms_sorted_seq();
        bool is_canonical() const;
        epvector expandchildren(unsigned options) const;
-       epvector evalchildren(int level) const;
+       epvector evalchildren() const;
        epvector subschildren(const exmap & m, unsigned options = 0) const;
        
 // member variables
@@ -166,7 +165,7 @@ class make_flat_inserter
                                return x;
                        sort(dummies_of_factor.begin(), dummies_of_factor.end(), ex_is_less());
                        ex new_factor = rename_dummy_indices_uniquely(used_indices,
-                               dummies_of_factor, x);
+                                                                     dummies_of_factor, x);
                        combine_indices(dummies_of_factor);
                        return new_factor;
                }
@@ -175,8 +174,8 @@ class make_flat_inserter
                {
                        exvector new_dummy_indices;
                        set_union(used_indices.begin(), used_indices.end(),
-                               dummies_of_factor.begin(), dummies_of_factor.end(),
-                               std::back_insert_iterator<exvector>(new_dummy_indices), ex_is_less());
+                                 dummies_of_factor.begin(), dummies_of_factor.end(),
+                                 std::back_insert_iterator<exvector>(new_dummy_indices), ex_is_less());
                        used_indices.swap(new_dummy_indices);
                }
                bool do_renaming;