diff options
| author | Maxime Coste <frrrwww@gmail.com> | 2015-03-09 13:48:41 +0000 |
|---|---|---|
| committer | Maxime Coste <frrrwww@gmail.com> | 2015-03-09 13:54:09 +0000 |
| commit | 1cec8df45e297a8136df6f293d4874ae6c6cb013 (patch) | |
| tree | 7d713ba554765093238c924bcc9a6eaf7bf240ec /src/command_manager.cc | |
| parent | 44f81d0b8b73367369de6be0757247a62876d4c1 (diff) | |
ArrayView content is not const anymore
As in upcoming std c++ array_view, ArrayView<T> points to mutable
data, use ArrayView<const T> or alias ConstArrayView<T> for const
data.
Diffstat (limited to 'src/command_manager.cc')
| -rw-r--r-- | src/command_manager.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/command_manager.cc b/src/command_manager.cc index 918db6f8..67e33c1e 100644 --- a/src/command_manager.cc +++ b/src/command_manager.cc @@ -270,11 +270,11 @@ TokenList parse(StringView line) } String eval_token(const Token& token, Context& context, - ArrayView<String> shell_params, + ConstArrayView<String> shell_params, const EnvVarMap& env_vars); String eval(StringView str, Context& context, - ArrayView<String> shell_params, + ConstArrayView<String> shell_params, const EnvVarMap& env_vars) { String res; @@ -303,7 +303,7 @@ String eval(StringView str, Context& context, } String eval_token(const Token& token, Context& context, - ArrayView<String> shell_params, + ConstArrayView<String> shell_params, const EnvVarMap& env_vars) { auto& content = token.content(); @@ -356,7 +356,7 @@ void CommandManager::execute_single_command(CommandParameters params, if (params.empty()) return; - ArrayView<String> param_view(params.begin()+1, params.end()); + ConstArrayView<String> param_view(params.begin()+1, params.end()); auto command_it = find_command(context, params[0]); if (command_it == m_commands.end()) throw command_not_found(params[0]); @@ -396,7 +396,7 @@ static CharCoord find_coord(StringView str, ByteCount offset) void CommandManager::execute(StringView command_line, Context& context, - ArrayView<String> shell_params, + ConstArrayView<String> shell_params, const EnvVarMap& env_vars) { TokenList tokens = parse<true>(command_line); |
