From ab6211efca31ccd3816a80135221c22664fb2d82 Mon Sep 17 00:00:00 2001
From: Nana Sakisaka <1901813+saki7@users.noreply.github.com>
Date: Mon, 24 Aug 2026 10:27:24 +0900
Subject: [PATCH 1/2] Update iris
---
modules/iris | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/iris b/modules/iris
index f789eafe3..31f7d1493 160000
--- a/modules/iris
+++ b/modules/iris
@@ -1 +1 @@
-Subproject commit f789eafe3c31f3b1ea843af91e26f19d3e26612a
+Subproject commit 31f7d14936b6134428e864159ce88c19de66acde
From 1503f774879650248dc507e90126d5b3814bc242 Mon Sep 17 00:00:00 2001
From: Nana Sakisaka <1901813+saki7@users.noreply.github.com>
Date: Mon, 24 Aug 2026 10:32:51 +0900
Subject: [PATCH 2/2] Update alloy interface
---
test/x4/alloy_wrong_substitute.cpp | 4 ++--
test/x4/alternative.cpp | 10 ++++++----
test/x4/optional.cpp | 5 +++--
test/x4/rule3.cpp | 5 +++--
test/x4/symbols3.cpp | 5 +++--
5 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/test/x4/alloy_wrong_substitute.cpp b/test/x4/alloy_wrong_substitute.cpp
index 4df41ed5e..28d32b350 100644
--- a/test/x4/alloy_wrong_substitute.cpp
+++ b/test/x4/alloy_wrong_substitute.cpp
@@ -27,7 +27,7 @@ namespace iris::alloy {
template<>
struct adaptor
{
- using getters_list = make_getters_list<
+ using getters_list = iris::constant_list<
&A::foo,
&A::bar
>;
@@ -36,7 +36,7 @@ struct adaptor
template<>
struct adaptor
{
- using getters_list = make_getters_list<
+ using getters_list = iris::constant_list<
&B::hoge,
&B::fuga
>;
diff --git a/test/x4/alternative.cpp b/test/x4/alternative.cpp
index 3b758cfd4..2fc315f64 100644
--- a/test/x4/alternative.cpp
+++ b/test/x4/alternative.cpp
@@ -50,13 +50,15 @@ struct di_include
};
template<>
-struct alloy::adaptor {
- using getters_list = make_getters_list<&di_ignore::text>;
+struct alloy::adaptor
+{
+ using getters_list = iris::constant_list<&di_ignore::text>;
};
template<>
-struct alloy::adaptor {
- using getters_list = make_getters_list<&di_include::FileName>;
+struct alloy::adaptor
+{
+ using getters_list = iris::constant_list<&di_include::FileName>;
};
struct undefined {};
diff --git a/test/x4/optional.cpp b/test/x4/optional.cpp
index 93c89346f..a781d7ef0 100644
--- a/test/x4/optional.cpp
+++ b/test/x4/optional.cpp
@@ -37,8 +37,9 @@ struct adata
};
template<>
-struct alloy::adaptor {
- using getters_list = make_getters_list<&adata::a, &adata::b>;
+struct alloy::adaptor
+{
+ using getters_list = iris::constant_list<&adata::a, &adata::b>;
};
namespace {
diff --git a/test/x4/rule3.cpp b/test/x4/rule3.cpp
index 11f658cf6..b3abb01c7 100644
--- a/test/x4/rule3.cpp
+++ b/test/x4/rule3.cpp
@@ -86,8 +86,9 @@ struct recursive_tuple
};
template<>
-struct alloy::adaptor {
- using getters_list = make_getters_list<&recursive_tuple::value, &recursive_tuple::children>;
+struct alloy::adaptor
+{
+ using getters_list = iris::constant_list<&recursive_tuple::value, &recursive_tuple::children>;
};
// regression test for #461
diff --git a/test/x4/symbols3.cpp b/test/x4/symbols3.cpp
index 6649ddf68..b97751248 100644
--- a/test/x4/symbols3.cpp
+++ b/test/x4/symbols3.cpp
@@ -31,8 +31,9 @@ struct roman
};
template<>
-struct alloy::adaptor {
- using getters_list = make_getters_list<&roman::a, &roman::b, &roman::c>;
+struct alloy::adaptor
+{
+ using getters_list = iris::constant_list<&roman::a, &roman::b, &roman::c>;
};
namespace {