From 6218b88920120dea23d605856b9d27f9deb4746c Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Wed, 14 Dec 2022 10:19:40 -0500 Subject: Migrate from mpark::variant to std::variant --- lib/word.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/word.cpp') 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 { word::word(const database& db, hatkirby::row row) : db_(&db), valid_(true) { - id_ = mpark::get(row[0]); + id_ = std::get(row[0]); - notion_ = db.notions(notion::id == mpark::get(row[1])).first(); + notion_ = db.notions(notion::id == std::get(row[1])).first(); - if (!mpark::holds_alternative(row[3])) + if (!std::holds_alternative(row[3])) { hasTagCount_ = true; - tagCount_ = mpark::get(row[3]); + tagCount_ = std::get(row[3]); } - if (!mpark::holds_alternative(row[4])) + if (!std::holds_alternative(row[4])) { - adjectivePosition_ = static_cast(mpark::get(row[4])); + adjectivePosition_ = static_cast(std::get(row[4])); } - if (!mpark::holds_alternative(row[5])) + if (!std::holds_alternative(row[5])) { frames_ = db.frames(*this).all(); } -- cgit 1.4.1