fix for merger error in cpp template

OpenModelica · Sep 25, 2015 · 3fb3c9b · 3fb3c9b
1 parent 9aa4b65
commit 3fb3c9b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -6024,11 +6024,11 @@ case SIMCODE(modelInfo = MODELINFO(__),makefileParams = MAKEFILE_PARAMS(__))  th
         else
         <<
         #if defined(__vxworks)
-        _reader  = new XmlPropertyReader("/SYSTEM/bundles/com.boschrexroth.<%modelname%>/OMCpp<%fileNamePrefix%>Init.xml");
+        _reader  = boost::shared_ptr<IPropertyReader>(new XmlPropertyReader("/SYSTEM/bundles/com.boschrexroth.<%modelname%>/OMCpp<%fileNamePrefix%>Init.xml"));
         #else
-        _reader  = new XmlPropertyReader("<%makefileParams.compileDir%>/OMCpp<%fileNamePrefix%>Init.xml");
+        _reader  =  boost::shared_ptr<IPropertyReader>(new XmlPropertyReader("<%makefileParams.compileDir%>/OMCpp<%fileNamePrefix%>Init.xml"));
         #endif
-        reader->readInitialValues(*this, _sim_vars);
+        _reader->readInitialValues(*this, _sim_vars);
 
         >>
         %>      initializeFreeVariables();
@@ -7062,7 +7062,7 @@ case SIMCODE(modelInfo = MODELINFO(__),simulationSettingsOpt = SOME(settings as
       /* HistoryImplType::value_type_v v;
       HistoryImplType::value_type_dv v2; */
 
-      const HistoryImplType::values_type container = boost::make_tuple(outputRealVars.outputVars,outputIntVars.outputVars,outputBoolVars.outputVars,_simTime);
+      const HistoryImplType::values_type& container = _historyImpl->getFreeContainer();
 
 
       <%if Flags.isSet(Flags.WRITE_TO_BUFFER) then

diff --git a/SimulationRuntime/cpp/Include/Core/DataExchange/Writer.h b/SimulationRuntime/cpp/Include/Core/DataExchange/Writer.h
@@ -73,17 +73,11 @@ class Writer
 		,_threadWorkDone(false)
 #endif
 	{
-		/*for (int i = 0; i < CONTAINER_COUNT; ++i)
+		for (int i = 0; i < CONTAINER_COUNT; ++i)
 		{
-			boost::shared_ptr<real_vars_t> realVars = boost::shared_ptr<real_vars_t>(new real_vars_t());
-			boost::shared_ptr<int_vars_t> intVars = boost::shared_ptr<int_vars_t>(new int_vars_t());
-            boost::shared_ptr<bool_vars_t> boolVars = boost::shared_ptr<bool_vars_t>(new bool_vars_t());
-			boost::shared_ptr<values_type> vars = boost::shared_ptr<values_type>(new values_type());
-			get < 0 > (*vars) = realVars;
-			get < 1 > (*vars) = intVars;
-            get < 2 > (*vars) = boolVars;
+			 values_type vars = boost::make_tuple(real_vars_t(),int_vars_t(),bool_vars_t(),0.0);
 			_freeContainers.push_back(vars);
-		}*/
+		}
 	}
 
 	virtual ~Writer()