-adapted cpp runtime includes for vxworks

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@22917 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 24, 2014 · e518546 · e518546
1 parent fb4672a
commit e518546
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 24 deletions.
diff --git a/SimulationRuntime/cpp/Include/Core/DataExchange/SimBoolean.h b/SimulationRuntime/cpp/Include/Core/DataExchange/SimBoolean.h
@@ -4,18 +4,18 @@
 using std::string;
 
 /**
-SimVar Klasse zum verwalten einer Boolean Variable
+SimVar Klasse zum verwalten einer Boolean Variable  
 */
 class SimBoolean : public ISimVar
 {
-public:
-  virtual ~SimBoolean() {};
-  SimBoolean(bool value) { _value = value; }
-  virtual string getName() { return _name; }
-  virtual void setName(string name) { _name = name; }
-  bool& getValue() { return _value; }
 
+public:
+	virtual ~SimBoolean()	{};
+	SimBoolean(bool value) {_value = value;}
+	virtual string getName() {return _name;}
+	virtual void setName(string name) {_name = name;}
+	bool& getValue() { return _value;}
 private:
-  string _name;
-  bool _value;
+	string _name;
+	bool _value;
 };
diff --git a/SimulationRuntime/cpp/Include/Core/DataExchange/SimDouble.h b/SimulationRuntime/cpp/Include/Core/DataExchange/SimDouble.h
@@ -3,18 +3,18 @@
 #include <string>
 using std::string;
 /**
-SimVar Klasse zum verwalten einer Double Variable
+SimVar Klasse zum verwalten einer Double Variable  
 */
 class SimDouble : public ISimVar
 {
-public:
-  virtual ~SimDouble() {};
-  SimDouble(double value) { _value = value; }
-  virtual string getName() { return _name; }
-  virtual void setName(string name) { _name = name; }
-  double& getValue() { return _value; }
 
+public:
+	virtual ~SimDouble()	{};
+	SimDouble(double value) {_value = value;}
+	virtual string getName() {return _name;}
+	virtual void setName(string name) { _name = name;}
+	double& getValue() { return _value;}
 private:
-  string _name;
-  double _value;
+	string _name;
+	double _value;
 };
diff --git a/SimulationRuntime/cpp/Include/Core/SimController/ISimController.h b/SimulationRuntime/cpp/Include/Core/SimController/ISimController.h
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <Core/Modelica.h>
 #include <SimCoreFactory/Policies/FactoryConfig.h>
 
 #ifdef ANALYZATION_MODE
@@ -13,7 +13,7 @@
 #include <string.h>
 using std::string;
 #endif
-#include <SimCoreFactory/Policies/FactoryConfig.h>
+
 struct SimSettings
 {
   string solver_name;

diff --git a/SimulationRuntime/cpp/Include/Core/Solver/ISolverSettings.h b/SimulationRuntime/cpp/Include/Core/Solver/ISolverSettings.h
@@ -1,5 +1,5 @@
 #pragma once
-#include <Core/SimulationSettings//IGlobalSettings.h>
+#include <Core/SimulationSettings/IGlobalSettings.h>
 //#include "Math/Implementation/Constants.h"
 /*****************************************************************************/
 /**

diff --git a/SimulationRuntime/cpp/Include/Core/System/IContinuous.h b/SimulationRuntime/cpp/Include/Core/System/IContinuous.h
@@ -107,7 +107,8 @@ class IContinuous
     virtual bool evaluateConditions(const UPDATETYPE command = UNDEF_UPDATE)= 0;
 
     virtual bool stepCompleted(double time) = 0;
-  virtual bool stepStarted(double time) = 0;
+    virtual bool stepStarted(double time) = 0;
+
 };
 
 /*

diff --git a/SimulationRuntime/cpp/Include/Core/System/IMixedSystem.h b/SimulationRuntime/cpp/Include/Core/System/IMixedSystem.h
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <Core/Modelica.h>
 /*****************************************************************************/
 /**
 

diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryConfig.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryConfig.h
@@ -2,7 +2,7 @@
 
 /*Defines*/
 #define PATH string
-#include <VxWorksFactory/VxWorksFactory.h>
+#include <SimCoreFactory/VxWorksFactory/VxWorksFactory.h>
 
 #elif defined(__TRICORE__)