Skip to content

Commit 835f7aa

Browse files
committed
manually cherry-pick commit 320226d
1 parent ec9999e commit 835f7aa

File tree

1 file changed

+41
-0
lines changed

1 file changed

+41
-0
lines changed
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
From 409db5e910279224bd7e78f8188450c7e7d34d87 Mon Sep 17 00:00:00 2001
2+
From: Khem Raj <[email protected]>
3+
Date: Tue, 10 Sep 2024 18:11:40 -0700
4+
Subject: [PATCH] Fix instances of
5+
-Wmissing-template-arg-list-after-template-kw.
6+
7+
Clang has a new warning that requires a template argument list after using
8+
the template keyword. Remove uses of the template keyword when we're not
9+
specifying types.
10+
11+
See https://github.com/llvm/llvm-project/issues/94194 for the upstream
12+
clang changes
13+
14+
Signed-off-by: Khem Raj <[email protected]>
15+
---
16+
include/cereal/types/tuple.hpp | 4 ++--
17+
1 file changed, 2 insertions(+), 2 deletions(-)
18+
19+
diff --git a/include/cereal/types/tuple.hpp b/include/cereal/types/tuple.hpp
20+
index 80c68075..5c79eca9 100644
21+
--- a/include/cereal/types/tuple.hpp
22+
+++ b/include/cereal/types/tuple.hpp
23+
@@ -95,7 +95,7 @@ namespace cereal
24+
template <class Archive, class ... Types> inline
25+
static void apply( Archive & ar, std::tuple<Types...> & tuple )
26+
{
27+
- serialize<Height - 1>::template apply( ar, tuple );
28+
+ serialize<Height - 1>::apply( ar, tuple );
29+
ar( CEREAL_NVP_(tuple_element_name<Height - 1>::c_str(),
30+
std::get<Height - 1>( tuple )) );
31+
}
32+
@@ -116,7 +116,7 @@ namespace cereal
33+
template <class Archive, class ... Types> inline
34+
void CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, std::tuple<Types...> & tuple )
35+
{
36+
- tuple_detail::serialize<std::tuple_size<std::tuple<Types...>>::value>::template apply( ar, tuple );
37+
+ tuple_detail::serialize<std::tuple_size<std::tuple<Types...>>::value>::apply( ar, tuple );
38+
}
39+
} // namespace cereal
40+
41+

0 commit comments

Comments
 (0)