fix potential threading problem with initialization of static objects

1 files changed, 2 insertions, 4 deletions

diff --git a/polynomi.cpp b/polynomi.cpp
index c049570b..be39bce4 100644
--- a/polynomi.cpp
+++ b/polynomi.cpp
@@ -565,15 +565,13 @@ Element BulkPolynomialInterpolateAt(const Ring &ring, const Element y[], const E
 template <class T, int instance>
 const PolynomialOverFixedRing<T, instance> &PolynomialOverFixedRing<T, instance>::Zero()
 {
-	static const PolynomialOverFixedRing<T, instance> zero;
-	return zero;
+	return Singleton<ThisType>().Ref();
 }
 
 template <class T, int instance>
 const PolynomialOverFixedRing<T, instance> &PolynomialOverFixedRing<T, instance>::One()
 {
-	static const PolynomialOverFixedRing<T, instance> one = fixedRing.MultiplicativeIdentity();
-	return one;
+	return Singleton<ThisType, NewOnePolynomial>().Ref();
 }
 
 NAMESPACE_END