From 1cec8df45e297a8136df6f293d4874ae6c6cb013 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Mon, 9 Mar 2015 13:48:41 +0000 Subject: ArrayView content is not const anymore As in upcoming std c++ array_view, ArrayView points to mutable data, use ArrayView or alias ConstArrayView for const data. --- src/command_manager.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/command_manager.cc') 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 shell_params, + ConstArrayView shell_params, const EnvVarMap& env_vars); String eval(StringView str, Context& context, - ArrayView shell_params, + ConstArrayView 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 shell_params, + ConstArrayView 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 param_view(params.begin()+1, params.end()); + ConstArrayView 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 shell_params, + ConstArrayView shell_params, const EnvVarMap& env_vars) { TokenList tokens = parse(command_line); -- cgit v1.2.3