Happy New Year!

[ginac.git] / ginac / color.h

diff --git a/ginac/color.h b/ginac/color.h
index 26eed02cfdd1f861813339fd3b1c291a69cd489c..4dbfc3d40baa9c698ea370e73e6814c517758303 100644 (file)
--- 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-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
@@ -46,19 +46,19 @@ public:
        color(const ex & b, const ex & i1, unsigned char rl = 0);
 
        // internal constructors
-       color(unsigned char rl, const exvector & v, bool discardable = false);
-       color(unsigned char rl, std::auto_ptr<exvector> vp);
-       void archive(archive_node& n) const;
-       void read_archive(const archive_node& n, lst& sym_lst);
+       color(unsigned char rl, const exvector & v);
+       color(unsigned char rl, exvector && v);
+       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(std::auto_ptr<exvector> vp) 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;
 };