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

[cln.git] / include / cln / GV.h

diff --git a/include/cln/GV.h b/include/cln/GV.h
index d1f537731e52f45a339745e735c1f7f6f1f8c5eb..338edfa27300bc4900c1e606d0609f0baf111280 100644 (file)
--- a/include/cln/GV.h
+++ b/include/cln/GV.h
@@ -7,6 +7,7 @@
 #include "cln/V.h"
 #include "cln/exception.h"
 #include <cstdlib>
+#include <cstddef>
 
 namespace cln {
 
@@ -25,9 +26,9 @@ template <class T> struct cl_GV_vectorops;
 template <class T>
 class cl_GV_inner {
 protected:
-       uintC len; // number of elements
+       std::size_t len; // number of elements
 public:
-       uintC size() const; // number of elements
+       std::size_t size() const; // number of elements
        cl_GV_vectorops<T>* vectorops; // get/set element
        const cl_GV_index<T> operator[] (unsigned long index);
        const cl_GV_constindex<T> operator[] (unsigned long index) const;
@@ -39,7 +40,7 @@ public:
        const cl_GV_constindex<T> operator[] (int index) const;
 public: /* ugh */
        // Constructor.
-       cl_GV_inner (uintC l, cl_GV_vectorops<T>* ops) : len (l), vectorops (ops) {}
+       cl_GV_inner (std::size_t l, cl_GV_vectorops<T>* ops) : len (l), vectorops (ops) {}
 public:
        // Destructor.
        ~cl_GV_inner ();
@@ -63,10 +64,10 @@ class cl_GV_index {
        // through [].
 public:
        cl_GV_inner<T>* vec;
-       uintC index;
+       std::size_t index;
        operator T () const;
        // Constructor:
-       cl_GV_index (cl_GV_inner<T>* v, uintC i) : vec (v), index (i) {}
+       cl_GV_index (cl_GV_inner<T>* v, std::size_t i) : vec (v), index (i) {}
        // Assignment operator.
        void operator= (const T& x) const;
 #if (defined(__sparc__) || defined(__sparc64__) || defined(__mips__) || defined(__mips64__)) && !defined(__GNUC__) // maybe an SGI CC and Sun CC bug?
@@ -88,10 +89,10 @@ class cl_GV_constindex {
        // through []. It lacks the assignment operator.
 public:
        const cl_GV_inner<T>* vec;
-       uintC index;
+       std::size_t index;
        operator T () const;
        // Constructor:
-       cl_GV_constindex (const cl_GV_inner<T>* v, uintC i) : vec (v), index (i) {}
+       cl_GV_constindex (const cl_GV_inner<T>* v, std::size_t i) : vec (v), index (i) {}
 private:
 // No default constructor, assignment operator.
        cl_GV_constindex ();
@@ -100,16 +101,16 @@ private:
 
 template <class T>
 struct cl_GV_vectorops {
-       const T (*element) (const cl_GV_inner<T>* vec, uintC index);
-       void (*set_element) (cl_GV_inner<T>* vec, uintC index, const T& x);
+       const T (*element) (const cl_GV_inner<T>* vec, std::size_t index);
+       void (*set_element) (cl_GV_inner<T>* vec, std::size_t index, const T& x);
        void (*do_delete) (cl_GV_inner<T>* vec);
-       void (*copy_elements) (const cl_GV_inner<T>* srcvec, uintC srcindex, cl_GV_inner<T>* destvec, uintC destindex, uintC count);
+       void (*copy_elements) (const cl_GV_inner<T>* srcvec, std::size_t srcindex, cl_GV_inner<T>* destvec, std::size_t destindex, std::size_t count);
 };
 
 // All member functions are inline.
 
 template <class T>
-inline uintC cl_GV_inner<T>::size() const
+inline std::size_t cl_GV_inner<T>::size() const
 {
        return len;
 }
@@ -219,7 +220,7 @@ template <class T, class BASE>
 struct cl_GV : public BASE {
 public:
        // Length.
-       uintC size() const
+       std::size_t size() const
        {
                return ((const cl_heap_GV<T> *) this->pointer)->v.size();
        }
@@ -250,7 +251,7 @@ public:
        cl_GV& operator= (const cl_GV&);
        // Copy a piece of a vector into another vector.
        // (Both vectors must be of the same type. Overlapping not allowed.)
-       static void copy_elements (const cl_GV& src, uintC srcindex, cl_GV& dest, uintC destindex, uintC count)
+       static void copy_elements (const cl_GV& src, std::size_t srcindex, cl_GV& dest, std::size_t destindex, std::size_t count)
        {
                const cl_heap_GV<T> * hsrc = (const cl_heap_GV<T> *) src.pointer;
                cl_heap_GV<T> * hdest = (cl_heap_GV<T> *) dest.pointer;