diff options
| author | Star Rauchenberger <fefferburbia@gmail.com> | 2022-12-14 10:19:40 -0500 |
|---|---|---|
| committer | Star Rauchenberger <fefferburbia@gmail.com> | 2022-12-14 10:19:40 -0500 |
| commit | 6218b88920120dea23d605856b9d27f9deb4746c (patch) | |
| tree | 657840cc60749db1e8ee453593211cd336462e98 /lib/filter.h | |
| parent | c498cfa5cfd6408b465e45409987467b47b2b73d (diff) | |
| download | verbly-6218b88920120dea23d605856b9d27f9deb4746c.tar.gz verbly-6218b88920120dea23d605856b9d27f9deb4746c.tar.bz2 verbly-6218b88920120dea23d605856b9d27f9deb4746c.zip | |
Migrate from mpark::variant to std::variant
Diffstat (limited to 'lib/filter.h')
| -rw-r--r-- | lib/filter.h | 10 |
1 files changed, 5 insertions, 5 deletions
| diff --git a/lib/filter.h b/lib/filter.h index 7db2773..6da30dd 100644 --- a/lib/filter.h +++ b/lib/filter.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #include <list> | 4 | #include <list> |
| 5 | #include <string> | 5 | #include <string> |
| 6 | #include <memory> | 6 | #include <memory> |
| 7 | #include "../vendor/hkutil/vendor/variant.hpp" | 7 | #include <variant> |
| 8 | #include "../vendor/hkutil/hkutil/recptr.h" | 8 | #include "../vendor/hkutil/hkutil/recptr.h" |
| 9 | #include "field.h" | 9 | #include "field.h" |
| 10 | #include "enums.h" | 10 | #include "enums.h" |
| @@ -133,8 +133,8 @@ namespace verbly { | |||
| 133 | field filterField; | 133 | field filterField; |
| 134 | comparison filterType; | 134 | comparison filterType; |
| 135 | 135 | ||
| 136 | mpark::variant< | 136 | std::variant< |
| 137 | mpark::monostate, | 137 | std::monostate, |
| 138 | rec_filter, | 138 | rec_filter, |
| 139 | std::string, | 139 | std::string, |
| 140 | int, | 140 | int, |
| @@ -154,8 +154,8 @@ namespace verbly { | |||
| 154 | }; | 154 | }; |
| 155 | 155 | ||
| 156 | using variant_type = | 156 | using variant_type = |
| 157 | mpark::variant< | 157 | std::variant< |
| 158 | mpark::monostate, | 158 | std::monostate, |
| 159 | singleton_type, | 159 | singleton_type, |
| 160 | group_type, | 160 | group_type, |
| 161 | mask_type>; | 161 | mask_type>; |