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/pronunciation.cpp | |
| 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/pronunciation.cpp')
| -rw-r--r-- | lib/pronunciation.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
| diff --git a/lib/pronunciation.cpp b/lib/pronunciation.cpp index 856f891..b039da8 100644 --- a/lib/pronunciation.cpp +++ b/lib/pronunciation.cpp | |||
| @@ -31,22 +31,22 @@ namespace verbly { | |||
| 31 | hatkirby::row row) : | 31 | hatkirby::row row) : |
| 32 | valid_(true) | 32 | valid_(true) |
| 33 | { | 33 | { |
| 34 | id_ = mpark::get<int>(row[0]); | 34 | id_ = std::get<int>(row[0]); |
| 35 | 35 | ||
| 36 | phonemes_ = | 36 | phonemes_ = |
| 37 | hatkirby::split<std::vector<std::string>>( | 37 | hatkirby::split<std::vector<std::string>>( |
| 38 | mpark::get<std::string>(row[1]), | 38 | std::get<std::string>(row[1]), |
| 39 | " "); | 39 | " "); |
| 40 | 40 | ||
| 41 | syllables_ = mpark::get<int>(row[2]); | 41 | syllables_ = std::get<int>(row[2]); |
| 42 | stress_ = mpark::get<std::string>(row[3]); | 42 | stress_ = std::get<std::string>(row[3]); |
| 43 | 43 | ||
| 44 | if (!mpark::holds_alternative<std::nullptr_t>(row[5])) | 44 | if (!std::holds_alternative<std::nullptr_t>(row[5])) |
| 45 | { | 45 | { |
| 46 | hasRhyme_ = true; | 46 | hasRhyme_ = true; |
| 47 | 47 | ||
| 48 | prerhyme_ = mpark::get<std::string>(row[4]); | 48 | prerhyme_ = std::get<std::string>(row[4]); |
| 49 | rhyme_ = mpark::get<std::string>(row[5]); | 49 | rhyme_ = std::get<std::string>(row[5]); |
| 50 | } | 50 | } |
| 51 | } | 51 | } |
| 52 | 52 | ||