Happy New Year!

[ginac.git] / ginac / operators.cpp

diff --git a/ginac/operators.cpp b/ginac/operators.cpp
index eb8566c3457f055150376e3ff2e6ba806abb6b4b..1f1f1b06aeb618ed3c396defa34a16b93b2dfdd0 100644 (file)
--- a/ginac/operators.cpp
+++ b/ginac/operators.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's overloaded operators. */
 
 /*
  *  Implementation of GiNaC's overloaded operators. */
 
 /*

- *  GiNaC Copyright (C) 1999-2016 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2019 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
  *
  *  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


@@ -247,32 +247,32 @@ const numeric operator--(numeric & lh, int)
 
 const relational operator==(const ex & lh, const ex & rh)
 {
 
 const relational operator==(const ex & lh, const ex & rh)
 {

-       return dynallocate<relational>(lh, rh, relational::equal);
+       return relational(lh, rh, relational::equal);

 }
 
 const relational operator!=(const ex & lh, const ex & rh)
 {
 }
 
 const relational operator!=(const ex & lh, const ex & rh)
 {

-       return dynallocate<relational>(lh, rh, relational::not_equal);
+       return relational(lh, rh, relational::not_equal);

 }
 
 const relational operator<(const ex & lh, const ex & rh)
 {
 }
 
 const relational operator<(const ex & lh, const ex & rh)
 {

-       return dynallocate<relational>(lh, rh, relational::less);
+       return relational(lh, rh, relational::less);

 }
 
 const relational operator<=(const ex & lh, const ex & rh)
 {
 }
 
 const relational operator<=(const ex & lh, const ex & rh)
 {

-       return dynallocate<relational>(lh, rh, relational::less_or_equal);
+       return relational(lh, rh, relational::less_or_equal);

 }
 
 const relational operator>(const ex & lh, const ex & rh)
 {
 }
 
 const relational operator>(const ex & lh, const ex & rh)
 {

-       return dynallocate<relational>(lh, rh, relational::greater);
+       return relational(lh, rh, relational::greater);

 }
 
 const relational operator>=(const ex & lh, const ex & rh)
 {
 }
 
 const relational operator>=(const ex & lh, const ex & rh)
 {

-       return dynallocate<relational>(lh, rh, relational::greater_or_equal);
+       return relational(lh, rh, relational::greater_or_equal);

 }
 
 // input/output stream operators and manipulators
 }
 
 // input/output stream operators and manipulators


@@ -352,8 +352,8 @@ std::ostream & operator<<(std::ostream & os, const ex & e)
 std::ostream & operator<<(std::ostream & os, const exvector & e)
 {
        print_context *p = get_print_context(os);
 std::ostream & operator<<(std::ostream & os, const exvector & e)
 {
        print_context *p = get_print_context(os);

-       exvector::const_iterator i = e.begin();
-       exvector::const_iterator vend = e.end();
+       auto i = e.begin();
+       auto vend = e.end();

 
        if (i==vend) {
                os << "[]";
 
        if (i==vend) {
                os << "[]";


@@ -379,8 +379,8 @@ std::ostream & operator<<(std::ostream & os, const exvector & e)
 std::ostream & operator<<(std::ostream & os, const exset & e)
 {
        print_context *p = get_print_context(os);
 std::ostream & operator<<(std::ostream & os, const exset & e)
 {
        print_context *p = get_print_context(os);

-       exset::const_iterator i = e.begin();
-       exset::const_iterator send = e.end();
+       auto i = e.begin();
+       auto send = e.end();

 
        if (i==send) {
                os << "<>";
 
        if (i==send) {
                os << "<>";


@@ -406,8 +406,8 @@ std::ostream & operator<<(std::ostream & os, const exset & e)
 std::ostream & operator<<(std::ostream & os, const exmap & e)
 {
        print_context *p = get_print_context(os);
 std::ostream & operator<<(std::ostream & os, const exmap & e)
 {
        print_context *p = get_print_context(os);

-       exmap::const_iterator i = e.begin();
-       exmap::const_iterator mend = e.end();
+       auto i = e.begin();
+       auto mend = e.end();

 
        if (i==mend) {
                os << "{}";
 
        if (i==mend) {
                os << "{}";