Replace unused macro with cl_unused.

[cln.git] / src / integer / ring / cl_I_ring.cc

diff --git a/src/integer/ring/cl_I_ring.cc b/src/integer/ring/cl_I_ring.cc
index 416738a3e97c8dd2c0a8f58dde350f0d19f6d6c9..bdbedf71bcd8e3555dc1bc4fb88054fa4b2be5ba 100644 (file)
--- a/src/integer/ring/cl_I_ring.cc
+++ b/src/integer/ring/cl_I_ring.cc
@@ -1,9 +1,7 @@
 // Ring of integers.
 
 // General includes.
-#include "cl_sysdep.h"
-
-CL_PROVIDE(cl_I_ring)
+#include "base/cl_sysdep.h"
 
 // Specification.
 #include "cln/integer_ring.h"
@@ -13,19 +11,21 @@ CL_PROVIDE(cl_I_ring)
 
 #include "cln/integer.h"
 #include "cln/integer_io.h"
-#include "cl_I.h"
+#define zerop zerop_inline
+#include "integer/cl_I.h"
+#undef zerop
 
 namespace cln {
 
 static void I_fprint (cl_heap_ring* R, std::ostream& stream, const _cl_ring_element& x)
 {
-       unused R;
+       cl_unused R;
        fprint(stream,The(cl_I)(x));
 }
 
 static bool I_equal (cl_heap_ring* R, const _cl_ring_element& x, const _cl_ring_element& y)
 {
-       unused R;
+       cl_unused R;
        return equal(The(cl_I)(x),The(cl_I)(y));
 }
 
@@ -34,10 +34,10 @@ static const _cl_ring_element I_zero (cl_heap_ring* R)
        return _cl_ring_element(R, (cl_I)0);
 }
 
-static bool I_zerop (cl_heap_ring* R, const _cl_ring_element& x)
+static bool CL_FLATTEN I_zerop (cl_heap_ring* R, const _cl_ring_element& x)
 {
-       unused R;
-       return zerop(The(cl_I)(x));
+       cl_unused R;
+       return zerop_inline(The(cl_I)(x));
 }
 
 static const _cl_ring_element I_plus (cl_heap_ring* R, const _cl_ring_element& x, const _cl_ring_element& y)
@@ -137,23 +137,39 @@ static void cl_integer_ring_destructor (cl_heap* pointer)
 
 static void cl_integer_ring_dprint (cl_heap* pointer)
 {
-       unused pointer;
+       cl_unused pointer;
        fprint(cl_debugout, "(cl_integer_ring) cl_I_ring");
 }
 
-cl_class cl_class_integer_ring = {
-       cl_integer_ring_destructor,
-       cl_class_flags_number_ring,
-       cl_integer_ring_dprint
-};
+cl_class cl_class_integer_ring;
+static cl_heap_integer_ring* cl_heap_integer_ring_instance;
 
 // Constructor.
 template <>
 inline cl_integer_ring::cl_specialized_number_ring ()
-       : cl_number_ring (new cl_heap_integer_ring()) {}
+       : cl_number_ring(cl_heap_integer_ring_instance) {}
+
+const cl_integer_ring cl_I_ring = cl_I_ring;
 
-const cl_integer_ring cl_I_ring;
+int cl_I_ring_init_helper::count = 0;
+
+cl_I_ring_init_helper::cl_I_ring_init_helper()
+{
+       if (count++ == 0) {
+               cl_class_integer_ring.destruct = cl_integer_ring_destructor;
+               cl_class_integer_ring.flags = cl_class_flags_number_ring;
+               cl_class_integer_ring.dprint = cl_integer_ring_dprint;
+               cl_heap_integer_ring_instance = new cl_heap_integer_ring();
+               new ((void *)&cl_I_ring) cl_integer_ring();
+       }
+}
+
+cl_I_ring_init_helper::~cl_I_ring_init_helper()
+{
+       if (--count == 0) {
+               delete cl_heap_integer_ring_instance;
+       }
+}
 
 }  // namespace cln
 
-CL_PROVIDE_END(cl_I_ring)