Finalize 1.7.6 release.

[ginac.git] / ginac / relational.cpp

diff --git a/ginac/relational.cpp b/ginac/relational.cpp
index c5b42d3c33c9121b254bec6b920a11d6b8072e65..92b54318392afd8ea89120522a0345ba6dc2f5b5 100644 (file)
--- a/ginac/relational.cpp
+++ b/ginac/relational.cpp
@@ -3,7 +3,7 @@
  *  Implementation of relations between expressions */
 
 /*
- *  GiNaC Copyright (C) 1999-2015 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
@@ -171,22 +171,11 @@ ex relational::map(map_function & f) const
 
        if (!are_ex_trivially_equal(lh, mapped_lh)
         || !are_ex_trivially_equal(rh, mapped_rh))
-               return (new relational(mapped_lh, mapped_rh, o))->setflag(status_flags::dynallocated);
+               return dynallocate<relational>(mapped_lh, mapped_rh, o);
        else
                return *this;
 }
 
-ex relational::eval(int level) const
-{
-       if (level==1)
-               return this->hold();
-       
-       if (level == -max_recursion_level)
-               throw(std::runtime_error("max recursion level reached"));
-       
-       return (new relational(lh.eval(level-1),rh.eval(level-1),o))->setflag(status_flags::dynallocated | status_flags::evaluated);
-}
-
 ex relational::subs(const exmap & m, unsigned options) const
 {
        const ex & subsed_lh = lh.subs(m, options);
@@ -301,17 +290,7 @@ unsigned relational::calchash() const
 // new virtual functions which can be overridden by derived classes
 //////////
 
-/** Left hand side of relational. */
-ex relational::lhs() const
-{
-       return lh;
-}
-
-/** Right hand side of relational. */
-ex relational::rhs() const
-{
-       return rh;    
-}
+// none
 
 //////////
 // non-virtual functions in this class
@@ -319,7 +298,7 @@ ex relational::rhs() const
 
 relational::safe_bool relational::make_safe_bool(bool cond) const
 {
-       return cond? &safe_bool_helper::nonnull : 0;
+       return cond? &safe_bool_helper::nonnull : nullptr;
 }
 
 /** Cast the relational into a Boolean, mainly for evaluation within an