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 · 9ca7f93 · 9ca7f93
2 parents d32301f + 13d2ab8
commit 9ca7f93
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 4 deletions.
diff --git a/SimulationRuntime/cpp/Include/Core/Math/Array.h b/SimulationRuntime/cpp/Include/Core/Math/Array.h
@@ -2008,7 +2008,7 @@ class DynArrayDim3 : public DynArray<T, 3>
     }
     return *this;
   }
-
+ 
   void setDims(size_t size1, size_t size2, size_t size3)
   {
     _multi_array.resize(boost::extents[size1][size2][size3]);

diff --git a/SimulationRuntime/cpp/Include/Core/SimulationSettings/Factory.h b/SimulationRuntime/cpp/Include/Core/SimulationSettings/Factory.h
@@ -3,7 +3,7 @@
  *  Module for simulation settings
  *  @{
  */
-
+ 
 /*includes removed for static linking not needed any more
 #ifdef RUNTIME_STATIC_LINKING
 #include <Core/SimulationSettings//ISettingsFactory.h>

diff --git a/SimulationRuntime/cpp/Include/Core/Solver/FactoryExport.h b/SimulationRuntime/cpp/Include/Core/Solver/FactoryExport.h
@@ -11,7 +11,7 @@
 #define BOOST_EXTENSION_MONITOR_DECL
 
 #elif defined(RUNTIME_STATIC_LINKING)
-
+ 
 #define BOOST_EXTENSION_SOLVER_DECL
 #define BOOST_EXTENSION_STATESELECT_DECL
 #define BOOST_EXTENSION_SOLVERSETTINGS_DECL
@@ -26,5 +26,6 @@
 #else
     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
@@ -13,6 +13,7 @@ template<typename T>
 class AlignedArray
 #else
  */
+
 class BOOST_EXTENSION_SIMVARS_DECL AlignedArray
 /*#endif*/
 {

diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryConfig.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryConfig.h
@@ -101,6 +101,10 @@
 #else
   #error "operating system not supported"
 #endif
+<<<<<<< HEAD
 
 /** @} */ // end of simcorefactoriesPolicies
 
+=======
+/** @} */ // end of simcorefactoriesPolicies
+>>>>>>> 13d2ab883a13322c1dcc46f5ccf2683d20e49b75
diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryPolicy.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/FactoryPolicy.h
@@ -104,6 +104,10 @@
 //#else
 //    #error "operating system not supported"
 #endif
+<<<<<<< HEAD
 
 /** @} */ // end of simcorefactoriesPolicies
 
+=======
+/** @} */ // end of simcorefactoriesPolicies
+>>>>>>> 13d2ab883a13322c1dcc46f5ccf2683d20e49b75
diff --git a/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticSolverOMCFactory.h b/SimulationRuntime/cpp/Include/SimCoreFactory/Policies/StaticSolverOMCFactory.h
@@ -61,6 +61,10 @@ struct StaticSolverOMCFactory : public SolverOMCFactory<CreationPolicy>
 
   }
 };
+<<<<<<< HEAD
 
 /** @} */ // end of simcorefactoriesPolicies
 
+=======
+/** @} */ // end of simcorefactoriesPolicies
+>>>>>>> 13d2ab883a13322c1dcc46f5ccf2683d20e49b75
diff --git a/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/StaticOMCFactory.cpp b/SimulationRuntime/cpp/SimCoreFactory/OMCFactory/StaticOMCFactory.cpp
@@ -38,6 +38,5 @@ 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