]> www.ginac.de Git - ginac.git/commitdiff
clifford: fix a few GCCisms (or, not).
authorJan Rheinländer <jrheinlaender@gmx.de>
Mon, 20 Sep 2010 11:12:10 +0000 (11:12 +0000)
committerAlexei Sheplyakov <Alexei.Sheplyakov@gmail.com>
Fri, 26 Nov 2010 22:15:55 +0000 (00:15 +0200)
Some compilers (in particular, msvc) choke on `or' and `not'. Use
standard ! and || instead.

ginac/clifford.cpp

index d70f0f508706f3a8600b4abb6bfb6e4782204595..e5ebb4016ebc6958fc4a291eaf861962fcccfa6b 100644 (file)
@@ -1291,11 +1291,11 @@ lst clifford_to_lst(const ex & e, const ex & c, bool algebraic)
        if (algebraic) // check if algebraic method is applicable
                for (unsigned int i = 0; i < D; i++) 
                        if (pow(c.subs(mu == i, subs_options::no_pattern), 2).is_zero() 
-                               or (not is_a<numeric>(pow(c.subs(mu == i, subs_options::no_pattern), 2))))
+                               || (! is_a<numeric>(pow(c.subs(mu == i, subs_options::no_pattern), 2))))
                                algebraic = false;
        lst V; 
        ex v0 = remove_dirac_ONE(canonicalize_clifford(e+clifford_prime(e)).normal())/2;
-       if (not v0.is_zero())
+       if (! v0.is_zero())
                V.append(v0);
        ex e1 = canonicalize_clifford(e - v0 * dirac_ONE(ex_to<clifford>(c).get_representation_label())); 
        if (algebraic) {
@@ -1312,7 +1312,7 @@ lst clifford_to_lst(const ex & e, const ex & c, bool algebraic)
                        e1 = canonicalize_clifford(expand_dummy_sum(e, true));
                        V.remove_all();
                        v0 = remove_dirac_ONE(canonicalize_clifford(e1+clifford_prime(e1)).normal())/2;
-                       if (not v0.is_zero()) {
+                       if (! v0.is_zero()) {
                                V.append(v0);
                                e1 = canonicalize_clifford(e1 - v0 * dirac_ONE(ex_to<clifford>(c).get_representation_label())); 
                        }