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/word.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/word.cpp')
| -rw-r--r-- | lib/word.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
| diff --git a/lib/word.cpp b/lib/word.cpp index 2fccb9f..5df9ba1 100644 --- a/lib/word.cpp +++ b/lib/word.cpp | |||
| @@ -46,22 +46,22 @@ namespace verbly { | |||
| 46 | 46 | ||
| 47 | word::word(const database& db, hatkirby::row row) : db_(&db), valid_(true) | 47 | word::word(const database& db, hatkirby::row row) : db_(&db), valid_(true) |
| 48 | { | 48 | { |
| 49 | id_ = mpark::get<int>(row[0]); | 49 | id_ = std::get<int>(row[0]); |
| 50 | 50 | ||
| 51 | notion_ = db.notions(notion::id == mpark::get<int>(row[1])).first(); | 51 | notion_ = db.notions(notion::id == std::get<int>(row[1])).first(); |
| 52 | 52 | ||
| 53 | if (!mpark::holds_alternative<std::nullptr_t>(row[3])) | 53 | if (!std::holds_alternative<std::nullptr_t>(row[3])) |
| 54 | { | 54 | { |
| 55 | hasTagCount_ = true; | 55 | hasTagCount_ = true; |
| 56 | tagCount_ = mpark::get<int>(row[3]); | 56 | tagCount_ = std::get<int>(row[3]); |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | if (!mpark::holds_alternative<std::nullptr_t>(row[4])) | 59 | if (!std::holds_alternative<std::nullptr_t>(row[4])) |
| 60 | { | 60 | { |
| 61 | adjectivePosition_ = static_cast<positioning>(mpark::get<int>(row[4])); | 61 | adjectivePosition_ = static_cast<positioning>(std::get<int>(row[4])); |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | if (!mpark::holds_alternative<std::nullptr_t>(row[5])) | 64 | if (!std::holds_alternative<std::nullptr_t>(row[5])) |
| 65 | { | 65 | { |
| 66 | frames_ = db.frames(*this).all(); | 66 | frames_ = db.frames(*this).all(); |
| 67 | } | 67 | } |