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

Belonging to [master]: - #154 - #3067 Belonging to [master]: - #154 - OpenModelica/OMCompiler#3067
OpenModelica · Apr 29, 2019 · 10a0a9d · 10a0a9d
1 parent 84b5f7e
commit 10a0a9d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
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;
 }