From 3e06028690cb22529940cb2f04e1832c3c67a4b4 Mon Sep 17 00:00:00 2001 From: Jacob Storen Date: Thu, 4 Jun 2015 07:46:33 -0700 Subject: [PATCH] Linux compile fixes --- .../GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp | 2 +- ApplicationCode/GeoMech/OdbReader/RifOdbReader.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp index d54f352ce1..48f3675fa4 100644 --- a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp +++ b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp @@ -94,7 +94,7 @@ std::map > 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); diff --git a/ApplicationCode/GeoMech/OdbReader/RifOdbReader.cpp b/ApplicationCode/GeoMech/OdbReader/RifOdbReader.cpp index 60c9166190..0533012fce 100644 --- a/ApplicationCode/GeoMech/OdbReader/RifOdbReader.cpp +++ b/ApplicationCode/GeoMech/OdbReader/RifOdbReader.cpp @@ -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)