diff options
| author | Brijeshcr | 2017-07-08 20:18:17 +0530 |
|---|---|---|
| committer | GitHub | 2017-07-08 20:18:17 +0530 |
| commit | bd03b38be0918837e147e969c6bb2014900009db (patch) | |
| tree | 2cd9b7b1c15092e1367ed15e81aa71ccc9e05190 /src/c/matrixOperations/cat | |
| parent | 97d1c6847a05bdb93557553a6bdcfd0f15feda99 (diff) | |
| download | Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.tar.gz Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.tar.bz2 Scilab2C_fossee_old-bd03b38be0918837e147e969c6bb2014900009db.zip | |
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to 'src/c/matrixOperations/cat')
| -rw-r--r-- | src/c/matrixOperations/cat/ccata.c | 4 | ||||
| -rw-r--r-- | src/c/matrixOperations/cat/zcata.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/c/matrixOperations/cat/ccata.c b/src/c/matrixOperations/cat/ccata.c index 6a2a6d9..cd2b4c9 100644 --- a/src/c/matrixOperations/cat/ccata.c +++ b/src/c/matrixOperations/cat/ccata.c @@ -26,11 +26,7 @@ void crowcata(floatComplex *in1, int lines1, int columns1, floatComplex *in2, i { for (j = 0 ; j < lines1 ; ++j) { -<<<<<<< HEAD out[i*(lines1 + lines2) + j] = in1[i*lines1 + j]; -======= - /*out[i*(lines1 + lines2) + j] = in1[i*lines1 + j];*/ ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 } for (j = 0 ; j < lines2 ; ++j) { diff --git a/src/c/matrixOperations/cat/zcata.c b/src/c/matrixOperations/cat/zcata.c index 659f14c..485553d 100644 --- a/src/c/matrixOperations/cat/zcata.c +++ b/src/c/matrixOperations/cat/zcata.c @@ -26,11 +26,7 @@ void zrowcata(doubleComplex *in1, int lines1, int columns1, doubleComplex *in2, { for (j = 0 ; j < lines1 ; ++j) { -<<<<<<< HEAD out[i*(lines1 + lines2) + j] = in1[i*lines1 + j]; -======= - /*out[i*(lines1 + lines2) + j] = in1[i*lines1 + j];*/ ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 } for (j = 0 ; j < lines2 ; ++j) { |