Merge branch 'master' of https://github.com/OpenModelica/OMCompiler

Conflicts: SimulationRuntime/cpp/Include/Core/Math/Array.h SimulationRuntime/cpp/Include/Core/SimulationSettings/Factory.h SimulationRuntime/cpp/Include/Core/Solver/FactoryExport.h SimulationRuntime/cpp/Include/Core/System/SimVars.h SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryConfig.h SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryPolicy.h SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticSolverOMCFactory.h SimulationRuntime/cpp/SimCoreFactory/OMCFactory/StaticOMCFactory.cpp
OpenModelica · May 26, 2015 · d32301f · d32301f
2 parents 837ddfb + 94cddf1
commit d32301f
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 1 deletion.
diff --git a/SimulationRuntime/cpp/Core/ModelicaExternalC/CMakeLists.txt b/SimulationRuntime/cpp/Core/ModelicaExternalC/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 2.8.6)
-
 project(${ModelicaExternalName})
+ADD_DEFINITIONS(-DDUMMY_FUNCTION_USERTAB)
 include_directories (${MODELICAEXTERNALCDIR})
 # include_directories (${USERTABDIR})
 add_library(${ModelicaExternalName}    ${MODELICAEXTERNALCDIR}/ModelicaStandardTables.c  ${MODELICAEXTERNALCDIR}/ModelicaMatIO.c ${MODELICAEXTERNALCDIR}/ModelicaInternal.c ${MODELICAEXTERNALCDIR}/ModelicaStrings.c) #  ${USERTABDIR}/usertab.c

diff --git a/SimulationRuntime/cpp/Include/Core/Math/Array.h b/SimulationRuntime/cpp/Include/Core/Math/Array.h
@@ -2039,3 +2039,4 @@ class DynArrayDim3 : public DynArray<T, 3>
   boost::multi_array<T, 3> &_multi_array; // refers to base class
 };
 /** @} */ // end of math
+
diff --git a/SimulationRuntime/cpp/Include/Core/SimulationSettings/Factory.h b/SimulationRuntime/cpp/Include/Core/SimulationSettings/Factory.h
@@ -31,3 +31,4 @@ class  SettingsFactory : public ISettingsFactory
   boost::shared_ptr<ISolverSettings> _solver_settings;
 };
 /** @} */ // end of coreSimulationSettings
+
diff --git a/SimulationRuntime/cpp/Include/Core/Solver/FactoryExport.h b/SimulationRuntime/cpp/Include/Core/Solver/FactoryExport.h
@@ -27,3 +27,4 @@
     error "operating system not supported"
 #endif
  /** @} */ // end of coreSolver
+
diff --git a/SimulationRuntime/cpp/Include/Core/System/SimVars.h b/SimulationRuntime/cpp/Include/Core/System/SimVars.h
@@ -140,4 +140,6 @@ class BOOST_EXTENSION_SIMVARS_DECL SimVars: public ISimVars
     //Stores all variables occurred before an event
     double* _pre_vars;
 };
+
 /** @} */ // end of coreSystem
+
diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryConfig.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryConfig.h
@@ -101,4 +101,6 @@
 #else
   #error "operating system not supported"
 #endif
+
 /** @} */ // end of simcorefactoriesPolicies
+
diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryPolicy.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryPolicy.h
@@ -104,4 +104,6 @@
 //#else
 //    #error "operating system not supported"
 #endif
+
 /** @} */ // end of simcorefactoriesPolicies
+
diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticSolverOMCFactory.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticSolverOMCFactory.h
@@ -61,4 +61,6 @@ struct StaticSolverOMCFactory : public SolverOMCFactory<CreationPolicy>
 
   }
 };
+
 /** @} */ // end of simcorefactoriesPolicies
+
diff --git a/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/StaticOMCFactory.cpp b/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/StaticOMCFactory.cpp
@@ -38,4 +38,6 @@ std::pair<boost::shared_ptr<ISimController>,SimSettings> StaticOMCFactory::creat
     boost::shared_ptr<ISimController>  simcontroller = boost::shared_ptr<ISimController>(new SimController(_library_path,_modelicasystem_path));
     return std::make_pair(simcontroller,settings);
 }
+
 /** @} */ // end of simcorefactoryOMCFactory
+