[SCM] an open source computer algebra system branch, master-3-1-5, updated. dcebb184fbf374a8905edd0b02d7795bc29620e9

[Felix Salfelder]

The following commit has been merged in the master-3-1-5 branch:
commit f904878e4a22df56f70d62070b3478717e644c3c
Author: Felix Salfelder <felix at salfelder.org>
Date:   Sun Jul 14 08:55:12 2013 +0200

    fix NTL::negate namespace issue

diff --git a/factory/cf_chinese.cc b/factory/cf_chinese.cc
index 2761c95..6ee8215 100644
--- a/factory/cf_chinese.cc
+++ b/factory/cf_chinese.cc
@@ -211,12 +211,12 @@ CanonicalForm Farey ( const CanonicalForm & f, const CanonicalForm & q )
             ZZ NTLc= convertFacCF2NTLZZ (c);
             bool lessZero= (sign (NTLc) == -1);
             if (lessZero)
-              negate (NTLc, NTLc);
+              NTL::negate (NTLc, NTLc);
             ZZ NTLnum, NTLden;
             if (ReconstructRational (NTLnum, NTLden, NTLc, NTLq, bound, bound))
             {
               if (lessZero)
-                negate (NTLnum, NTLnum);
+                NTL::negate (NTLnum, NTLnum);
               CanonicalForm num= convertNTLZZX2CF (to_ZZX (NTLnum), Variable (1));
               CanonicalForm den= convertNTLZZX2CF (to_ZZX (NTLden), Variable (1));
               On (SW_RATIONAL);

-- 
an open source computer algebra system