Fix some pedantic compiler warnings.

[ginac.git] / ginac / clifford.h

diff --git a/ginac/clifford.h b/ginac/clifford.h
index efb9dd6652b49d6a24268faaf3e7ce5bdf6b5a5b..6af79dbc42142ede07120fca1381cefa2db21650 100644 (file)
--- a/ginac/clifford.h
+++ b/ginac/clifford.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's clifford algebra (Dirac gamma) objects. */
 
 /*
- *  GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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,8 +20,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_CLIFFORD_H__
-#define __GINAC_CLIFFORD_H__
+#ifndef GINAC_CLIFFORD_H
+#define GINAC_CLIFFORD_H
 
 #include "indexed.h"
 #include "tensor.h"
@@ -32,7 +32,6 @@
 
 namespace GiNaC {
 
-
 /** This class holds an object representing an element of the Clifford
  *  algebra (the Dirac gamma matrices). These objects only carry Lorentz
  *  indices. Spinor indices are hidden. A representation label (an unsigned
@@ -47,8 +46,8 @@ public:
        clifford(const ex & b, const ex & mu,  const ex & metr, unsigned char rl = 0, int comm_sign = -1);
 
        // internal constructors
-       clifford(unsigned char rl, const ex & metr, int comm_sign, const exvector & v, bool discardable = false);
-       clifford(unsigned char rl, const ex & metr, int comm_sign, std::auto_ptr<exvector> vp);
+       clifford(unsigned char rl, const ex & metr, int comm_sign, const exvector & v);
+       clifford(unsigned char rl, const ex & metr, int comm_sign, exvector && v);
 
        // functions overriding virtual functions from base classes
 public:
@@ -59,7 +58,7 @@ 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;
+       ex thiscontainer(exvector && v) const;
        unsigned return_type() const { return return_types::noncommutative; }
        return_type_t return_type_tinfo() const;
        // non-virtual functions in this class
@@ -114,6 +113,7 @@ protected:
        void do_print(const print_context & c, unsigned level) const;
        void do_print_latex(const print_latex & c, unsigned level) const;
 };
+GINAC_DECLARE_UNARCHIVER(cliffordunit);
 
 
 /** This class represents the Dirac gamma Lorentz vector. */
@@ -302,7 +302,7 @@ ex remove_dirac_ONE(const ex & e, unsigned char rl = 0, unsigned options = 0);
  *
  *  @param e Expression to be processed
  *  @ignore_ONE defines if clifford_ONE should be ignored in the search*/
-char clifford_max_label(const ex & e, bool ignore_ONE = false);
+int clifford_max_label(const ex & e, bool ignore_ONE = false);
 
 /** Calculation of the norm in the Clifford algebra. */
 ex clifford_norm(const ex & e);
@@ -361,4 +361,4 @@ ex clifford_moebius_map(const ex & M, const ex & v, const ex & G, unsigned char
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_CLIFFORD_H__
+#endif // ndef GINAC_CLIFFORD_H