- removed wrong enum forward-declaration

- fix for new sundials-version in cpp-runtime
OpenModelica · Aug 12, 2015 · b5906fa · b5906fa
1 parent 61b3613
commit b5906fa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/SimulationRuntime/cpp/Include/Core/Utils/extension/logger.hpp b/SimulationRuntime/cpp/Include/Core/Utils/extension/logger.hpp
@@ -8,10 +8,6 @@
 #ifndef LOGGER_HPP_
 #define LOGGER_HPP_
 
-
-enum LogCategory;
-enum LogLevel;
-
 class BOOST_EXTENSION_LOGGER_DECL Logger
 {
   public:

diff --git a/SimulationRuntime/cpp/Include/FMU/FMUGlobalSettings.h b/SimulationRuntime/cpp/Include/FMU/FMUGlobalSettings.h
@@ -51,5 +51,7 @@ class  FMUGlobalSettings : public IGlobalSettings
     virtual string getRuntimeLibrarypath() { return "";}
     virtual void setAlarmTime(unsigned int) {}
     virtual unsigned int getAlarmTime() {return 0;}
+    virtual void setNonLinearSolverContinueOnError(bool){};
+    virtual bool getNonLinearSolverContinueOnError(){ return false; };
 private:
 };
diff --git a/SimulationRuntime/cpp/Include/Solver/Kinsol/KinsolLapack.h b/SimulationRuntime/cpp/Include/Solver/Kinsol/KinsolLapack.h
@@ -8,7 +8,7 @@ int KINLapackCompletePivoting(void *kinmem, int N);
 static int KINLapackCompletePivotingInit(KINMem kin_mem);
 static int KINLapackCompletePivotingSetup(KINMem kin_mem);
 #if SUNDIALS_MAJOR_VERSION > 2 || (SUNDIALS_MAJOR_VERSION == 2 && SUNDIALS_MINOR_VERSION > 5)
-static int KINLapackCompletePivotingSolve(KINMem kin_mem, N_Vector x, N_Vector b, realtype *sJpnorm, realtype *sFdotJp*/);
+static int KINLapackCompletePivotingSolve(KINMem kin_mem, N_Vector x, N_Vector b, realtype *sJpnorm, realtype *sFdotJp*);
 #else
 static int KINLapackCompletePivotingSolve(KINMem kin_mem, N_Vector x, N_Vector b, realtype *res_norm);
 #endif