From d99eaf2b18d9c1e8375360c51cda63ab2c15f340 Mon Sep 17 00:00:00 2001 From: WhiredPlanck Date: Sat, 14 Oct 2023 15:27:24 +0800 Subject: [PATCH] refactor: replace boost any to std any --- src/rime/deployer.h | 4 ++-- src/rime/dict/user_db_recovery_task.cc | 4 ++-- src/rime/lever/deployment_tasks.cc | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/rime/deployer.h b/src/rime/deployer.h index 9045e1d66..0a6d07c30 100644 --- a/src/rime/deployer.h +++ b/src/rime/deployer.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include @@ -19,7 +19,7 @@ namespace rime { class Deployer; -using TaskInitializer = boost::any; +using TaskInitializer = std::any; class DeploymentTask : public Class { public: diff --git a/src/rime/dict/user_db_recovery_task.cc b/src/rime/dict/user_db_recovery_task.cc index 838a3ecb2..ab3c8ea29 100644 --- a/src/rime/dict/user_db_recovery_task.cc +++ b/src/rime/dict/user_db_recovery_task.cc @@ -85,9 +85,9 @@ void UserDbRecoveryTask::RestoreUserDataFromSnapshot(Deployer* deployer) { UserDbRecoveryTask* UserDbRecoveryTaskComponent::Create(TaskInitializer arg) { try { - auto db = boost::any_cast>(arg); + auto db = std::any_cast>(arg); return new UserDbRecoveryTask(db); - } catch (const boost::bad_any_cast&) { + } catch (const std::bad_any_cast&) { return NULL; } } diff --git a/src/rime/lever/deployment_tasks.cc b/src/rime/lever/deployment_tasks.cc index 5d8cc4833..247ccdd5e 100644 --- a/src/rime/lever/deployment_tasks.cc +++ b/src/rime/lever/deployment_tasks.cc @@ -37,8 +37,8 @@ namespace rime { DetectModifications::DetectModifications(TaskInitializer arg) { try { - data_dirs_ = boost::any_cast>(arg); - } catch (const boost::bad_any_cast&) { + data_dirs_ = std::any_cast>(arg); + } catch (const std::bad_any_cast&) { LOG(ERROR) << "DetectModifications: invalid arguments."; } } @@ -254,8 +254,8 @@ bool WorkspaceUpdate::Run(Deployer* deployer) { SchemaUpdate::SchemaUpdate(TaskInitializer arg) : verbose_(false) { try { - schema_file_ = boost::any_cast(arg); - } catch (const boost::bad_any_cast&) { + schema_file_ = std::any_cast(arg); + } catch (const std::bad_any_cast&) { LOG(ERROR) << "SchemaUpdate: invalid arguments."; } } @@ -381,10 +381,10 @@ bool SchemaUpdate::Run(Deployer* deployer) { ConfigFileUpdate::ConfigFileUpdate(TaskInitializer arg) { try { - auto p = boost::any_cast>(arg); + auto p = std::any_cast>(arg); file_name_ = p.first; version_key_ = p.second; - } catch (const boost::bad_any_cast&) { + } catch (const std::bad_any_cast&) { LOG(ERROR) << "ConfigFileUpdate: invalid arguments."; } }