Skip to content

Commit 3270666

Browse files
sethrjsethrj
committed
Tweak internal function name
1 parent d74e0d8 commit 3270666

File tree

2 files changed

+38
-37
lines changed

2 files changed

+38
-37
lines changed

‎include/flc_algorithm.i

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ static RETURN_TYPE FUNCNAME##_cmp(ARGS, bool (*cmp)(T, T)) {
4242
// >>> Create a native function pointer interface for the given comparator.
4343
%define %flc_cmp_funptr(CTYPE, FTYPE)
4444

45-
#define SWIG_cmp_funptr SWIG_cmp_funptr_## %mangle(CTYPE)
45+
#define flc_cmp_funptr flc_cmp_funptr_ ## %mangle(CTYPE)
4646

4747
// Define an abstract interface that gets inserted into the module
48-
%fragment("SWIG_cmp_funptr_"{CTYPE}, "fdecl", noblock=1)
48+
%fragment("flc_cmp_funptr"{CTYPE}, "fdecl", noblock=1)
4949
{ abstract interface
50-
function SWIG_cmp_funptr(left, right) bind(C) &
50+
function flc_cmp_funptr(left, right) bind(C) &
5151
result(fresult)
5252
use, intrinsic :: ISO_C_BINDING
5353
FTYPE, intent(in), value :: left, right
@@ -56,8 +56,9 @@ static RETURN_TYPE FUNCNAME##_cmp(ARGS, bool (*cmp)(T, T)) {
5656
end interface}
5757

5858
%apply bool (*)(SWIGTYPE, SWIGTYPE) { bool (*)(CTYPE, CTYPE) };
59-
%typemap(ftype, in={procedure(SWIG_cmp_funptr)}, fragment="SWIG_cmp_funptr_"{CTYPE}, noblock=1) bool (*)(CTYPE, CTYPE)
60-
{procedure(SWIG_cmp_funptr), pointer}
59+
%typemap(ftype, in={procedure(flc_cmp_funptr)},
60+
fragment="flc_cmp_funptr"{CTYPE}, noblock=1) bool (*)(CTYPE, CTYPE)
61+
{procedure(flc_cmp_funptr), pointer}
6162

6263
#undef SWIG_cmp_funptr
6364

‎src/flc_algorithm.f90

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -23,31 +23,31 @@ module flc_algorithm
2323
integer(C_SIZE_T), public :: size = 0
2424
end type
2525
abstract interface
26-
function SWIG_cmp_funptr_int32_t(left, right) bind(C) &
26+
function flc_cmp_funptr_int32_t(left, right) bind(C) &
2727
result(fresult)
2828
use, intrinsic :: ISO_C_BINDING
2929
integer(C_INT32_T), intent(in), value :: left, right
3030
logical(C_BOOL) :: fresult
3131
end function
3232
end interface
3333
abstract interface
34-
function SWIG_cmp_funptr_int64_t(left, right) bind(C) &
34+
function flc_cmp_funptr_int64_t(left, right) bind(C) &
3535
result(fresult)
3636
use, intrinsic :: ISO_C_BINDING
3737
integer(C_INT64_T), intent(in), value :: left, right
3838
logical(C_BOOL) :: fresult
3939
end function
4040
end interface
4141
abstract interface
42-
function SWIG_cmp_funptr_double(left, right) bind(C) &
42+
function flc_cmp_funptr_double(left, right) bind(C) &
4343
result(fresult)
4444
use, intrinsic :: ISO_C_BINDING
4545
real(C_DOUBLE), intent(in), value :: left, right
4646
logical(C_BOOL) :: fresult
4747
end function
4848
end interface
4949
abstract interface
50-
function SWIG_cmp_funptr_void_Sm_(left, right) bind(C) &
50+
function flc_cmp_funptr_void_Sm_(left, right) bind(C) &
5151
result(fresult)
5252
use, intrinsic :: ISO_C_BINDING
5353
type(C_PTR), intent(in), value :: left, right
@@ -699,7 +699,7 @@ subroutine swigf_sort__SWIG_3(data)
699699
subroutine swigf_sort__SWIG_4(data, cmp)
700700
use, intrinsic :: ISO_C_BINDING
701701
integer(C_INT32_T), dimension(:), target :: data
702-
procedure(SWIG_cmp_funptr_int32_t) :: cmp
702+
procedure(flc_cmp_funptr_int32_t) :: cmp
703703
type(SwigArrayWrapper) :: farg1
704704
type(C_FUNPTR) :: farg3
705705

@@ -711,7 +711,7 @@ subroutine swigf_sort__SWIG_4(data, cmp)
711711
subroutine swigf_sort__SWIG_5(data, cmp)
712712
use, intrinsic :: ISO_C_BINDING
713713
integer(C_INT64_T), dimension(:), target :: data
714-
procedure(SWIG_cmp_funptr_int64_t) :: cmp
714+
procedure(flc_cmp_funptr_int64_t) :: cmp
715715
type(SwigArrayWrapper) :: farg1
716716
type(C_FUNPTR) :: farg3
717717

@@ -723,7 +723,7 @@ subroutine swigf_sort__SWIG_5(data, cmp)
723723
subroutine swigf_sort__SWIG_6(data, cmp)
724724
use, intrinsic :: ISO_C_BINDING
725725
real(C_DOUBLE), dimension(:), target :: data
726-
procedure(SWIG_cmp_funptr_double) :: cmp
726+
procedure(flc_cmp_funptr_double) :: cmp
727727
type(SwigArrayWrapper) :: farg1
728728
type(C_FUNPTR) :: farg3
729729

@@ -750,7 +750,7 @@ subroutine SWIGTM_fin_void_Sm__Sb__SB_(finp, iminp)
750750
subroutine swigf_sort__SWIG_7(data, cmp)
751751
use, intrinsic :: ISO_C_BINDING
752752
type(C_PTR), dimension(:), target :: data
753-
procedure(SWIG_cmp_funptr_void_Sm_) :: cmp
753+
procedure(flc_cmp_funptr_void_Sm_) :: cmp
754754
type(SwigArrayWrapper) :: farg1
755755
type(C_FUNPTR) :: farg3
756756

@@ -816,7 +816,7 @@ function swigf_is_sorted__SWIG_4(data, cmp) &
816816
use, intrinsic :: ISO_C_BINDING
817817
logical :: swig_result
818818
integer(C_INT32_T), dimension(:), intent(in), target :: data
819-
procedure(SWIG_cmp_funptr_int32_t) :: cmp
819+
procedure(flc_cmp_funptr_int32_t) :: cmp
820820
integer(C_INT) :: fresult
821821
type(SwigArrayWrapper) :: farg1
822822
type(C_FUNPTR) :: farg3
@@ -832,7 +832,7 @@ function swigf_is_sorted__SWIG_5(data, cmp) &
832832
use, intrinsic :: ISO_C_BINDING
833833
logical :: swig_result
834834
integer(C_INT64_T), dimension(:), intent(in), target :: data
835-
procedure(SWIG_cmp_funptr_int64_t) :: cmp
835+
procedure(flc_cmp_funptr_int64_t) :: cmp
836836
integer(C_INT) :: fresult
837837
type(SwigArrayWrapper) :: farg1
838838
type(C_FUNPTR) :: farg3
@@ -848,7 +848,7 @@ function swigf_is_sorted__SWIG_6(data, cmp) &
848848
use, intrinsic :: ISO_C_BINDING
849849
logical :: swig_result
850850
real(C_DOUBLE), dimension(:), intent(in), target :: data
851-
procedure(SWIG_cmp_funptr_double) :: cmp
851+
procedure(flc_cmp_funptr_double) :: cmp
852852
integer(C_INT) :: fresult
853853
type(SwigArrayWrapper) :: farg1
854854
type(C_FUNPTR) :: farg3
@@ -865,7 +865,7 @@ function swigf_is_sorted__SWIG_7(data, datasize, cmp) &
865865
logical :: swig_result
866866
class(SWIGTYPE_p_p_void), intent(in) :: data
867867
integer(C_SIZE_T), intent(in) :: datasize
868-
procedure(SWIG_cmp_funptr_void_Sm_) :: cmp
868+
procedure(flc_cmp_funptr_void_Sm_) :: cmp
869869
integer(C_INT) :: fresult
870870
type(SwigClassWrapper) :: farg1
871871
integer(C_SIZE_T) :: farg2
@@ -933,7 +933,7 @@ subroutine swigf_argsort__SWIG_4(data, idx, cmp)
933933
use, intrinsic :: ISO_C_BINDING
934934
integer(C_INT32_T), dimension(:), intent(in), target :: data
935935
integer(C_INT), dimension(:), target :: idx
936-
procedure(SWIG_cmp_funptr_int32_t) :: cmp
936+
procedure(flc_cmp_funptr_int32_t) :: cmp
937937
type(SwigArrayWrapper) :: farg1
938938
type(SwigArrayWrapper) :: farg3
939939
type(C_FUNPTR) :: farg5
@@ -948,7 +948,7 @@ subroutine swigf_argsort__SWIG_5(data, idx, cmp)
948948
use, intrinsic :: ISO_C_BINDING
949949
integer(C_INT64_T), dimension(:), intent(in), target :: data
950950
integer(C_INT), dimension(:), target :: idx
951-
procedure(SWIG_cmp_funptr_int64_t) :: cmp
951+
procedure(flc_cmp_funptr_int64_t) :: cmp
952952
type(SwigArrayWrapper) :: farg1
953953
type(SwigArrayWrapper) :: farg3
954954
type(C_FUNPTR) :: farg5
@@ -963,7 +963,7 @@ subroutine swigf_argsort__SWIG_6(data, idx, cmp)
963963
use, intrinsic :: ISO_C_BINDING
964964
real(C_DOUBLE), dimension(:), intent(in), target :: data
965965
integer(C_INT), dimension(:), target :: idx
966-
procedure(SWIG_cmp_funptr_double) :: cmp
966+
procedure(flc_cmp_funptr_double) :: cmp
967967
type(SwigArrayWrapper) :: farg1
968968
type(SwigArrayWrapper) :: farg3
969969
type(C_FUNPTR) :: farg5
@@ -979,7 +979,7 @@ subroutine swigf_argsort__SWIG_7(data, datasize, idx, cmp)
979979
class(SWIGTYPE_p_p_void), intent(in) :: data
980980
integer(C_SIZE_T), intent(in) :: datasize
981981
integer(C_INT), dimension(:), target :: idx
982-
procedure(SWIG_cmp_funptr_void_Sm_) :: cmp
982+
procedure(flc_cmp_funptr_void_Sm_) :: cmp
983983
type(SwigClassWrapper) :: farg1
984984
integer(C_SIZE_T) :: farg2
985985
type(SwigArrayWrapper) :: farg3
@@ -1046,7 +1046,7 @@ function swigf_binary_search__SWIG_4(data, value, cmp) &
10461046
integer(INDEX_INT) :: swig_result
10471047
integer(C_INT32_T), dimension(:), intent(in), target :: data
10481048
integer(C_INT32_T), intent(in) :: value
1049-
procedure(SWIG_cmp_funptr_int32_t) :: cmp
1049+
procedure(flc_cmp_funptr_int32_t) :: cmp
10501050
integer(C_INT) :: fresult
10511051
type(SwigArrayWrapper) :: farg1
10521052
integer(C_INT32_T) :: farg3
@@ -1065,7 +1065,7 @@ function swigf_binary_search__SWIG_5(data, value, cmp) &
10651065
integer(INDEX_INT) :: swig_result
10661066
integer(C_INT64_T), dimension(:), intent(in), target :: data
10671067
integer(C_INT64_T), intent(in) :: value
1068-
procedure(SWIG_cmp_funptr_int64_t) :: cmp
1068+
procedure(flc_cmp_funptr_int64_t) :: cmp
10691069
integer(C_INT) :: fresult
10701070
type(SwigArrayWrapper) :: farg1
10711071
integer(C_INT64_T) :: farg3
@@ -1084,7 +1084,7 @@ function swigf_binary_search__SWIG_6(data, value, cmp) &
10841084
integer(INDEX_INT) :: swig_result
10851085
real(C_DOUBLE), dimension(:), intent(in), target :: data
10861086
real(C_DOUBLE), intent(in) :: value
1087-
procedure(SWIG_cmp_funptr_double) :: cmp
1087+
procedure(flc_cmp_funptr_double) :: cmp
10881088
integer(C_INT) :: fresult
10891089
type(SwigArrayWrapper) :: farg1
10901090
real(C_DOUBLE) :: farg3
@@ -1104,7 +1104,7 @@ function swigf_binary_search__SWIG_7(data, datasize, value, cmp) &
11041104
class(SWIGTYPE_p_p_void), intent(in) :: data
11051105
integer(C_SIZE_T), intent(in) :: datasize
11061106
type(C_PTR), intent(in) :: value
1107-
procedure(SWIG_cmp_funptr_void_Sm_) :: cmp
1107+
procedure(flc_cmp_funptr_void_Sm_) :: cmp
11081108
integer(C_INT) :: fresult
11091109
type(SwigClassWrapper) :: farg1
11101110
integer(C_SIZE_T) :: farg2
@@ -1179,7 +1179,7 @@ subroutine swigf_equal_range__SWIG_4(data, value, first_index, last_index, cmp)
11791179
integer(C_INT32_T), intent(in) :: value
11801180
integer(INDEX_INT), target, intent(inout) :: first_index
11811181
integer(INDEX_INT), target, intent(inout) :: last_index
1182-
procedure(SWIG_cmp_funptr_int32_t) :: cmp
1182+
procedure(flc_cmp_funptr_int32_t) :: cmp
11831183
type(SwigArrayWrapper) :: farg1
11841184
integer(C_INT32_T) :: farg3
11851185
type(C_PTR) :: farg4
@@ -1200,7 +1200,7 @@ subroutine swigf_equal_range__SWIG_5(data, value, first_index, last_index, cmp)
12001200
integer(C_INT64_T), intent(in) :: value
12011201
integer(INDEX_INT), target, intent(inout) :: first_index
12021202
integer(INDEX_INT), target, intent(inout) :: last_index
1203-
procedure(SWIG_cmp_funptr_int64_t) :: cmp
1203+
procedure(flc_cmp_funptr_int64_t) :: cmp
12041204
type(SwigArrayWrapper) :: farg1
12051205
integer(C_INT64_T) :: farg3
12061206
type(C_PTR) :: farg4
@@ -1221,7 +1221,7 @@ subroutine swigf_equal_range__SWIG_6(data, value, first_index, last_index, cmp)
12211221
real(C_DOUBLE), intent(in) :: value
12221222
integer(INDEX_INT), target, intent(inout) :: first_index
12231223
integer(INDEX_INT), target, intent(inout) :: last_index
1224-
procedure(SWIG_cmp_funptr_double) :: cmp
1224+
procedure(flc_cmp_funptr_double) :: cmp
12251225
type(SwigArrayWrapper) :: farg1
12261226
real(C_DOUBLE) :: farg3
12271227
type(C_PTR) :: farg4
@@ -1243,7 +1243,7 @@ subroutine swigf_equal_range__SWIG_7(data, datasize, value, first_index, last_in
12431243
type(C_PTR), intent(in) :: value
12441244
integer(INDEX_INT), target, intent(inout) :: first_index
12451245
integer(INDEX_INT), target, intent(inout) :: last_index
1246-
procedure(SWIG_cmp_funptr_void_Sm_) :: cmp
1246+
procedure(flc_cmp_funptr_void_Sm_) :: cmp
12471247
type(SwigClassWrapper) :: farg1
12481248
integer(C_SIZE_T) :: farg2
12491249
type(C_PTR) :: farg3
@@ -1310,7 +1310,7 @@ subroutine swigf_minmax_element__SWIG_4(data, min_index, max_index, cmp)
13101310
integer(C_INT32_T), dimension(:), intent(in), target :: data
13111311
integer(INDEX_INT), target, intent(inout) :: min_index
13121312
integer(INDEX_INT), target, intent(inout) :: max_index
1313-
procedure(SWIG_cmp_funptr_int32_t) :: cmp
1313+
procedure(flc_cmp_funptr_int32_t) :: cmp
13141314
type(SwigArrayWrapper) :: farg1
13151315
type(C_PTR) :: farg3
13161316
type(C_PTR) :: farg4
@@ -1328,7 +1328,7 @@ subroutine swigf_minmax_element__SWIG_5(data, min_index, max_index, cmp)
13281328
integer(C_INT64_T), dimension(:), intent(in), target :: data
13291329
integer(INDEX_INT), target, intent(inout) :: min_index
13301330
integer(INDEX_INT), target, intent(inout) :: max_index
1331-
procedure(SWIG_cmp_funptr_int64_t) :: cmp
1331+
procedure(flc_cmp_funptr_int64_t) :: cmp
13321332
type(SwigArrayWrapper) :: farg1
13331333
type(C_PTR) :: farg3
13341334
type(C_PTR) :: farg4
@@ -1346,7 +1346,7 @@ subroutine swigf_minmax_element__SWIG_6(data, min_index, max_index, cmp)
13461346
real(C_DOUBLE), dimension(:), intent(in), target :: data
13471347
integer(INDEX_INT), target, intent(inout) :: min_index
13481348
integer(INDEX_INT), target, intent(inout) :: max_index
1349-
procedure(SWIG_cmp_funptr_double) :: cmp
1349+
procedure(flc_cmp_funptr_double) :: cmp
13501350
type(SwigArrayWrapper) :: farg1
13511351
type(C_PTR) :: farg3
13521352
type(C_PTR) :: farg4
@@ -1365,7 +1365,7 @@ subroutine swigf_minmax_element__SWIG_7(data, datasize, min_index, max_index, cm
13651365
integer(C_SIZE_T), intent(in) :: datasize
13661366
integer(INDEX_INT), target, intent(inout) :: min_index
13671367
integer(INDEX_INT), target, intent(inout) :: max_index
1368-
procedure(SWIG_cmp_funptr_void_Sm_) :: cmp
1368+
procedure(flc_cmp_funptr_void_Sm_) :: cmp
13691369
type(SwigClassWrapper) :: farg1
13701370
integer(C_SIZE_T) :: farg2
13711371
type(C_PTR) :: farg3
@@ -1434,7 +1434,7 @@ function swigf_includes__SWIG_4(data1, data2, cmp) &
14341434
logical :: swig_result
14351435
integer(C_INT32_T), dimension(:), intent(in), target :: data1
14361436
integer(C_INT32_T), dimension(:), intent(in), target :: data2
1437-
procedure(SWIG_cmp_funptr_int32_t) :: cmp
1437+
procedure(flc_cmp_funptr_int32_t) :: cmp
14381438
integer(C_INT) :: fresult
14391439
type(SwigArrayWrapper) :: farg1
14401440
type(SwigArrayWrapper) :: farg3
@@ -1453,7 +1453,7 @@ function swigf_includes__SWIG_5(data1, data2, cmp) &
14531453
logical :: swig_result
14541454
integer(C_INT64_T), dimension(:), intent(in), target :: data1
14551455
integer(C_INT64_T), dimension(:), intent(in), target :: data2
1456-
procedure(SWIG_cmp_funptr_int64_t) :: cmp
1456+
procedure(flc_cmp_funptr_int64_t) :: cmp
14571457
integer(C_INT) :: fresult
14581458
type(SwigArrayWrapper) :: farg1
14591459
type(SwigArrayWrapper) :: farg3
@@ -1472,7 +1472,7 @@ function swigf_includes__SWIG_6(data1, data2, cmp) &
14721472
logical :: swig_result
14731473
real(C_DOUBLE), dimension(:), intent(in), target :: data1
14741474
real(C_DOUBLE), dimension(:), intent(in), target :: data2
1475-
procedure(SWIG_cmp_funptr_double) :: cmp
1475+
procedure(flc_cmp_funptr_double) :: cmp
14761476
integer(C_INT) :: fresult
14771477
type(SwigArrayWrapper) :: farg1
14781478
type(SwigArrayWrapper) :: farg3
@@ -1493,7 +1493,7 @@ function swigf_includes__SWIG_7(data1, datasize1, data2, datasize2, cmp) &
14931493
integer(C_SIZE_T), intent(in) :: datasize1
14941494
class(SWIGTYPE_p_p_void), intent(in) :: data2
14951495
integer(C_SIZE_T), intent(in) :: datasize2
1496-
procedure(SWIG_cmp_funptr_void_Sm_) :: cmp
1496+
procedure(flc_cmp_funptr_void_Sm_) :: cmp
14971497
integer(C_INT) :: fresult
14981498
type(SwigClassWrapper) :: farg1
14991499
integer(C_SIZE_T) :: farg2

0 commit comments

Comments
 (0)