X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=inline;f=ginac%2Fcolor.h;h=8996b4e7b8122384ca27dd6a56bb8eb03d5f57ad;hb=aed514f534cc6b4438822c1fcf80c203a828a94c;hp=460e7a9ddaded2be8117e3a302caeb428ea3a22f;hpb=85f46b3d72dbafb6fe1fbb9bca32ec612cf8b480;p=ginac.git diff --git a/ginac/color.h b/ginac/color.h index 460e7a9d..8996b4e7 100644 --- a/ginac/color.h +++ b/ginac/color.h @@ -3,7 +3,7 @@ * Interface to GiNaC's color (SU(3) Lie algebra) objects. */ /* - * GiNaC Copyright (C) 1999-2015 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2022 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 @@ -48,17 +48,17 @@ public: // internal constructors color(unsigned char rl, const exvector & v); color(unsigned char rl, exvector && v); - void archive(archive_node& n) const; - void read_archive(const archive_node& n, lst& sym_lst); + void archive(archive_node& n) const override; + void read_archive(const archive_node& n, lst& sym_lst) override; // functions overriding virtual functions from base classes protected: - ex eval_ncmul(const exvector & v) const; - bool match_same_type(const basic & other) const; - ex thiscontainer(const exvector & v) const; - ex thiscontainer(exvector && v) const; - unsigned return_type() const { return return_types::noncommutative; } - return_type_t return_type_tinfo() const; + ex eval_ncmul(const exvector & v) const override; + bool match_same_type(const basic & other) const override; + ex thiscontainer(const exvector & v) const override; + ex thiscontainer(exvector && v) const override; + unsigned return_type() const override { return return_types::noncommutative; } + return_type_t return_type_tinfo() const override; // non-virtual functions in this class public: @@ -90,7 +90,7 @@ class su3t : public tensor // functions overriding virtual functions from base classes public: - bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const; + bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const override; // non-virtual functions in this class protected: @@ -107,12 +107,13 @@ class su3f : public tensor // functions overriding virtual functions from base classes public: - ex eval_indexed(const basic & i) const; - bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const; + 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; }; @@ -125,12 +126,13 @@ class su3d : public tensor // functions overriding virtual functions from base classes public: - ex eval_indexed(const basic & i) const; - bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const; + 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; };