blob: 60304a36ea16f30427806ba7d1e43d6b59806d19 (
plain)
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
|
From 19b070051c1c2b5fb6f2da8fb6422b27418c3dfa Mon Sep 17 00:00:00 2001
From: Kefu Chai <tchaikov@gmail.com>
Date: Mon, 15 Jul 2024 09:27:16 +0800
Subject: [PATCH] blocks,runtime: io_signature: include spdlog/*/ranges.h for
using fmt::join()
fmt::join() was moved into fmt/ranges.h since fmt 11, so let's
include the corresponding header in spdlog for using it.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
---
gnuradio-runtime/lib/io_signature.cc | 5 +++++
gr-blocks/lib/message_debug_impl.cc | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/gnuradio-runtime/lib/io_signature.cc b/gnuradio-runtime/lib/io_signature.cc
index 812f444f8..76bb2aba6 100644
--- a/gnuradio-runtime/lib/io_signature.cc
+++ b/gnuradio-runtime/lib/io_signature.cc
@@ -16,6 +16,11 @@
#include <spdlog/tweakme.h>
#include <spdlog/fmt/fmt.h>
+#if __has_include(<spdlog/fmt/ranges.h>)
+#include <spdlog/fmt/ranges.h>
+#elif __has_include(<spdlog/fmt/bundled/ranges.h>)
+#include <spdlog/fmt/bundled/ranges.h>
+#endif
#include <string_view>
#include <algorithm>
#include <memory>
diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc
index 41d312e43..373287b02 100644
--- a/gr-blocks/lib/message_debug_impl.cc
+++ b/gr-blocks/lib/message_debug_impl.cc
@@ -19,6 +19,11 @@
#include <pmt/pmt.h>
#include <spdlog/common.h>
#include <spdlog/fmt/fmt.h>
+#if __has_include(<spdlog/fmt/ranges.h>)
+#include <spdlog/fmt/ranges.h>
+#elif __has_include(<spdlog/fmt/bundled/ranges.h>)
+#include <spdlog/fmt/bundled/ranges.h>
+#endif
#include <functional>
#include <utility>
#include <vector>
--
2.45.2
|
