Replace unused macro with cl_unused.

[cln.git] / src / modinteger / cl_MI_fix32.h

diff --git a/src/modinteger/cl_MI_fix32.h b/src/modinteger/cl_MI_fix32.h
index f3b49d41087ed36d2e3b5ead0dc26e80e9b93b93..3dbe270cb3ddb98a2f91025e5244965088d202ae 100644 (file)
--- a/src/modinteger/cl_MI_fix32.h
+++ b/src/modinteger/cl_MI_fix32.h
@@ -5,49 +5,49 @@ namespace cln {
 
 static const _cl_MI fix32_plus (cl_heap_modint_ring* R, const _cl_MI& x, const _cl_MI& y)
 {
-       var uint32 xr = FN_to_UL(x.rep);
-       var uint32 yr = FN_to_UL(y.rep);
+       var uint32 xr = FN_to_UV(x.rep);
+       var uint32 yr = FN_to_UV(y.rep);
        var uint32 zr = xr + yr;
-       var uint32 m = FN_to_UL(R->modulus);
+       var uint32 m = FN_to_UV(R->modulus);
        if ((zr < xr) || (zr >= m)) { zr = zr - m; }
        return _cl_MI(R, L_to_FN(zr));
 }
 
 static const _cl_MI fix32_minus (cl_heap_modint_ring* R, const _cl_MI& x, const _cl_MI& y)
 {
-       var uint32 xr = FN_to_UL(x.rep);
-       var uint32 yr = FN_to_UL(y.rep);
-       var sint32 zr = (xr >= yr ? xr - yr : xr - yr + FN_to_UL(R->modulus));
+       var uint32 xr = FN_to_UV(x.rep);
+       var uint32 yr = FN_to_UV(y.rep);
+       var sint32 zr = (xr >= yr ? xr - yr : xr - yr + FN_to_UV(R->modulus));
        return _cl_MI(R, L_to_FN(zr));
 }
 
 static const _cl_MI fix32_uminus (cl_heap_modint_ring* R, const _cl_MI& x)
 {
-       var uint32 xr = FN_to_UL(x.rep);
-       var uint32 zr = (xr==0 ? 0 : FN_to_UL(R->modulus)-xr);
+       var uint32 xr = FN_to_UV(x.rep);
+       var uint32 zr = (xr==0 ? 0 : FN_to_UV(R->modulus)-xr);
        return _cl_MI(R, L_to_FN(zr));
 }
 
 static const _cl_MI fix32_mul (cl_heap_modint_ring* R, const _cl_MI& x, const _cl_MI& y)
 {
-       var uint32 xr = FN_to_UL(x.rep);
-       var uint32 yr = FN_to_UL(y.rep);
+       var uint32 xr = FN_to_UV(x.rep);
+       var uint32 yr = FN_to_UV(y.rep);
        var uint32 zrhi;
        var uint32 zrlo;
        mulu32(xr,yr,zrhi=,zrlo=);
        var uint32 zr;
-       divu_6432_3232(zrhi,zrlo,FN_to_UL(R->modulus),,zr=);
+       divu_6432_3232(zrhi,zrlo,FN_to_UV(R->modulus),,zr=);
        return _cl_MI(R, L_to_FN(zr));
 }
 
 static const _cl_MI fix32_square (cl_heap_modint_ring* R, const _cl_MI& x)
 {
-       var uint32 xr = FN_to_UL(x.rep);
+       var uint32 xr = FN_to_UV(x.rep);
        var uint32 zrhi;
        var uint32 zrlo;
        mulu32(xr,xr,zrhi=,zrlo=);
        var uint32 zr;
-       divu_6432_3232(zrhi,zrlo,FN_to_UL(R->modulus),,zr=);
+       divu_6432_3232(zrhi,zrlo,FN_to_UV(R->modulus),,zr=);
        return _cl_MI(R, L_to_FN(zr));
 }
 
@@ -75,10 +75,26 @@ class cl_heap_modint_ring_fix32 : public cl_heap_modint_ring {
        SUBCLASS_cl_heap_modint_ring()
 public:
        // Constructor.
-       cl_heap_modint_ring_fix32 (const cl_I& m)
-               : cl_heap_modint_ring (m, &std_setops, &fix32_addops, &fix32_mulops) {}
-       // Virtual destructor.
+       cl_heap_modint_ring_fix32 (const cl_I& m);
+       // Destructor.
        ~cl_heap_modint_ring_fix32 () {}
 };
 
+static void cl_modint_ring_fix32_destructor (cl_heap* pointer)
+{
+       (*(cl_heap_modint_ring_fix32*)pointer).~cl_heap_modint_ring_fix32();
+}
+
+cl_class cl_class_modint_ring_fix32 = {
+       cl_modint_ring_fix32_destructor,
+       cl_class_flags_modint_ring
+};
+
+// Constructor.
+inline cl_heap_modint_ring_fix32::cl_heap_modint_ring_fix32(const cl_I& m)
+       : cl_heap_modint_ring (m, &std_setops, &fix32_addops, &fix32_mulops)
+{
+       type = &cl_class_modint_ring_fix32;
+}
+
 }  // namespace cln