cl_{GV,SV}: use std::size_t for size of vectors (instead of obscure uintC).

[cln.git] / src / vector / cl_SV_ringelt.cc

diff --git a/src/vector/cl_SV_ringelt.cc b/src/vector/cl_SV_ringelt.cc
index 48587aec01528a91b7393c57904ab3af765eef23..d2bbedca48dde6dfdf934e80ea0a077cbc02e167 100644 (file)
--- a/src/vector/cl_SV_ringelt.cc
+++ b/src/vector/cl_SV_ringelt.cc
@@ -1,9 +1,7 @@
 // cl_make_heap_SV_ringelt().
 
 // General includes.
-#include "cl_sysdep.h"
-
-CL_PROVIDE(cl_SV_ringelt)
+#include "base/cl_sysdep.h"
 
 // Specification.
 #include "cln/SV_ringelt.h"
@@ -11,8 +9,6 @@ CL_PROVIDE(cl_SV_ringelt)
 
 // Implementation.
 
-#include "cln/abort.h"
-
 namespace cln {
 
 static void cl_svector_ringelt_destructor (cl_heap* pointer)
@@ -24,35 +20,55 @@ static void cl_svector_ringelt_destructor (cl_heap* pointer)
 #endif
 }
 
-cl_class cl_class_svector_ringelt = {
-       cl_svector_ringelt_destructor,
-       0
-};
+// XXX: this ought to be static const, but it would be impossible to
+// set the printing function (see cl_SV_ringelt_debug.cc)
+cl_class& cl_class_svector_ringelt()
+{
+       static cl_class instance = {
+               cl_svector_ringelt_destructor,
+               0
+       };
+       return instance;
+}
 
-cl_heap_SV_ringelt* cl_make_heap_SV_ringelt_uninit (uintC len)
+cl_heap_SV_ringelt* cl_make_heap_SV_ringelt_uninit (std::size_t len)
 {
-       var cl_heap_SV_ringelt* hv = (cl_heap_SV_ringelt*) malloc_hook(sizeof(cl_heap_SV_ringelt)+sizeof(_cl_ring_element)*len);
+       cl_heap_SV_ringelt* hv = (cl_heap_SV_ringelt*) malloc_hook(sizeof(cl_heap_SV_ringelt)+sizeof(_cl_ring_element)*len);
        hv->refcount = 1;
-       hv->type = &cl_class_svector_ringelt;
+       hv->type = &cl_class_svector_ringelt();
        new (&hv->v) cl_SV_inner<_cl_ring_element> (len);
        // Have to fill hv->v[i] (0 <= i < len) yourself.
        return hv;
 }
 
-cl_heap_SV_ringelt* cl_make_heap_SV_ringelt (uintC len)
+cl_heap_SV_ringelt* cl_make_heap_SV_ringelt (std::size_t len)
 {
-       var cl_heap_SV_ringelt* hv = (cl_heap_SV_ringelt*) malloc_hook(sizeof(cl_heap_SV_ringelt)+sizeof(_cl_ring_element)*len);
+       cl_heap_SV_ringelt* hv = (cl_heap_SV_ringelt*) malloc_hook(sizeof(cl_heap_SV_ringelt)+sizeof(_cl_ring_element)*len);
        hv->refcount = 1;
-       hv->type = &cl_class_svector_ringelt;
+       hv->type = &cl_class_svector_ringelt();
        new (&hv->v) cl_SV_inner<_cl_ring_element> (len);
-       for (var uintC i = 0; i < len; i++)
+       for (std::size_t i = 0; i < len; i++)
                init1(_cl_ring_element, hv->v[i]) ();
        return hv;
 }
 
 // An empty vector.
-const cl_SV_ringelt cl_null_SV_ringelt = cl_SV_ringelt((uintC)0);
+const cl_SV_ringelt cl_null_SV_ringelt = cl_null_SV_ringelt;
+
+int cl_SV_ringelt_init_helper::count = 0;
+
+cl_SV_ringelt_init_helper::cl_SV_ringelt_init_helper()
+{
+       if (count++ == 0)
+               new ((void *)&cl_null_SV_ringelt) cl_SV_ringelt((std::size_t)0);
+}
+
+cl_SV_ringelt_init_helper::~cl_SV_ringelt_init_helper()
+{
+       if (--count == 0) {
+               // Nothing to clean up here
+       }
+}
 
 }  // namespace cln
 
-CL_PROVIDE_END(cl_SV_ringelt)