aboutsummaryrefslogtreecommitdiff
path: root/command.cc
diff options
context:
space:
mode:
authorShinichiro Hamaji <shinichiro.hamaji@gmail.com>2015-08-14 17:19:34 +0900
committerShinichiro Hamaji <shinichiro.hamaji@gmail.com>2015-08-14 17:22:25 +0900
commitfb415ad2b0835e251b4d5cb5a8397b80c41525d6 (patch)
tree04957b34c110e69ac1dc3b3f21443a39e0bb5182 /command.cc
parent5081c71d90a099a96148c39835a93c8c1eff1756 (diff)
[C++] Remove all shared_ptr<string>
Diffstat (limited to 'command.cc')
-rw-r--r--command.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/command.cc b/command.cc
index 6b48f68..41922ca 100644
--- a/command.cc
+++ b/command.cc
@@ -179,8 +179,8 @@ void CommandEvaluator::Eval(DepNode* n, vector<Command*>* commands) {
ev_->set_current_scope(n->rule_vars);
current_dep_node_ = n;
for (Value* v : n->cmds) {
- shared_ptr<string> cmds_buf = v->Eval(ev_);
- StringPiece cmds = *cmds_buf;
+ const string&& cmds_buf = v->Eval(ev_);
+ StringPiece cmds = cmds_buf;
bool global_echo = true;
bool global_ignore_error = false;
ParseCommandPrefixes(&cmds, &global_echo, &global_ignore_error);
@@ -200,7 +200,7 @@ void CommandEvaluator::Eval(DepNode* n, vector<Command*>* commands) {
if (!cmd.empty()) {
Command* command = new Command(n->output);
- command->cmd = make_shared<string>(cmd.as_string());
+ command->cmd = cmd.as_string();
command->echo = echo;
command->ignore_error = ignore_error;
commands->push_back(command);
@@ -215,7 +215,7 @@ void CommandEvaluator::Eval(DepNode* n, vector<Command*>* commands) {
vector<Command*> output_commands;
for (const string& cmd : ev_->delayed_output_commands()) {
Command* c = new Command(n->output);
- c->cmd = make_shared<string>(cmd);
+ c->cmd = cmd;
c->echo = false;
c->ignore_error = false;
output_commands.push_back(c);