OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-09 23:16:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix cotire build errors

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-04-09 10:08:50 +02:00
parent b72091bb94
commit e4ef9bd014
5 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/CMakeLists.txt
View File

@ -347,6 +347,9 @@ if(RESINSIGHT_ENABLE_COTIRE)
ReservoirDataModel/RigTransmissibilityCondenser.cpp
ReservoirDataModel/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp
ReservoirDataModel/RigCellGeometryTools.cpp
# exclude test files due to cotire redefinition error report
UnitTests/RifCaseRealizationParametersReader-Test.cpp
)
foreach (fileToExclude ${COTIRE_EXCLUDE_FILES})

21
ApplicationCode/FileInterface/RifEclipseSummaryAddress.cpp
View File

@ -20,6 +20,8 @@
#include "RiaStdStringTools.h"
#include <QTextStream>
#include "cvfAssert.h"
//--------------------------------------------------------------------------------------------------
@ -515,3 +517,22 @@ bool operator<(const RifEclipseSummaryAddress& first, const RifEclipseSummaryAdd
}
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QTextStream& operator << (QTextStream& str, const RifEclipseSummaryAddress& sobj)
{
CVF_ASSERT(false);
return str;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QTextStream& operator >> (QTextStream& str, RifEclipseSummaryAddress& sobj)
{
CVF_ASSERT(false);
return str;
}

6
ApplicationCode/FileInterface/RifEclipseSummaryAddress.h
View File

@ -20,6 +20,8 @@
#include <string>
#include <map>
class QTextStream;
//==================================================================================================
//
//
@ -166,3 +168,7 @@ private:
bool operator==(const RifEclipseSummaryAddress& first, const RifEclipseSummaryAddress& second);
bool operator<(const RifEclipseSummaryAddress& first, const RifEclipseSummaryAddress& second);
QTextStream& operator << (QTextStream& str, const RifEclipseSummaryAddress& sobj);
QTextStream& operator >> (QTextStream& str, RifEclipseSummaryAddress& sobj);

13
ApplicationCode/ProjectDataModel/Summary/RimEnsambleCurveSet.cpp
View File

@ -48,19 +48,6 @@
#include <QKeyEvent>
// See also corresponding fake implementations in RimSummaryCurveFilter
static QTextStream& operator << (QTextStream& str, const RifEclipseSummaryAddress& sobj)
{
CVF_ASSERT(false);
return str;
}
static QTextStream& operator >> (QTextStream& str, RifEclipseSummaryAddress& sobj)
{
CVF_ASSERT(false);
return str;
}
namespace caf
{
template<>

16
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@ -54,22 +54,6 @@
#include <QMessageBox>
// See also corresponding fake implementations in RimSummaryCurveFilter
QTextStream& operator << (QTextStream& str, const RifEclipseSummaryAddress& sobj)
{
CVF_ASSERT(false);
return str;
}
QTextStream& operator >> (QTextStream& str, RifEclipseSummaryAddress& sobj)
{
CVF_ASSERT(false);
return str;
}
CAF_PDM_SOURCE_INIT(RimSummaryCurve, "SummaryCurve");
//--------------------------------------------------------------------------------------------------