Linux compile fixes

This commit is contained in:
Jacob Storen 2015-06-04 07:46:33 -07:00
parent adb6d965de
commit 3e06028690
2 changed files with 2 additions and 2 deletions

View File

@ -94,7 +94,7 @@ std::map<std::string, std::vector<std::string> > RigFemPartResultsCollection::sc
RigFemScalarResultFrames* RigFemPartResultsCollection::findOrLoadScalarResult(int partIndex,
const RigFemResultAddress& resVarAddr)
{
CVF_ASSERT(partIndex < m_femPartResults.size());
CVF_ASSERT(partIndex < (int)(m_femPartResults.size()));
CVF_ASSERT(m_readerInterface.notNull());
RigFemScalarResultFrames* frames = m_femPartResults[partIndex]->findScalarResult(resVarAddr);

View File

@ -55,7 +55,7 @@ public:
RifOdbBulkDataGetter(const odb_FieldBulkData& bulkData) : m_bulkData(bulkData), m_data(NULL) {};
virtual ~RifOdbBulkDataGetter() { if (m_data) delete m_data; }
float* RifOdbBulkDataGetter::data()
float* data()
{
odb_Enum::odb_PrecisionEnum precision = m_bulkData.precision();
if (precision == odb_Enum::SINGLE_PRECISION)