mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Fix cotire build errors
This commit is contained in:
parent
b72091bb94
commit
e4ef9bd014
@ -347,6 +347,9 @@ if(RESINSIGHT_ENABLE_COTIRE)
|
|||||||
ReservoirDataModel/RigTransmissibilityCondenser.cpp
|
ReservoirDataModel/RigTransmissibilityCondenser.cpp
|
||||||
ReservoirDataModel/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp
|
ReservoirDataModel/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp
|
||||||
ReservoirDataModel/RigCellGeometryTools.cpp
|
ReservoirDataModel/RigCellGeometryTools.cpp
|
||||||
|
|
||||||
|
# exclude test files due to cotire redefinition error report
|
||||||
|
UnitTests/RifCaseRealizationParametersReader-Test.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
foreach (fileToExclude ${COTIRE_EXCLUDE_FILES})
|
foreach (fileToExclude ${COTIRE_EXCLUDE_FILES})
|
||||||
|
@ -20,6 +20,8 @@
|
|||||||
|
|
||||||
#include "RiaStdStringTools.h"
|
#include "RiaStdStringTools.h"
|
||||||
|
|
||||||
|
#include <QTextStream>
|
||||||
|
|
||||||
#include "cvfAssert.h"
|
#include "cvfAssert.h"
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@ -515,3 +517,22 @@ bool operator<(const RifEclipseSummaryAddress& first, const RifEclipseSummaryAdd
|
|||||||
}
|
}
|
||||||
return false;
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
@ -20,6 +20,8 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <map>
|
#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);
|
||||||
|
|
||||||
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);
|
||||||
|
@ -48,19 +48,6 @@
|
|||||||
#include <QKeyEvent>
|
#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
|
namespace caf
|
||||||
{
|
{
|
||||||
template<>
|
template<>
|
||||||
|
@ -54,22 +54,6 @@
|
|||||||
#include <QMessageBox>
|
#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");
|
CAF_PDM_SOURCE_INIT(RimSummaryCurve, "SummaryCurve");
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
Loading…
Reference in New Issue
Block a user