X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Ftensor.h;h=a4b14578e8203bada3cb9771b642ea43b805a9e4;hb=refs%2Ftags%2Frelease_1-7-6;hp=33859b1122754508fcd86716aae63211919ff16b;hpb=d327f3f00c66a79d42855939866047b3e8caa630;p=ginac.git

diff --git a/ginac/tensor.h b/ginac/tensor.h
index 33859b11..a4b14578 100644
--- a/ginac/tensor.h
+++ b/ginac/tensor.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's special tensors. */
 
 /*
- *  GiNaC Copyright (C) 1999-2008 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
@@ -20,15 +20,14 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_TENSOR_H__
-#define __GINAC_TENSOR_H__
+#ifndef GINAC_TENSOR_H
+#define GINAC_TENSOR_H
 
 #include "ex.h"
 #include "archive.h"
 
 namespace GiNaC {
 
-
 /** This class holds one of GiNaC's predefined special tensors such as the
  *  delta and the metric tensors. They are represented without indices.
  *  To attach indices to them, wrap them in an object of class indexed. */
@@ -38,7 +37,7 @@ class tensor : public basic
 
 	// functions overriding virtual functions from base classes
 protected:
-	unsigned return_type() const { return return_types::noncommutative_composite; }
+	unsigned return_type() const override { return return_types::noncommutative_composite; }
 
 	// non-virtual functions in this class
 public:
@@ -57,13 +56,14 @@ class tensdelta : public tensor
 
 	// functions overriding virtual functions from base classes
 public:
-	bool info(unsigned inf) const;
-	ex eval_indexed(const basic & i) const;
-	bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const;
+	bool info(unsigned inf) const override;
+	ex eval_indexed(const basic & i) const override;
+	bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const override;
+protected:
+	unsigned return_type() const override { return return_types::commutative; }
 
 	// non-virtual functions in this class
 protected:
-	unsigned return_type() const { return return_types::commutative; }
 	void do_print(const print_context & c, unsigned level) const;
 	void do_print_latex(const print_latex & c, unsigned level) const;
 };
@@ -79,13 +79,14 @@ class tensmetric : public tensor
 
 	// functions overriding virtual functions from base classes
 public:
-	bool info(unsigned inf) const;
-	ex eval_indexed(const basic & i) const;
-	bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const;
+	bool info(unsigned inf) const override;
+	ex eval_indexed(const basic & i) const override;
+	bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const override;
+protected:
+	unsigned return_type() const override { return return_types::commutative; }
 
 	// non-virtual functions in this class
 protected:
-	unsigned return_type() const { return return_types::commutative; }
 	void do_print(const print_context & c, unsigned level) const;
 };
 GINAC_DECLARE_UNARCHIVER(tensmetric);
@@ -105,16 +106,18 @@ public:
 
 	// functions overriding virtual functions from base classes
 public:
-	bool info(unsigned inf) const;
-	ex eval_indexed(const basic & i) const;
+	bool info(unsigned inf) const override;
+	ex eval_indexed(const basic & i) 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:
+	unsigned return_type() const override { return return_types::commutative; }
+
 	// non-virtual functions in this class
 protected:
-	unsigned return_type() const { return return_types::commutative; }
 	void do_print(const print_context & c, unsigned level) const;
 	void do_print_latex(const print_latex & c, unsigned level) const;
 
@@ -135,9 +138,9 @@ class spinmetric : public tensmetric
 
 	// functions overriding virtual functions from base classes
 public:
-	bool info(unsigned inf) const;
-	ex eval_indexed(const basic & i) const;
-	bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const;
+	bool info(unsigned inf) const override;
+	ex eval_indexed(const basic & i) const override;
+	bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const override;
 
 protected:
 	void do_print(const print_context & c, unsigned level) const;
@@ -159,17 +162,19 @@ public:
 
 	// functions overriding virtual functions from base classes
 public:
-	bool info(unsigned inf) const;
-	ex eval_indexed(const basic & i) const;
-	bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const;
+	bool info(unsigned inf) const override;
+	ex eval_indexed(const basic & i) const override;
+	bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) 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:
+	unsigned return_type() const override { return return_types::commutative; }
+
 	// non-virtual functions in this class
 protected:
-	unsigned return_type() const { return return_types::commutative; }
 	void do_print(const print_context & c, unsigned level) const;
 	void do_print_latex(const print_latex & c, unsigned level) const;
 
@@ -252,4 +257,4 @@ ex lorentz_eps(const ex & i1, const ex & i2, const ex & i3, const ex & i4, bool
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_TENSOR_H__
+#endif // ndef GINAC_TENSOR_H