Instantiate algorithms with c_ptr

Author: sethrj

include/flc.i

@@ -75,12 +75,14 @@ using std::size_t;
 %apply (SWIGTYPE *DATA, size_t SIZE) {
        (int32_t  *DATA, size_t DATASIZE),
        (int64_t  *DATA, size_t DATASIZE),
-       (double   *DATA, size_t DATASIZE) };
+       (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) };
+       (const double   *DATA, size_t DATASIZE),
+       (const void    **DATA, size_t DATASIZE)};
 
 /* -------------------------------------------------------------------------
  * Version information

include/flc_algorithm.i

@@ -30,18 +30,24 @@ static RETURN_TYPE FUNCNAME##_cmp(ARGS, bool (*cmp)(T, T)) {
 }
 }
 
+// Instantiate numeric overloads
 %flc_template_numeric(FUNCNAME, FUNCNAME)
 %flc_template_numeric(FUNCNAME##_cmp, FUNCNAME)
 
+// Instantiate comparators with void* arguments
+%template(FUNCNAME) FUNCNAME##_cmp<void*>;
+
 %enddef
 
 // >>> Create a native function pointer interface for the given comparator.
 %define %flc_cmp_funptr(CTYPE, FTYPE)
 
+#define SWIG_cmp_funptr SWIG_cmp_funptr_## %mangle(CTYPE)
+
 // Define an abstract interface that gets inserted into the module
 %fragment("SWIG_cmp_funptr_"{CTYPE}, "fdecl", noblock=1)
 { abstract interface
-   function SWIG_cmp_funptr_##CTYPE(left, right) bind(C) &
+   function SWIG_cmp_funptr(left, right) bind(C) &
        result(fresult)
      use, intrinsic :: ISO_C_BINDING
      FTYPE, intent(in), value :: left, right
@@ -50,8 +56,10 @@ static RETURN_TYPE FUNCNAME##_cmp(ARGS, bool (*cmp)(T, T)) {
  end interface}
 
 %apply bool (*)(SWIGTYPE, SWIGTYPE) { bool (*)(CTYPE, CTYPE) };
-%typemap(ftype, in={procedure(SWIG_cmp_funptr_##CTYPE)}, fragment="SWIG_cmp_funptr_"{CTYPE}, noblock=1) bool (*)(CTYPE, CTYPE)
-  {procedure(SWIG_cmp_funptr_##CTYPE), pointer}
+%typemap(ftype, in={procedure(SWIG_cmp_funptr)}, fragment="SWIG_cmp_funptr_"{CTYPE}, noblock=1) bool (*)(CTYPE, CTYPE)
+  {procedure(SWIG_cmp_funptr), pointer}
+
+#undef SWIG_cmp_funptr
 
 %enddef
 
@@ -79,9 +87,11 @@ typedef int index_int;
        (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 double   *DATA2, size_t DATASIZE2),
+       (const void    **DATA2, size_t DATASIZE2)};
 
 
 // Make function pointers available as generic types
@@ -96,6 +106,7 @@ typedef int index_int;
 %flc_cmp_funptr(int64_t,   integer(C_INT64_T))
 %flc_cmp_funptr(double,    real(C_DOUBLE))
 %flc_cmp_funptr(index_int, integer(INDEX_INT))
+%flc_cmp_funptr(void*,     type(C_PTR))
 
 /* -------------------------------------------------------------------------
  * Sorting routines
@@ -232,4 +243,4 @@ static void shuffle(std::SWIG_MERSENNE_TWISTER& g, T *DATA, size_t DATASIZE) {
 }
 
 %flc_template_numeric(shuffle, shuffle)
-
+%template(shuffle) shuffle<void*>;