diff options
| author | Maxime Coste <frrrwww@gmail.com> | 2015-03-10 19:33:46 +0000 |
|---|---|---|
| committer | Maxime Coste <frrrwww@gmail.com> | 2015-03-10 19:50:22 +0000 |
| commit | 3c1a325b6f7c67c530d99aaaedf5f8c96f2b2de6 (patch) | |
| tree | f6cdaf2eec33dee178e3c888f5120ea43479b157 /src/command_manager.cc | |
| parent | a0cf75ec39c679776b28b178a4299cf0ad204a1c (diff) | |
Refactor String, use a common StringOps interface, hide std::string
Diffstat (limited to 'src/command_manager.cc')
| -rw-r--r-- | src/command_manager.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/command_manager.cc b/src/command_manager.cc index 67e33c1e..459fcc22 100644 --- a/src/command_manager.cc +++ b/src/command_manager.cc @@ -119,7 +119,7 @@ String get_until_delimiter(StringView base, ByteCount& pos, } ++pos; } - return base.substr(start, pos - start); + return base.substr(start, pos - start).str(); } struct unknown_expand : parse_error @@ -313,7 +313,7 @@ String eval_token(const Token& token, Context& context, return ShellManager::instance().eval(content, context, shell_params, env_vars); case Token::Type::RegisterExpand: - return context.main_sel_register_value(content); + return context.main_sel_register_value(content).str(); case Token::Type::OptionExpand: return context.options()[content].get_as_string(); case Token::Type::ValExpand: |