X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fexpairseq.h;h=4e3a0e4b8c93c09e8a5718e3cf406991ae10a4d7;hp=41b077d5097f11d968aaec72cc83974631ecec50;hb=1c65b3c7d04ab7123bbc7fc9e420c8bd484927a1;hpb=6c946d4c762f5a0d6a3b742f03556dd018d63886 diff --git a/ginac/expairseq.h b/ginac/expairseq.h index 41b077d5..4e3a0e4b 100644 --- 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 @@ -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); @@ -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(new_dummy_indices), ex_is_less()); + dummies_of_factor.begin(), dummies_of_factor.end(), + std::back_insert_iterator(new_dummy_indices), ex_is_less()); used_indices.swap(new_dummy_indices); } bool do_renaming;