1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Mon, 11 Nov 2024 11:57:46 +0100
Subject: fixed: fmt::join is in ranges.h using {{fmt11}}
Backported fix from upstream's master.
---
opm/input/eclipse/EclipseState/EclipseState.cpp | 1 +
opm/input/eclipse/EclipseState/Grid/FaceDir.cpp | 1 +
opm/input/eclipse/Schedule/Action/ASTNode.cpp | 1 +
opm/input/eclipse/Schedule/Well/WellKeywordHandlers.cpp | 1 +
opm/io/eclipse/rst/state.cpp | 2 ++
tests/test_AggregateActionxData.cpp | 1 +
6 files changed, 7 insertions(+)
diff --git a/opm/input/eclipse/EclipseState/EclipseState.cpp b/opm/input/eclipse/EclipseState/EclipseState.cpp
index 303ed62..a43f336 100644
--- a/opm/input/eclipse/EclipseState/EclipseState.cpp
+++ b/opm/input/eclipse/EclipseState/EclipseState.cpp
@@ -55,6 +55,7 @@
#include <opm/input/eclipse/Parser/ParserKeywords/T.hpp>
#include <fmt/format.h>
+#include <fmt/ranges.h>
#include <cstddef>
#include <filesystem>
diff --git a/opm/input/eclipse/EclipseState/Grid/FaceDir.cpp b/opm/input/eclipse/EclipseState/Grid/FaceDir.cpp
index ffc00f4..1aa7229 100644
--- a/opm/input/eclipse/EclipseState/Grid/FaceDir.cpp
+++ b/opm/input/eclipse/EclipseState/Grid/FaceDir.cpp
@@ -22,6 +22,7 @@
#include <opm/input/eclipse/EclipseState/Grid/FaceDir.hpp>
#include <fmt/format.h>
+#include <fmt/ranges.h>
namespace Opm {
diff --git a/opm/input/eclipse/Schedule/Action/ASTNode.cpp b/opm/input/eclipse/Schedule/Action/ASTNode.cpp
index a82b257..952dfe7 100644
--- a/opm/input/eclipse/Schedule/Action/ASTNode.cpp
+++ b/opm/input/eclipse/Schedule/Action/ASTNode.cpp
@@ -35,6 +35,7 @@
#include <vector>
#include <fmt/format.h>
+#include <fmt/ranges.h>
namespace {
std::string strip_quotes(const std::string& s)
diff --git a/opm/input/eclipse/Schedule/Well/WellKeywordHandlers.cpp b/opm/input/eclipse/Schedule/Well/WellKeywordHandlers.cpp
index 73726e8..36d55a9 100644
--- a/opm/input/eclipse/Schedule/Well/WellKeywordHandlers.cpp
+++ b/opm/input/eclipse/Schedule/Well/WellKeywordHandlers.cpp
@@ -48,6 +48,7 @@
#include "../HandlerContext.hpp"
#include <fmt/format.h>
+#include <fmt/ranges.h>
#include <algorithm>
#include <memory>
diff --git a/opm/io/eclipse/rst/state.cpp b/opm/io/eclipse/rst/state.cpp
index 67cb13f..ef05f31 100644
--- a/opm/io/eclipse/rst/state.cpp
+++ b/opm/io/eclipse/rst/state.cpp
@@ -53,6 +53,8 @@
#include <numeric>
#include <optional>
+#include <boost/range.hpp>
+
namespace {
std::string
udq_define(const std::vector<std::string>& zudl,
diff --git a/tests/test_AggregateActionxData.cpp b/tests/test_AggregateActionxData.cpp
index 2691b8d..e557916 100644
--- a/tests/test_AggregateActionxData.cpp
+++ b/tests/test_AggregateActionxData.cpp
@@ -51,6 +51,7 @@
#include <vector>
#include <fmt/format.h>
+#include <fmt/ranges.h>
#include "tests/WorkArea.hpp"
|
