Skip to content

Commit 74f0da4

Browse files
authored
Merge pull request #92 from iris-cpp/update-iris
Update iris
2 parents 93f5a12 + 1503f77 commit 74f0da4

6 files changed

Lines changed: 18 additions & 13 deletions

File tree

test/x4/alloy_wrong_substitute.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace iris::alloy {
2727
template<>
2828
struct adaptor<A>
2929
{
30-
using getters_list = make_getters_list<
30+
using getters_list = iris::constant_list<
3131
&A::foo,
3232
&A::bar
3333
>;
@@ -36,7 +36,7 @@ struct adaptor<A>
3636
template<>
3737
struct adaptor<B>
3838
{
39-
using getters_list = make_getters_list<
39+
using getters_list = iris::constant_list<
4040
&B::hoge,
4141
&B::fuga
4242
>;

test/x4/alternative.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,15 @@ struct di_include
5050
};
5151

5252
template<>
53-
struct alloy::adaptor<di_ignore> {
54-
using getters_list = make_getters_list<&di_ignore::text>;
53+
struct alloy::adaptor<di_ignore>
54+
{
55+
using getters_list = iris::constant_list<&di_ignore::text>;
5556
};
5657

5758
template<>
58-
struct alloy::adaptor<di_include> {
59-
using getters_list = make_getters_list<&di_include::FileName>;
59+
struct alloy::adaptor<di_include>
60+
{
61+
using getters_list = iris::constant_list<&di_include::FileName>;
6062
};
6163

6264
struct undefined {};

test/x4/optional.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ struct adata
3737
};
3838

3939
template<>
40-
struct alloy::adaptor<adata> {
41-
using getters_list = make_getters_list<&adata::a, &adata::b>;
40+
struct alloy::adaptor<adata>
41+
{
42+
using getters_list = iris::constant_list<&adata::a, &adata::b>;
4243
};
4344

4445
namespace {

test/x4/rule3.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,9 @@ struct recursive_tuple
8686
};
8787

8888
template<>
89-
struct alloy::adaptor<recursive_tuple> {
90-
using getters_list = make_getters_list<&recursive_tuple::value, &recursive_tuple::children>;
89+
struct alloy::adaptor<recursive_tuple>
90+
{
91+
using getters_list = iris::constant_list<&recursive_tuple::value, &recursive_tuple::children>;
9192
};
9293

9394
// regression test for #461

test/x4/symbols3.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ struct roman
3131
};
3232

3333
template<>
34-
struct alloy::adaptor<roman> {
35-
using getters_list = make_getters_list<&roman::a, &roman::b, &roman::c>;
34+
struct alloy::adaptor<roman>
35+
{
36+
using getters_list = iris::constant_list<&roman::a, &roman::b, &roman::c>;
3637
};
3738

3839
namespace {

0 commit comments

Comments
 (0)