xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation on older gcc / clang

Browse Source 
This was already fixed on the menu-completions branch but an previous
commit version was wrongly cherry-picked.

Fixes #2914
This commit is contained in:
Maxime Coste 2019-05-21 13:22:02 +10:00
parent 6a65415a19
commit 3b3a69b2f5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/commands.cc
View File

@ -103,9 +103,10 @@ make_completer(Completers&&... completers)
} }
template<typename Completer> template<typename Completer>
auto add_flags(Completer&& completer, Completions::Flags completions_flags) auto add_flags(Completer completer, Completions::Flags completions_flags)
{ {
return [=](const Context& context, CompletionFlags flags, const String& prefix, ByteCount cursor_pos) { return [completer=std::move(completer), completions_flags]
(const Context& context, CompletionFlags flags, const String& prefix, ByteCount cursor_pos) {
Completions res = completer(context, flags, prefix, cursor_pos); Completions res = completer(context, flags, prefix, cursor_pos);
res.flags |= completions_flags; res.flags |= completions_flags;
return res; return res;
@ -113,9 +114,9 @@ auto add_flags(Completer&& completer, Completions::Flags completions_flags)
} }
template<typename Completer> template<typename Completer>
auto menu(Completer&& completer) auto menu(Completer completer)
{ {
return add_flags(std::forward<Completer>(completer), Completions::Flags::Menu); return add_flags(std::move(completer), Completions::Flags::Menu);
} }
template<bool menu> template<bool menu>
@ -1128,7 +1129,7 @@ void define_command(const ParametersParser& parser, Context& context, const Shel
CommandParameters params, CommandParameters params,
size_t token_to_complete, ByteCount pos_in_token) size_t token_to_complete, ByteCount pos_in_token)
{ {
return add_flags(complete_buffer_name, completions_flags)( return add_flags(complete_buffer_name<false>, completions_flags)(
context, flags, params[token_to_complete], pos_in_token); context, flags, params[token_to_complete], pos_in_token);
}; };
} }