From 013ba16515e9a7d22f8f9737edd3cc20a78624b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Tue, 26 Jun 2018 09:00:19 +0200 Subject: [PATCH] Fix cotire build issues --- ApplicationCode/FileInterface/RifDerivedEnsembleReader.cpp | 6 ++++-- ApplicationCode/FileInterface/RifDerivedEnsembleReader.h | 2 ++ .../ProjectDataModel/Summary/RimDerivedEnsembleCase.cpp | 4 ++-- .../ProjectDataModel/Summary/RimDerivedEnsembleCase.h | 4 ++++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ApplicationCode/FileInterface/RifDerivedEnsembleReader.cpp b/ApplicationCode/FileInterface/RifDerivedEnsembleReader.cpp index bf8d460572..839bfa1f92 100644 --- a/ApplicationCode/FileInterface/RifDerivedEnsembleReader.cpp +++ b/ApplicationCode/FileInterface/RifDerivedEnsembleReader.cpp @@ -20,8 +20,10 @@ #include "RimDerivedEnsembleCase.h" - -static const std::vector EMPTY_TIME_STEPS_VECTOR; +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +const std::vector RifDerivedEnsembleReader::EMPTY_TIME_STEPS_VECTOR; //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationCode/FileInterface/RifDerivedEnsembleReader.h b/ApplicationCode/FileInterface/RifDerivedEnsembleReader.h index 39a10dc7bf..21bb7b2d61 100644 --- a/ApplicationCode/FileInterface/RifDerivedEnsembleReader.h +++ b/ApplicationCode/FileInterface/RifDerivedEnsembleReader.h @@ -30,6 +30,8 @@ class RimDerivedEnsembleCase; //================================================================================================== class RifDerivedEnsembleReader : public RifSummaryReaderInterface { + static const std::vector EMPTY_TIME_STEPS_VECTOR; + public: RifDerivedEnsembleReader(RimDerivedEnsembleCase* derivedCase); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCase.cpp index 902f4fa907..24731c0c6d 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCase.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCase.cpp @@ -40,8 +40,8 @@ CAF_PDM_ABSTRACT_SOURCE_INIT(RimDerivedEnsembleCase, "RimDerivedEnsembleCase"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -static const std::vector EMPTY_TIME_STEPS_VECTOR; -static const std::vector EMPTY_VALUES_VECTOR; +const std::vector RimDerivedEnsembleCase::EMPTY_TIME_STEPS_VECTOR; +const std::vector RimDerivedEnsembleCase::EMPTY_VALUES_VECTOR; //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCase.h b/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCase.h index 379e385f9b..5105a60a59 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCase.h +++ b/ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCase.h @@ -46,6 +46,10 @@ enum DerivedEnsembleOperator class RimDerivedEnsembleCase : public RimSummaryCase { CAF_PDM_HEADER_INIT; + + static const std::vector EMPTY_TIME_STEPS_VECTOR; + static const std::vector EMPTY_VALUES_VECTOR; + public: RimDerivedEnsembleCase(); ~RimDerivedEnsembleCase();