From 9c991241c0bb6fad8860def8e2615e0fe481d042 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 12 Dec 2019 11:09:17 +0100 Subject: [PATCH] changed: make UDQASTNode part of public API needed for serialization --- CMakeLists_files.cmake | 1 + .../parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp | 0 .../parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp | 3 +-- src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.cpp | 2 +- src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParser.hpp | 3 +-- 5 files changed, 4 insertions(+), 5 deletions(-) rename {src/opm => opm}/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp (100%) diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake index 3a49cd8c0..0d3fb906f 100644 --- a/CMakeLists_files.cmake +++ b/CMakeLists_files.cmake @@ -651,6 +651,7 @@ if(ENABLE_ECL_INPUT) opm/parser/eclipse/EclipseState/checkDeck.hpp opm/parser/eclipse/EclipseState/Runspec.hpp opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp + opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.hpp opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQContext.hpp opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp b/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp similarity index 100% rename from src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp rename to opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.hpp diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp index 0304c3652..a9ca10054 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp @@ -18,12 +18,11 @@ */ #include +#include #include #include #include -#include "UDQASTNode.hpp" - namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.cpp index af03f017b..e2bb83b5a 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQDefine.cpp @@ -23,12 +23,12 @@ #include #include +#include #include #include #include "../../../Parser/raw/RawConsts.hpp" #include "UDQParser.hpp" -#include "UDQASTNode.hpp" namespace Opm { diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParser.hpp b/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParser.hpp index d2a9bd80c..3720aa942 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParser.hpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParser.hpp @@ -23,12 +23,11 @@ #include #include +#include #include #include #include -#include "UDQASTNode.hpp" - namespace Opm { class ParseContext;