X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=inline;f=ginac%2Frelational.h;h=42247a7350835dbb7640a71ae9cdfcdefca69905;hb=f62443c1f2c678be0b6ff6ce58618f6e3b4cdfa8;hp=6c7ebbae12bfe39ab8235d27a3e6145a9ea9ee42;hpb=2afa71937b3c12cdc70f01213baa8a92be4b604a;p=ginac.git

diff --git a/ginac/relational.h b/ginac/relational.h
index 6c7ebbae..42247a73 100644
--- a/ginac/relational.h
+++ b/ginac/relational.h
@@ -3,7 +3,7 @@
  *  Interface to relations between expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2015 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2017 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,12 +76,12 @@ 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:
-	// For conversions to boolean, as would be used in an if conditional,
+	// For conversions to Boolean, as would be used in an if conditional,
 	// implicit conversions from bool to int have a large number of
 	// undesirable side effects.  The following safe_bool type enables
 	// use of relational objects in conditionals without those side effects