#2031 Curve Calculator : Use unique_ptr

This commit is contained in:
Magne Sjaastad 2017-10-23 20:20:18 +02:00
parent 8cde20d662
commit dc82888ede
2 changed files with 5 additions and 3 deletions

View File

@ -84,7 +84,7 @@ void RimCalculatedSummaryCase::createSummaryReaderInterface()
RimSummaryCalculationCollection* calculationCollection = nullptr;
this->firstAncestorOrThisOfTypeAsserted(calculationCollection);
m_calculatedCurveReader = new RifCalculatedSummaryCurveReader(calculationCollection);
m_calculatedCurveReader.reset(new RifCalculatedSummaryCurveReader(calculationCollection));
m_calculatedCurveReader->buildMetaData();
}
@ -97,7 +97,7 @@ RifSummaryReaderInterface* RimCalculatedSummaryCase::summaryReader()
{
if (!m_calculatedCurveReader) createSummaryReaderInterface();
return m_calculatedCurveReader;
return m_calculatedCurveReader.get();
}
//--------------------------------------------------------------------------------------------------

View File

@ -21,6 +21,8 @@
#include "RimSummaryCase.h"
#include "RifSummaryReaderInterface.h"
#include <memory>
class RifCalculatedSummaryCurveReader;
class RimSummaryCalculation;
class RimSummaryCalculationCollection;
@ -45,5 +47,5 @@ public:
void buildMetaData();
private:
RifCalculatedSummaryCurveReader* m_calculatedCurveReader;
std::unique_ptr<RifCalculatedSummaryCurveReader> m_calculatedCurveReader;
};