[SCM] polybori: Polynomials over Boolean Rings branch, upstream-hg, updated. b4a5cffaa908c53e1d958a42110f8c4dad853aa3
Alexander Dreyer
adreyer at gmx.de
Fri Mar 23 08:01:34 UTC 2012
The following commit has been merged in the upstream-hg branch:
commit 454ab315ce8a05a463a25c68665b15cf0c8357d9
Author: Alexander Dreyer <adreyer at gmx.de>
Date: Tue Feb 28 11:38:09 2012 +0100
FIX: undefined statics avoided
diff --git a/groebner/include/polybori/groebner/Long64From32BitsPair.h b/groebner/include/polybori/groebner/Long64From32BitsPair.h
index 3d916cc..603e0cb 100644
--- a/groebner/include/polybori/groebner/Long64From32BitsPair.h
+++ b/groebner/include/polybori/groebner/Long64From32BitsPair.h
@@ -37,7 +37,9 @@ template <DelayedLongLong::long_type High,
DelayedLongLong::long_type Low>
class Long64From32BitsPairBase<High, Low, 4> {
public:
- static const LongLongConstant<High, Low> value;
+ LongLongConstant<High, Low> operator()() const {
+ return LongLongConstant<High, Low>();
+ }
};
@@ -46,7 +48,7 @@ template <DelayedLongLong::long_type High,
class Long64From32BitsPairBase<High, Low, 8> {
public:
typedef typename DelayedLongLong::long_type long_type;
- static const long_type value = ((High << sizeof(long_type)*4) + Low);
+ long_type operator()() const { return (High << sizeof(long_type)*4) + Low; }
};
/** @class Long64From32BitsPair
diff --git a/groebner/include/polybori/groebner/linear_algebra_step.h b/groebner/include/polybori/groebner/linear_algebra_step.h
index 0607a37..bd72f3c 100644
--- a/groebner/include/polybori/groebner/linear_algebra_step.h
+++ b/groebner/include/polybori/groebner/linear_algebra_step.h
@@ -268,7 +268,7 @@ linalg_step_modified(std::vector < Polynomial > &polys, MonomialSet terms, Monom
/// This checks cols*rows > 20000000000 = 4*2^32 + 2820130816
if (PBORI_UNLIKELY( (DelayedLongProduct(unmodified_cols, unmodified_rows) >
- Long64From32BitsPair<4u, 2820130816u>::value) )){
+ Long64From32BitsPair<4u, 2820130816u>()()) )){
PBoRiError error(CTypes::matrix_size_exceeded);
throw error;
}
--
polybori: Polynomials over Boolean Rings
More information about the debian-science-commits
mailing list