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/pronunciation.cpp | |
| 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/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 3aef815..8da43bd 100644 --- a/lib/pronunciation.cpp +++ b/lib/pronunciation.cpp | |||
| @@ -26,22 +26,22 @@ namespace verbly { | |||
| 26 | hatkirby::row row) : | 26 | hatkirby::row row) : |
| 27 | valid_(true) | 27 | valid_(true) |
| 28 | { | 28 | { |
| 29 | id_ = mpark::get<int>(row[0]); | 29 | id_ = std::get<int>(row[0]); |
| 30 | 30 | ||
| 31 | phonemes_ = | 31 | phonemes_ = |
| 32 | hatkirby::split<std::vector<std::string>>( | 32 | hatkirby::split<std::vector<std::string>>( |
| 33 | mpark::get<std::string>(row[1]), | 33 | std::get<std::string>(row[1]), |
| 34 | " "); | 34 | " "); |
| 35 | 35 | ||
| 36 | syllables_ = mpark::get<int>(row[2]); | 36 | syllables_ = std::get<int>(row[2]); |
| 37 | stress_ = mpark::get<std::string>(row[3]); | 37 | stress_ = std::get<std::string>(row[3]); |
| 38 | 38 | ||
| 39 | if (!mpark::holds_alternative<std::nullptr_t>(row[5])) | 39 | if (!std::holds_alternative<std::nullptr_t>(row[5])) |
| 40 | { | 40 | { |
| 41 | hasRhyme_ = true; | 41 | hasRhyme_ = true; |
| 42 | 42 | ||
| 43 | prerhyme_ = mpark::get<std::string>(row[4]); | 43 | prerhyme_ = std::get<std::string>(row[4]); |
| 44 | rhyme_ = mpark::get<std::string>(row[5]); | 44 | rhyme_ = std::get<std::string>(row[5]); |
| 45 | } | 45 | } |
| 46 | } | 46 | } |
| 47 | 47 | ||