izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary move for pod type

Browse Source
This commit is contained in:
Yukino Song
2024-10-09 05:31:15 +08:00
parent e8862ad77b
commit 3510a07c68
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/config.h
View File

@@ -158,10 +158,10 @@ namespace config {
} }
struct prep_cmd_t { struct prep_cmd_t {
prep_cmd_t(std::string &&do_cmd, std::string &&undo_cmd, bool &&elevated): prep_cmd_t(std::string &&do_cmd, std::string &&undo_cmd, bool elevated):
do_cmd(std::move(do_cmd)), undo_cmd(std::move(undo_cmd)), elevated(std::move(elevated)) {} do_cmd(std::move(do_cmd)), undo_cmd(std::move(undo_cmd)), elevated(elevated) {}
explicit prep_cmd_t(std::string &&do_cmd, bool &&elevated): explicit prep_cmd_t(std::string &&do_cmd, bool elevated):
do_cmd(std::move(do_cmd)), elevated(std::move(elevated)) {} do_cmd(std::move(do_cmd)), elevated(elevated) {}
std::string do_cmd; std::string do_cmd;
std::string undo_cmd; std::string undo_cmd;
bool elevated; bool elevated;

5
src/process.cpp
View File

@@ -348,7 +348,7 @@ namespace proc {
boost::filesystem::path working_dir = _app.working_dir.empty() ? boost::filesystem::path working_dir = _app.working_dir.empty() ?
find_working_directory(cmd.do_cmd, _env) : find_working_directory(cmd.do_cmd, _env) :
boost::filesystem::path(_app.working_dir); boost::filesystem::path(_app.working_dir);
BOOST_LOG(info) << "Executing Do Cmd: ["sv << cmd.do_cmd << ']'; BOOST_LOG(info) << "Executing Do Cmd: ["sv << cmd.do_cmd << "] elevated: " << cmd.elevated;
auto child = platf::run_command(cmd.elevated, true, cmd.do_cmd, working_dir, _env, _pipe.get(), ec, nullptr); auto child = platf::run_command(cmd.elevated, true, cmd.do_cmd, working_dir, _env, _pipe.get(), ec, nullptr);
if (ec) { if (ec) {
@@ -920,7 +920,8 @@ namespace proc {
prep_cmds.emplace_back( prep_cmds.emplace_back(
std::move(do_cmd), std::move(do_cmd),
std::move(undo_cmd), std::move(undo_cmd),
std::move(prep_cmd.elevated)); prep_cmd.elevated
);
} }
} }