[OMSI] Fixed wrong header guard and warnings in OMSIBase and OMSIC

Andreas Heuermann · OpenModelica-Hudson · commit 10a0a9df6a3a · 2019-04-29T17:05:45.000+02:00
Belonging to [master]: - OpenModelica/OpenModelica#154 - #3067 Belonging to [master]: - OpenModelica/OpenModelica#154 - #3067
diff --git a/SimulationRuntime/OMSI/base/include/omsi_getters_and_setters.h b/SimulationRuntime/OMSI/base/include/omsi_getters_and_setters.h
@@ -28,8 +28,8 @@
  *
  */
 
-#ifndef OMSU_INPUT_MODEL_VARIABLES_H
-#define OMSU_INPUT_MODEL_VARIABLES_H
+#ifndef OMSU_GETTERS_AND_SETTERS_H
+#define OMSU_GETTERS_AND_SETTERS_H
 
 #include <omsi.h>
 #include <omsi_callbacks.h>
diff --git a/SimulationRuntime/OMSIC/include/omsu/omsu_getters_and_setters.h b/SimulationRuntime/OMSIC/include/omsu/omsu_getters_and_setters.h
@@ -43,6 +43,7 @@
 
 #include <omsic.h>
 #include <omsi_input_model_variables.h>
+#include <omsi_getters_and_setters.h>
 
 #include <omsu_common.h>
 #include <omsu_helper.h>
diff --git a/SimulationRuntime/OMSIC/src/omsu/omsu_helper.c b/SimulationRuntime/OMSIC/src/omsu/omsu_helper.c
@@ -513,6 +513,8 @@ omsi_real division_error_time(const char*   msg,
  */
 omsi_real homotopy(omsi_real actual, omsi_real siple) {
 
+  UNUSED(siple);
+
   /* call an assert after logging */
   return actual;
 }

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@`
`28`	`28`	`*`
`29`	`29`	`*/`
`30`	`30`
`31`		`-#ifndef OMSU_INPUT_MODEL_VARIABLES_H`
`32`		`-#define OMSU_INPUT_MODEL_VARIABLES_H`
	`31`	`+#ifndef OMSU_GETTERS_AND_SETTERS_H`
	`32`	`+#define OMSU_GETTERS_AND_SETTERS_H`
`33`	`33`
`34`	`34`	`#include <omsi.h>`
`35`	`35`	`#include <omsi_callbacks.h>`
Original file line number	Diff line number	Diff line change
`@@ -513,6 +513,8 @@ omsi_real division_error_time(const char* msg,`
`513`	`513`	`*/`
`514`	`514`	`omsi_real homotopy(omsi_real actual, omsi_real siple) {`
`515`	`515`
	`516`	`+ UNUSED(siple);`
	`517`	`+`
`516`	`518`	`/* call an assert after logging */`
`517`	`519`	`return actual;`
`518`	`520`	`}`