fix for cpp runtime release build

OpenModelica · Nov 25, 2015 · 7014278 · 7014278
1 parent ee4f5b6
commit 7014278
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/OMCFactory/OMCFactory.h b/SimulationRuntime/cpp/Include/SimCoreFactory/OMCFactory/OMCFactory.h
@@ -8,6 +8,12 @@
 #define LOADER_ERROR_UNDEFINED_REFERENCES   ( -2 )
 #define LOADER_ERROR_FILE_NOT_FOUND         ( -3 )
 #define LOADER_ERROR_FUNC_NOT_FOUND         ( -4 )
+
+    /** Minimal OMCFactory for statically linked solvers */
+  class BaseOMCFactory {
+  public:
+    BaseOMCFactory(PATH library_path, PATH modelicasystem_path) {}
+  };
 typedef int LOADERRESULT;
 class ISimController;
 struct SimSettings;

diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryConfig.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryConfig.h
@@ -102,11 +102,7 @@
   #include <Core/SimulationSettings/ISimControllerSettings.h>
   #include <Core/SimController/ISimController.h>
 
-  /** Minimal OMCFactory for statically linked solvers */
-  class BaseOMCFactory {
-  public:
-    BaseOMCFactory(PATH library_path, PATH modelicasystem_path) {}
-  };
+
 
 #else
   #error "operating system not supported"

diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryPolicy.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryPolicy.h
@@ -60,7 +60,8 @@
 
 #elif defined(OMC_BUILD) && !defined(RUNTIME_STATIC_LINKING)
 
-  /*Policy include*/
+
+    /*Policy include*/
     #include <SimCoreFactory/Policies/SolverOMCFactory.h>
     #include <SimCoreFactory/Policies/SolverSettingsOMCFactory.h>
     #include <SimCoreFactory/Policies/SystemOMCFactory.h>
@@ -77,7 +78,7 @@
     typedef SolverSettingsOMCFactory<BaseFactory> SolverSettingsPolicy;
 
 #elif defined(OMC_BUILD) && defined(RUNTIME_STATIC_LINKING)
-
+ 
   /*Policy include*/
   #include <SimCoreFactory/Policies/StaticSolverOMCFactory.h>
   #include <SimCoreFactory/Policies/StaticSolverSettingsOMCFactory.h>