Commit f0f07d2f authored by Santiago Ospina De Los Ríos's avatar Santiago Ospina De Los Ríos
Browse files

Merge branch 'master' into releases/2.7

parents e60044ed 2c595d08
Pipeline #33751 failed
......@@ -12,8 +12,7 @@ debian:10-gcc-8-17:
image: registry.dune-project.org/docker/ci/dune:git-debian-10-gcc-8-17
script: duneci-standard-test
tags:
- "cores:2"
- "mem:8G"
- "cores:4"
artifacts:
expire_in: 2 years
reports:
......@@ -23,8 +22,7 @@ debian:10-clang-7-libcpp-17:
image: registry.dune-project.org/docker/ci/dune:git-debian-10-clang-7-libcpp-17
script: duneci-standard-test
tags:
- "cores:2"
- "mem:8G"
- "cores:4"
artifacts:
expire_in: 2 years
reports:
......
......@@ -212,7 +212,13 @@ namespace fmt {
struct formatter<Dune::Logging::LazyFormatArgument<Factory,cached>,Char>
: public formatter<
std::conditional_t<
fmt::internal::is_string<
fmt::
#if FMT_VERSION < 70000
internal
#else
detail
#endif
::is_string<
std::decay_t<decltype(std::declval<Factory>()())>
>::value,
fmt::basic_string_view<Char>,
......@@ -226,7 +232,13 @@ namespace fmt {
using Result = std::decay_t<decltype(std::declval<Factory>()())>;
using Base = formatter<
std::conditional_t<
fmt::internal::is_string<Result>::value,
fmt::
#if FMT_VERSION < 70000
internal
#else
detail
#endif
::is_string<Result>::value,
fmt::basic_string_view<Char>,
Result
>,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment