Skip to content

Commit 472e8eb

Browse files
committed
.
1 parent 4360fe0 commit 472e8eb

File tree

1 file changed

+9
-19
lines changed

1 file changed

+9
-19
lines changed

CImg.h

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -212,13 +212,6 @@ enum {FALSE_WIN = 0};
212212
#define cimg_pragma(x) _Pragma(#x)
213213
#endif
214214

215-
// Portable macro to define '__restrict'.
216-
#if defined(__GNUC__) || defined(__clang__) || defined(_MSC_VER) || defined(__INTEL_COMPILER)
217-
#define cimg_restrict __restrict
218-
#else
219-
#define cimg_restrict
220-
#endif
221-
222215
// Define own datatypes to ensure portability.
223216
// ( 'sizeof(cimg_ulong/cimg_long) = sizeof(void*)' ).
224217
#define cimg_uint8 unsigned char
@@ -34864,10 +34857,9 @@ namespace cimg_library {
3486434857
if (mode&4) cimg_rofX(*this,x) mp(x,y,z,0);
3486534858
else cimg_rofX(*this,x) {
3486634859
mp(x,y,z,0,res._data);
34867-
const double *const cimg_restrict ptrs = res._data;
34868-
T *cimg_restrict _ptrd = ptrd--;
34869-
cimg_pragma_openmp(simd)
34870-
for (unsigned int n = 0; n<N; ++n) _ptrd[n*whd] = (T)ptrs[n];
34860+
const double *const ptrs = res._data;
34861+
T *_ptrd = ptrd--;
34862+
for (unsigned int n = 0; n<N; ++n) _ptrd[n*whd] = (T)ptrs[n];
3487134863
}
3487234864
}
3487334865
mp.end_t();
@@ -34880,10 +34872,9 @@ namespace cimg_library {
3488034872
if (mode&4) cimg_forX(*this,x) mp(x,y,z,0);
3488134873
else cimg_forX(*this,x) {
3488234874
mp(x,y,z,0,res._data);
34883-
const double *const cimg_restrict ptrs = res._data;
34884-
T *cimg_restrict _ptrd = ptrd++;
34885-
cimg_pragma_openmp(simd)
34886-
for (unsigned int n = 0; n<N; ++n) _ptrd[n*whd] = (T)ptrs[n];
34875+
const double *const ptrs = res._data;
34876+
T *_ptrd = ptrd++;
34877+
for (unsigned int n = 0; n<N; ++n) _ptrd[n*whd] = (T)ptrs[n];
3488734878
}
3488834879
}
3488934880
mp.end_t();
@@ -34911,10 +34902,9 @@ namespace cimg_library {
3491134902
const ulongT off = (ulongT)_off; \
3491234903
cimg_for##_X(*this,_x) { \
3491334904
lmp(x,y,z,0,res._data); \
34914-
const double *const cimg_restrict ptrs = res._data; \
34915-
T *cimg_restrict _ptrd = __ptrd; \
34916-
cimg_pragma_openmp(simd) \
34917-
for (unsigned int n = 0; n<N; ++n) _ptrd[n*whd] = (T)ptrs[n]; \
34905+
const double *const ptrs = res._data; \
34906+
T *_ptrd = __ptrd; \
34907+
for (unsigned int n = 0; n<N; ++n) _ptrd[n*whd] = (T)ptrs[n]; \
3491834908
__ptrd+=off; \
3491934909
} \
3492034910
} \

0 commit comments

Comments
 (0)