Fix wrong pointer type

Added detection of wrong pointer types being sent using -Werror and
fixed the errors caused by it.

Belonging to [master]:
  - #2134

Author: sjoelund

Compiler/Util/System.mo

@@ -1264,7 +1264,7 @@ function stringAllocatorResult<T>
   input T dummy "This is just added so we do not make an extra allocation for the string" annotation(__OpenModelica_UnusedVariable=true);
   output T res;
 external "C" res=om_stringAllocatorResult(sa) annotation(Include="
-const char* om_stringAllocatorResult(void *sa) {
+void* om_stringAllocatorResult(void *sa) {
   return sa;
 }
 ");

Compiler/boot/Makefile.common

@@ -60,7 +60,7 @@ bootstrap-from-tarball: $(PATCHES)
 	tar xJf bootstrap-sources.tar.xz
 	# Patch _main.c to avoid a new tarball
 	$(PATCH_SOURCES)
-	cd build && for x in ../patches/*.patch; do patch -i "$$x"  "`basename $$x | $(SED) 's/\([.][0-9]*\)\?[.]patch/.c/'`" || exit 1; done
+	cd build && for x in ../patches/*.patch; do patch -i "$$x"  "`basename $$x | $(SED) 's/\([.][0-9]*\)\?[.]patch//'`" || exit 1; done
 	# We have not compiled OpenModelicaScriptingAPI.mo yet
 	touch build/OpenModelicaScriptingAPI.h
 	$(MAKE) -f $(defaultMakefileTarget) install INCLUDESOURCES=1 OMC=.omc BOOTSTRAP_STAGE_1=1 CPPFLAGS="$(CPPFLAGS) -DOMC_BOOTSTRAPPING_STAGE_1"

Compiler/boot/patches/CevalScript.1.patch.xz renamed to Compiler/boot/patches/CevalScript.c.1.patch.xz

@@ -333,12 +333,12 @@ STRING : '"' STRING_GUTS '"'
          pANTLR3_STRING text = $STRING_GUTS.text;
          char *res = 0;
          if (*text->chars) {
-           res = SystemImpl__iconv((const char*)text->chars,ModelicaParser_encoding,"UTF-8",0);
+           res = (char*) SystemImpl__iconv((const char*)text->chars,ModelicaParser_encoding,"UTF-8",0);
            if (!*res) {
              const char *strs[2];
              signed char buf[76];
              int len, i;
-             res = SystemImpl__iconv__ascii((const char*)text->chars);
+             res = (char*) SystemImpl__iconv__ascii((const char*)text->chars);
              len = strlen((const char*)res);
              /* Avoid printing huge strings */
              if (len > 75) {

Compiler/boot/patches/System_includes.h.patch.xz

@@ -53,7 +53,7 @@ DLLDirection extern pthread_key_t modelicaParserKey;
 #define ModelicaParser_langStd ((parser_members*)pthread_getspecific(modelicaParserKey))->langStd
 #define ModelicaParser_lexerError ((parser_members*)pthread_getspecific(modelicaParserKey))->lexerError
 #define ModelicaParser_encoding ((parser_members*)pthread_getspecific(modelicaParserKey))->encoding
-#define ModelicaParser_threadData ((parser_members*)pthread_getspecific(mmc_thread_data_key))
+#define ModelicaParser_threadData ((threadData_t*)pthread_getspecific(mmc_thread_data_key))
 
 typedef struct antlr_members_struct {
   int lexerError;

Parser/BaseModelica_Lexer.g

@@ -53,7 +53,7 @@ typedef struct OptDataDim{
  int NRes;
  int nJ;
  int nJ2;
- int nsi;
+ modelica_integer nsi;
  int nt;
 
  int np;

Parser/ModelicaParserCommon.h

@@ -1099,7 +1099,7 @@ int residualFunctionIDA(double time, N_Vector yy, N_Vector yp, N_Vector res, voi
     for(i=0; i < idaData->N; i++)
     {
       NV_Ith_S(res, i) = data->simulationInfo->daeModeData->residualVars[i];
-      infoStreamPrint(LOG_SOLVER_V, 0, "%d. residual = %e", i, NV_Ith_S(res, i));
+      infoStreamPrint(LOG_SOLVER_V, 0, "%ld. residual = %e", i, NV_Ith_S(res, i));
     }
   }
   else
@@ -1109,7 +1109,7 @@ int residualFunctionIDA(double time, N_Vector yy, N_Vector yp, N_Vector res, voi
     for(i=0; i < idaData->N; i++)
     {
       NV_Ith_S(res, i) = data->localData[0]->realVars[data->modelData->nStates + i] - NV_Ith_S(yp, i);
-      infoStreamPrint(LOG_SOLVER_V, 0, "%d. residual = %e", i, NV_Ith_S(res, i));
+      infoStreamPrint(LOG_SOLVER_V, 0, "%ld. residual = %e", i, NV_Ith_S(res, i));
     }
   }
 

SimulationRuntime/c/optimization/OptimizerData.h

@@ -522,22 +522,6 @@ void array_alloc_boolean_array(boolean_array_t* dest, int n,
     free(elts);
 }
 
-void array_scalar_boolean_array(boolean_array_t* dest, int n,
-                                m_boolean first, ...)
-{
-    int i;
-    va_list ap;
-    assert(base_array_ok(dest));
-    assert(dest->ndims == 1);
-    assert(dest->dim_size[0] == n);
-    put_boolean_element(first, 0, dest);
-    va_start(ap,first);
-    for(i = 0; i < n; ++i) {
-        put_boolean_element((m_boolean) va_arg(ap, int),i,dest);
-    }
-    va_end(ap);
-}
-
 /* array_alloc_scalar_boolean_array
  *
  * Creates(incl allocation) an array from scalar elements.

SimulationRuntime/c/simulation/solver/ida_solver.c

@@ -150,8 +150,7 @@ extern void array_alloc_boolean_array(boolean_array_t* dest,int n,
                                boolean_array_t first,...);
 
 /* array(s1,s2,s3)  for scalars s1,s2,s3 */
-extern void array_scalar_boolean_array(boolean_array_t* dest,int n,
-                                m_boolean first,...);
+extern void array_scalar_boolean_array(boolean_array_t* dest,int n,...);
 extern void array_alloc_scalar_boolean_array(boolean_array_t* dest,int n,...);
 
 extern m_boolean* boolean_array_element_addr(const boolean_array_t* source,int ndims,...);