Fix other generic comparators

Author: sethrj

include/flc.i

@@ -78,11 +78,11 @@ using std::size_t;
        (double   *DATA, size_t DATASIZE),
        (void    **DATA, size_t DATASIZE)};
 
-%apply (const SWIGTYPE *DATA, size_t SIZE) {
-       (const int32_t  *DATA, size_t DATASIZE),
-       (const int64_t  *DATA, size_t DATASIZE),
-       (const double   *DATA, size_t DATASIZE),
-       (void * const   *DATA, size_t DATASIZE)};
+%apply (SWIGTYPE const *DATA, size_t SIZE) {
+       (int32_t  const *DATA, size_t DATASIZE),
+       (int64_t  const *DATA, size_t DATASIZE),
+       (double   const *DATA, size_t DATASIZE),
+       (void*    const *DATA, size_t DATASIZE)};
 
 /* -------------------------------------------------------------------------
  * Version information

include/flc_algorithm.i

@@ -86,14 +86,14 @@ typedef int index_int;
 %apply (SWIGTYPE *DATA, size_t SIZE) { (index_int *IDX, size_t IDXSIZE) };
 
 %apply (const SWIGTYPE *DATA, size_t SIZE) {
-       (const int32_t  *DATA1, size_t DATASIZE1),
-       (const int64_t  *DATA1, size_t DATASIZE1),
-       (const double   *DATA1, size_t DATASIZE1),
-       (const void    **DATA1, size_t DATASIZE1),
-       (const int32_t  *DATA2, size_t DATASIZE2),
-       (const int64_t  *DATA2, size_t DATASIZE2),
-       (const double   *DATA2, size_t DATASIZE2),
-       (const void    **DATA2, size_t DATASIZE2)};
+       (int32_t  const *DATA1, size_t DATASIZE1),
+       (int64_t  const *DATA1, size_t DATASIZE1),
+       (double   const *DATA1, size_t DATASIZE1),
+       (void*    const *DATA1, size_t DATASIZE1),
+       (int32_t  const *DATA2, size_t DATASIZE2),
+       (int64_t  const *DATA2, size_t DATASIZE2),
+       (double   const *DATA2, size_t DATASIZE2),
+       (void*    const *DATA2, size_t DATASIZE2)};
 
 
 // Make function pointers available as generic types

src/flc_algorithm.f90

@@ -61,9 +61,6 @@ function flc_cmp_funptr_void_Sm_(left, right) bind(C) &
   type(C_PTR), public :: cptr = C_NULL_PTR
   integer(C_INT), public :: cmemflags = 0
  end type
- type, public :: SWIGTYPE_p_p_void
-  type(SwigClassWrapper), public :: swigdata
- end type
  interface binary_search
   module procedure swigf_binary_search__SWIG_1, swigf_binary_search__SWIG_2, swigf_binary_search__SWIG_3, &
     swigf_binary_search__SWIG_4, swigf_binary_search__SWIG_5, swigf_binary_search__SWIG_6, swigf_binary_search__SWIG_7
@@ -564,15 +561,13 @@ function swigc_includes__SWIG_6(farg1, farg3, farg5) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_includes__SWIG_7(farg1, farg2, farg3, farg4, farg5) &
+function swigc_includes__SWIG_7(farg1, farg3, farg5) &
 bind(C, name="_wrap_includes__SWIG_7") &
 result(fresult)
 use, intrinsic :: ISO_C_BINDING
-import :: swigclasswrapper
-type(SwigClassWrapper) :: farg1
-integer(C_SIZE_T), intent(in) :: farg2
-type(SwigClassWrapper) :: farg3
-integer(C_SIZE_T), intent(in) :: farg4
+import :: swigarraywrapper
+type(SwigArrayWrapper) :: farg1
+type(SwigArrayWrapper) :: farg3
 type(C_FUNPTR), value :: farg5
 integer(C_INT) :: fresult
 end function
@@ -1464,28 +1459,22 @@ function swigf_includes__SWIG_6(data1, data2, cmp) &
 call SWIGTM_fout_bool(fresult, swig_result)
 end function
 
-function swigf_includes__SWIG_7(data1, datasize1, data2, datasize2, cmp) &
+function swigf_includes__SWIG_7(data1, data2, cmp) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
 logical :: swig_result
-class(SWIGTYPE_p_p_void), intent(in) :: data1
-integer(C_SIZE_T), intent(in) :: datasize1
-class(SWIGTYPE_p_p_void), intent(in) :: data2
-integer(C_SIZE_T), intent(in) :: datasize2
+type(C_PTR), dimension(:), intent(in), target :: data1
+type(C_PTR), dimension(:), intent(in), target :: data2
 procedure(flc_cmp_funptr_void_Sm_) :: cmp
 integer(C_INT) :: fresult 
-type(SwigClassWrapper) :: farg1 
-integer(C_SIZE_T) :: farg2 
-type(SwigClassWrapper) :: farg3 
-integer(C_SIZE_T) :: farg4 
+type(SwigArrayWrapper) :: farg1 
+type(SwigArrayWrapper) :: farg3 
 type(C_FUNPTR) :: farg5 
 
-farg1 = data1%swigdata
-farg2 = datasize1
-farg3 = data2%swigdata
-farg4 = datasize2
+call SWIGTM_fin_void_Sm__Sb__SB_(data1, farg1)
+call SWIGTM_fin_void_Sm__Sb__SB_(data2, farg3)
 farg5 = c_funloc(cmp)
-fresult = swigc_includes__SWIG_7(farg1, farg2, farg3, farg4, farg5)
+fresult = swigc_includes__SWIG_7(farg1, farg3, farg5)
 call SWIGTM_fout_bool(fresult, swig_result)
 end function
 

src/flc_algorithmFORTRAN_wrap.cxx

@@ -449,6 +449,15 @@ static bool includes_cmp(const T *DATA1,size_t DATASIZE1,const T *DATA2,size_t D
 }
 
 
+#include <random>
+
+
+template<class T>
+static void shuffle(std::mt19937_64& g, T *DATA, size_t DATASIZE) {
+    std::shuffle(DATA, DATA + DATASIZE, g);
+}
+
+
 struct SwigClassWrapper {
     void* cptr;
     int cmemflags;
@@ -463,15 +472,6 @@ SWIGINTERN SwigClassWrapper SwigClassWrapper_uninitialized() {
 }
 
 
-#include <random>
-
-
-template<class T>
-static void shuffle(std::mt19937_64& g, T *DATA, size_t DATASIZE) {
-    std::shuffle(DATA, DATA + DATASIZE, g);
-}
-
-
 namespace swig {
 
 template<class T, AssignmentType A>
@@ -1339,7 +1339,7 @@ SWIGEXPORT int _wrap_includes__SWIG_6(SwigArrayWrapper *farg1, SwigArrayWrapper
 }
 
 
-SWIGEXPORT int _wrap_includes__SWIG_7(SwigClassWrapper *farg1, size_t const *farg2, SwigClassWrapper *farg3, size_t const *farg4, bool (*farg5)(void *,void *)) {
+SWIGEXPORT int _wrap_includes__SWIG_7(SwigArrayWrapper *farg1, SwigArrayWrapper *farg3, bool (*farg5)(void *,void *)) {
   int fresult ;
   void **arg1 = (void **) 0 ;
   size_t arg2 ;
@@ -1348,10 +1348,10 @@ SWIGEXPORT int _wrap_includes__SWIG_7(SwigClassWrapper *farg1, size_t const *far
   bool (*arg5)(void *,void *) = (bool (*)(void *,void *)) 0 ;
   bool result;
 
-  arg1 = (void **)farg1->cptr;
-  arg2 = (size_t)(*farg2);
-  arg3 = (void **)farg3->cptr;
-  arg4 = (size_t)(*farg4);
+  arg1 = (void **)farg1->data;
+  arg2 = farg1->size;
+  arg3 = (void **)farg3->data;
+  arg4 = farg3->size;
   arg5 = (bool (*)(void *,void *))(*farg5);
   result = (bool)includes_cmp< void * >((void *const *)arg1,arg2,(void *const *)arg3,arg4,arg5);
   fresult = (result ? 1 : 0);