diff options
| author | Brijeshcr | 2017-07-08 20:18:46 +0530 |
|---|---|---|
| committer | GitHub | 2017-07-08 20:18:46 +0530 |
| commit | 26ab8620e89571314bc1a828bd9aca3d288eaede (patch) | |
| tree | e0f47fecb8b5d5e63491c7440d9ecc3072e5cd05 /2.3-1/macros/FunctionAnnotation | |
| parent | 3adebb16388c6712f7d9c268b91849d164e696df (diff) | |
| parent | 39874e472e540ca1bb923b97b52900e1d60439cc (diff) | |
| download | Scilab2C-26ab8620e89571314bc1a828bd9aca3d288eaede.tar.gz Scilab2C-26ab8620e89571314bc1a828bd9aca3d288eaede.tar.bz2 Scilab2C-26ab8620e89571314bc1a828bd9aca3d288eaede.zip | |
Merge pull request #13 from FOSSEE/revert-12-master
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to '2.3-1/macros/FunctionAnnotation')
| -rw-r--r-- | 2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci | 7 | ||||
| -rw-r--r-- | 2.3-1/macros/FunctionAnnotation/names | 18 |
2 files changed, 0 insertions, 25 deletions
diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci index daf012f1..3fadd1f2 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci @@ -52,11 +52,7 @@ FunSizeAnnot = ''; // ---------------------------------------------
// --- Open the .sci file (read only). ---
inclsfid = SCI2COpenFileRead(SCI2CClassFileName);
-<<<<<<< HEAD PrintStringInfo(' '+string(inclsfid),ReportFileName,'file','y');
-======= -
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // #RNU_RES_B
// --- Loop over the lines of the input file. ---
// Position file pointer to the desired NInArg/NOutArg section,
@@ -216,9 +212,6 @@ mclose(inclsfid); // -------------------------------------------------
// --- End Read the annotations of the function. ---
// -------------------------------------------------
-<<<<<<< HEAD PrintStringInfo(' end of annotation '+string(NOutArg_mod),ReportFileName,'file','y');
-======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction
diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names index 32c8f072..423c825a 100644 --- a/2.3-1/macros/FunctionAnnotation/names +++ b/2.3-1/macros/FunctionAnnotation/names @@ -1,17 +1,11 @@ FA_ADD FA_DIV -<<<<<<< HEAD FA_FSFIRLIN_SZ -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FA_GetDefaultPrecision FA_GetFunAnn FA_GetOutArgInfo FA_GetResizeApproach -<<<<<<< HEAD FA_INSZ_RPI -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FA_INT FA_MAX FA_MIN @@ -22,10 +16,7 @@ FA_SCHUR_TP FA_SUB FA_SZ_1 FA_SZ_2 -<<<<<<< HEAD FA_SZ_AMELL -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FA_SZ_COLUMN_DIAG FA_SZ_COL_DIAG_IN_EX FA_SZ_DEC2BASE @@ -38,10 +29,7 @@ FA_SZ_FROM_VAL FA_SZ_LINSPACE_ROW FA_SZ_LQE FA_SZ_LQR -<<<<<<< HEAD FA_SZ_MODSN -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FA_SZ_OBSCNT FA_SZ_OPAPEX FA_SZ_OPBACKSLASH @@ -73,11 +61,8 @@ FA_SZ_ROW_DIAG FA_SZ_ROW_DIAG_INS_EXT FA_SZ_SEL1 FA_SZ_SEL2 -<<<<<<< HEAD FA_SZ_U_SVA FA_TP_ASCII -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FA_TP_C FA_TP_COMPLEX FA_TP_CVIMAGE @@ -87,10 +72,7 @@ FA_TP_INT16 FA_TP_INT8 FA_TP_MAX FA_TP_MIN_REAL -<<<<<<< HEAD FA_TP_MODSN -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FA_TP_REAL FA_TP_S FA_TP_UINT16 |