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:42:27 -0500 |
| commit | e4fe5974f123cfba6d8eff908e7f1772b0b9635f (patch) | |
| tree | 69477cee57289107f2081eafecb95ffbcb4c47fa /lib/token.h | |
| parent | 2f938ddd17190497e21194a0ef3e1cfa14f68943 (diff) | |
| download | verbly-e4fe5974f123cfba6d8eff908e7f1772b0b9635f.tar.gz verbly-e4fe5974f123cfba6d8eff908e7f1772b0b9635f.tar.bz2 verbly-e4fe5974f123cfba6d8eff908e7f1772b0b9635f.zip | |
Migrate from mpark::variant to std::variant
Diffstat (limited to 'lib/token.h')
| -rw-r--r-- | lib/token.h | 6 |
1 files changed, 3 insertions, 3 deletions
| diff --git a/lib/token.h b/lib/token.h index 910a465..a18fe42 100644 --- a/lib/token.h +++ b/lib/token.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | #include <string> | 5 | #include <string> |
| 6 | #include <list> | 6 | #include <list> |
| 7 | #include <set> | 7 | #include <set> |
| 8 | #include <variant.hpp> | 8 | #include <variant> |
| 9 | #include <hkutil/recptr.h> | 9 | #include <hkutil/recptr.h> |
| 10 | #include "enums.h" | 10 | #include "enums.h" |
| 11 | #include "word.h" | 11 | #include "word.h" |
| @@ -38,7 +38,7 @@ namespace verbly { | |||
| 38 | bool isEmpty() const | 38 | bool isEmpty() const |
| 39 | { | 39 | { |
| 40 | return (type_ == type::utterance && | 40 | return (type_ == type::utterance && |
| 41 | mpark::get<utterance_type>(variant_).empty()); | 41 | std::get<utterance_type>(variant_).empty()); |
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | // Word | 44 | // Word |
| @@ -153,7 +153,7 @@ namespace verbly { | |||
| 153 | }; | 153 | }; |
| 154 | 154 | ||
| 155 | using variant_type = | 155 | using variant_type = |
| 156 | mpark::variant< | 156 | std::variant< |
| 157 | word_type, | 157 | word_type, |
| 158 | literal_type, | 158 | literal_type, |
| 159 | part, | 159 | part, |