diff options
Diffstat (limited to 'src/c/operations')
| -rw-r--r-- | src/c/operations/includes/dynlib_operations.h | 2 | ||||
| -rw-r--r-- | src/c/operations/interfaces/int_OpExt.h | 32 | ||||
| -rw-r--r-- | src/c/operations/interfaces/int_OpIns.h | 8 |
3 files changed, 21 insertions, 21 deletions
diff --git a/src/c/operations/includes/dynlib_operations.h b/src/c/operations/includes/dynlib_operations.h index ab48cea1..a55d2402 100644 --- a/src/c/operations/includes/dynlib_operations.h +++ b/src/c/operations/includes/dynlib_operations.h @@ -23,4 +23,4 @@ #define EXTERN_OPERATIONS
#endif
-#endif /* __DYNLIB_OPERATIONS_H__ */
\ No newline at end of file +#endif /* __DYNLIB_OPERATIONS_H__ */
diff --git a/src/c/operations/interfaces/int_OpExt.h b/src/c/operations/interfaces/int_OpExt.h index 885ea94e..a116dd78 100644 --- a/src/c/operations/interfaces/int_OpExt.h +++ b/src/c/operations/interfaces/int_OpExt.h @@ -15,16 +15,16 @@ #ifndef __INT_OPEXT_H__ #define __INT_OPEXT_H__ -#define s2s0OpExts0(in1,size,in2) in1[in2-1]; -#define d2d0OpExtd0(in1,size,in2) in1[in2-1]; -#define c2s0OpExtc0(in1,size,in2) in1[in2-1]; -#define z2d0OpExtz0(in1,size,in2) in1[in2-1]; +#define s2s0OpExts0(in1,size,in2) in1[((int)in2)-1]; +#define d2d0OpExtd0(in1,size,in2) in1[((int)in2)-1]; +#define c2s0OpExtc0(in1,size,in2) in1[((int)in2)-1]; +#define z2d0OpExtz0(in1,size,in2) in1[((int)in2)-1]; -#define s2s0s0OpExts0(in1,size,row,col) in1[(col-1)*size[0]+row-1]; -#define d2d0d0OpExtd0(in1,size,row,col) in1[(col-1)*size[0]+row-1]; -#define c2s0s0OpExtc0(in1,size,row,col) in1[(col-1)*size[0]+row-1]; -#define z2d0d0OpExtz0(in1,size,row,col) in1[(col-1)*size[0]+row-1]; +#define s2s0s0OpExts0(in1,size,row,col) in1[(((int) col)-1)*size[0]+((int) row)-1]; +#define d2d0d0OpExtd0(in1,size,row,col) in1[(((int) col)-1)*size[0]+((int) row)-1]; +#define c2s0s0OpExtc0(in1,size,row,col) in1[(((int) col)-1)*size[0]+((int) row)-1]; +#define z2d0d0OpExtz0(in1,size,row,col) in1[(((int) col)-1)*size[0]+((int) row)-1]; #define s2s2OpExts2(in1,size1,in2,size2,out) {int i; \ @@ -45,35 +45,35 @@ #define s2s2s0OpExts2(in1,size1,rows,size2,col,out) {int i; \ - for (i=0;i<size2[0]*size2[1];i++) out[i]=s2s0s0OpExts0(in1,size1,(int)rows[i],col); \ + for (i=0;i<size2[0]*size2[1];i++) out[i]=s2s0s0OpExts0(in1,size1,(int)rows[i],((int) col)); \ } #define d2d2d0OpExtd2(in1,size1,rows,size2,col,out) {int i; \ - for (i=0;i<size2[0]*size2[1];i++) out[i]=d2d0d0OpExtd0(in1,size1,(int)rows[i],col); \ + for (i=0;i<size2[0]*size2[1];i++) out[i]=d2d0d0OpExtd0(in1,size1,(int)rows[i],((int) col)); \ } #define c2s2s0OpExtc2(in1,size1,rows,size2,col,out) {int i; \ - for (i=0;i<size2[0]*size2[1];i++) out[i]=c2s0s0OpExtc0(in1,size1,(int)rows[i],col); \ + for (i=0;i<size2[0]*size2[1];i++) out[i]=c2s0s0OpExtc0(in1,size1,(int)rows[i],((int) col)); \ } #define z2d2d0OpExtz2(in1,size1,rows,size2,col,out) {int i; \ - for (i=0;i<size2[0]*size2[1];i++) out[i]=z2d0d0OpExtz0(in1,size1,(int)rows[i],col); \ + for (i=0;i<size2[0]*size2[1];i++) out[i]=z2d0d0OpExtz0(in1,size1,(int)rows[i],((int) col)); \ } #define s2s0s2OpExts2(in1,size1,row,cols,size2,out) {int i; \ - for (i=0;i<size2[0]*size2[1];i++) out[i]=s2s0s0OpExts0(in1,size1,row,(int)cols[i]); \ + for (i=0;i<size2[0]*size2[1];i++) out[i]=s2s0s0OpExts0(in1,size1,((int) row),(int)cols[i]); \ } #define d2d0d2OpExtd2(in1,size1,row,cols,size2,out) {int i; \ - for (i=0;i<size2[0]*size2[1];i++) out[i]=d2d0d0OpExtd0(in1,size1,row,(int)cols[i]); \ + for (i=0;i<size2[0]*size2[1];i++) out[i]=d2d0d0OpExtd0(in1,size1,((int) row),(int)cols[i]); \ } #define c2s0s2OpExtc2(in1,size1,row,cols,size2,out) {int i; \ - for (i=0;i<size2[0]*size2[1];i++) out[i]=c2s0s0OpExtc0(in1,size1,row,(int)cols[i]); \ + for (i=0;i<size2[0]*size2[1];i++) out[i]=c2s0s0OpExtc0(in1,size1,((int) row),(int)cols[i]); \ } #define z2d0d2OpExtz2(in1,size1,row,cols,size2,out) {int i; \ - for (i=0;i<size2[0]*size2[1];i++) out[i]=z2d0d0OpExtz0(in1,size1,row,(int)cols[i]); \ + for (i=0;i<size2[0]*size2[1];i++) out[i]=z2d0d0OpExtz0(in1,size1,((int) row),(int)cols[i]); \ } diff --git a/src/c/operations/interfaces/int_OpIns.h b/src/c/operations/interfaces/int_OpIns.h index 20fa8cb6..6f6d0227 100644 --- a/src/c/operations/interfaces/int_OpIns.h +++ b/src/c/operations/interfaces/int_OpIns.h @@ -16,13 +16,13 @@ /* a(3)=2 */ -#define s2s0s0OpIns(in,size,indice,newVal) in[indice-1]=newVal; +#define s2s0s0OpIns(in,size,indice,newVal) in[(int) indice-1]=newVal; -#define d2d0d0OpIns(in,size,indice,newVal) in[indice-1]=newVal; +#define d2d0d0OpIns(in,size,indice,newVal) in[(int) indice-1]=newVal; -#define c2s0c0OpIns(in,size,indice,newVal) in[indice-1]=newVal; +#define c2s0c0OpIns(in,size,indice,newVal) in[(int) indice-1]=newVal; -#define z2d0z0OpIns(in,size,indice,newVal) in[indice-1]=newVal; +#define z2d0z0OpIns(in,size,indice,newVal) in[(int) indice-1]=newVal; /* a([1 2])=2 */ #define s2s2s0OpIns(in,size1,indices,size2,newVal) {int i;\ |