X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Frelational.h;h=ac6caecfd801425de214b380f8a7df0c8fff2a9c;hp=e087c17ff54c4cb026abaf104629ccdba0a1d142;hb=8cffcdf13d817a47f217f1a1043317d95969e070;hpb=0052e44b34c982b13b08454fd6c9429fe7a90f71 diff --git a/ginac/relational.h b/ginac/relational.h index e087c17f..ac6caecf 100644 --- a/ginac/relational.h +++ b/ginac/relational.h @@ -3,7 +3,7 @@ * Interface to relations between expressions. */ /* - * 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 @@ -52,24 +52,23 @@ public: // functions overriding virtual functions from base classes public: - unsigned precedence() const {return 20;} - bool info(unsigned inf) const; - size_t nops() const; - ex op(size_t i) const; - ex map(map_function & f) const; - ex subs(const exmap & m, unsigned options = 0) const; - ex eval(int level=0) const; + unsigned precedence() const override {return 20;} + 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 subs(const exmap & m, unsigned options = 0) const override; /** Save (a.k.a. serialize) object into archive. */ - void archive(archive_node& n) const; + void archive(archive_node& n) const override; /** Read (a.k.a. deserialize) object from archive. */ - void read_archive(const archive_node& n, lst& syms); + void read_archive(const archive_node& n, lst& syms) override; protected: - ex eval_ncmul(const exvector & v) const; - bool match_same_type(const basic & other) const; - unsigned return_type() const; - return_type_t return_type_tinfo() const; - unsigned calchash() const; + ex eval_ncmul(const exvector & v) const override; + bool match_same_type(const basic & other) const override; + unsigned return_type() const override; + return_type_t return_type_tinfo() const override; + unsigned calchash() const override; // new virtual functions which can be overridden by derived classes protected: @@ -77,8 +76,8 @@ protected: void do_print_python_repr(const print_python_repr & c, unsigned level) const; public: - virtual ex lhs() const; - virtual ex rhs() const; + ex lhs() const { return lh; } + ex rhs() const { return rh; } // non-virtual functions in this class private: