Skip to content

Commit 23f4a2e

Browse files
replaced inline with NPY_INLINE to work around VS90 issue
1 parent 20e354c commit 23f4a2e

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

mkl_fft/src/multi_iter.h

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ typedef struct multi_iter_masked_t {
6161
#define MultiIter_ShapeElem(mit, i) ((mit).shape)[(i)]
6262
#define MultiIter_MaskElem(mit, i) ((mit).mask)[(i)]
6363

64+
/*
6465
void multi_iter_new(multi_iter_t*, npy_intp*, int);
6566
void multi_iter_masked_new(multi_iter_masked_t*, npy_intp*, int, int*, int);
6667
@@ -69,8 +70,9 @@ int multi_iter_next(multi_iter_t*);
6970
7071
void multi_iter_masked_free(multi_iter_masked_t*);
7172
int multi_iter_masked_next(multi_iter_masked_t*);
73+
*/
7274

73-
inline void
75+
NPY_INLINE void
7476
multi_iter_new(multi_iter_t* mi, npy_intp shape[], int rank) {
7577
int i;
7678
char d = 0;
@@ -92,7 +94,7 @@ multi_iter_new(multi_iter_t* mi, npy_intp shape[], int rank) {
9294
return;
9395
}
9496

95-
inline void
97+
NPY_INLINE void
9698
multi_iter_masked_new(
9799
multi_iter_masked_t* mi, npy_intp shape[], int rank, int mask[], int mask_len)
98100
{
@@ -122,7 +124,7 @@ multi_iter_masked_new(
122124
}
123125

124126

125-
inline void
127+
NPY_INLINE void
126128
multi_iter_masked_free(multi_iter_masked_t *mi) {
127129
if (mi) {
128130
if(MultiIter_Index(*mi))
@@ -138,7 +140,7 @@ multi_iter_masked_free(multi_iter_masked_t *mi) {
138140
return;
139141
}
140142

141-
inline void
143+
NPY_INLINE void
142144
multi_iter_free(multi_iter_t *mi) {
143145
if (mi) {
144146
if(MultiIter_Index(*mi))
@@ -154,7 +156,7 @@ multi_iter_free(multi_iter_t *mi) {
154156

155157

156158
/* Modifies iterator in-place, returns 1 when iterator is empty, 0 otherwise */
157-
inline int
159+
NPY_INLINE int
158160
multi_iter_next(multi_iter_t *mi) {
159161
int j, k;
160162

@@ -176,7 +178,7 @@ multi_iter_next(multi_iter_t *mi) {
176178
}
177179

178180
/* Modifies iterator in-place, returns 1 when iterator is empty, 0 otherwise */
179-
inline int
181+
NPY_INLINE int
180182
multi_iter_masked_next(multi_iter_masked_t *mi) {
181183
int j, k;
182184

0 commit comments

Comments
 (0)