remove dummy LoadLibrary from static Cpp runtime

OpenModelica · Oct 20, 2015 · 300f04e · 300f04e
1 parent ea09fa1
commit 300f04e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryPolicy.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryPolicy.h
@@ -79,12 +79,6 @@
   #include <Core/Solver/FactoryExport.h>
   #include <Core/Solver/SolverSettings.h>
   #include <Core/SimulationSettings/IGlobalSettings.h>
-  /*Base Policy include*/
-  #include <SimCoreFactory/Policies/SolverOMCFactory.h>
-  #include <SimCoreFactory/Policies/SolverSettingsOMCFactory.h>
-  #include <SimCoreFactory/Policies/SystemOMCFactory.h>
-  #include <SimCoreFactory/Policies/NonLinSolverOMCFactory.h>
-  #include <SimCoreFactory/Policies/LinSolverOMCFactory.h>
   /*Policy include*/
   #include <SimCoreFactory/Policies/StaticSolverOMCFactory.h>
   #include <SimCoreFactory/Policies/StaticSolverSettingsOMCFactory.h>
@@ -96,13 +90,6 @@
   class BaseOMCFactory {
   public:
     BaseOMCFactory(PATH library_path, PATH modelicasystem_path) {}
-    void UnloadAllLibs() {}
-    LOADERRESULT LoadLibrary(string libName, type_map& current_map) {
-      return LOADER_SUCCESS;
-    }
-    LOADERRESULT UnloadLibrary(shared_library lib) {
-      return LOADER_SUCCESS;
-    }
   };
   typedef BaseOMCFactory BaseFactory;
   typedef StaticSystemOMCFactory<BaseFactory> SimControllerPolicy;

diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticSolverSettingsOMCFactory.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticSolverSettingsOMCFactory.h
@@ -15,19 +15,23 @@ Policy class to create solver settings object
 shared_ptr<ISolverSettings> createIdaSettings(shared_ptr<IGlobalSettings> globalSettings);
 shared_ptr<ISolverSettings> createCVodeSettings(shared_ptr<IGlobalSettings> globalSettings);
 template <class CreationPolicy>
-struct StaticSolverSettingsOMCFactory : public  SolverSettingsOMCFactory<CreationPolicy>
+struct StaticSolverSettingsOMCFactory : public ObjectFactory<CreationPolicy>
 {
 
 public:
     StaticSolverSettingsOMCFactory(PATH library_path,PATH modelicasystem_path,PATH config_path)
-        :SolverSettingsOMCFactory<CreationPolicy>(library_path,modelicasystem_path,config_path)
+        :ObjectFactory<CreationPolicy>(library_path,modelicasystem_path,config_path)
     {
     }
 
     virtual ~StaticSolverSettingsOMCFactory()
     {
     }
 
+    void loadGlobalSettings(shared_ptr<IGlobalSettings> global_settings)
+    {
+    }
+
     virtual shared_ptr<ISolverSettings> createSolverSettings(string solvername,shared_ptr<IGlobalSettings> globalSettings)
     {
         if((solvername.compare("cvode")==0)||(solvername.compare("dassl")==0))
@@ -44,4 +48,4 @@ struct StaticSolverSettingsOMCFactory : public  SolverSettingsOMCFactory<Creatio
             throw ModelicaSimulationError(MODEL_FACTORY,"Selected Solver is not available");
     }
 };
-/** @} */ // end of simcorefactoriesPolicies
+/** @} */ // end of simcorefactoriesPolicies