summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaxime Coste <frrrwww@gmail.com>2014-04-02 22:52:00 +0100
committerMaxime Coste <frrrwww@gmail.com>2014-04-02 22:52:00 +0100
commite94a82ac98c9347b7aedbc1aa0bf571dbc628c9e (patch)
tree5231a0c9e418cfe6058471256fe995b2c006200d /src
parentbf84f5dcefa4123d112b5ffc470250806c37d77d (diff)
More OSX fixes
Diffstat (limited to 'src')
-rw-r--r--src/highlighters.cc2
-rw-r--r--src/input_handler.cc3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/highlighters.cc b/src/highlighters.cc
index f8ec99c0..3b609156 100644
--- a/src/highlighters.cc
+++ b/src/highlighters.cc
@@ -398,7 +398,7 @@ void show_matching_char(const Context& context, HighlightFlags flags, DisplayBuf
{
auto& colors = get_color("MatchingChar");
using CodepointPair = std::pair<Codepoint, Codepoint>;
- constexpr CodepointPair matching_chars[] = { { '(', ')' }, { '{', '}' }, { '[', ']' }, { '<', '>' } };
+ static const CodepointPair matching_chars[] = { { '(', ')' }, { '{', '}' }, { '[', ']' }, { '<', '>' } };
const auto range = display_buffer.range();
const auto& buffer = context.buffer();
for (auto& sel : context.selections())
diff --git a/src/input_handler.cc b/src/input_handler.cc
index 2ade252b..df2cab06 100644
--- a/src/input_handler.cc
+++ b/src/input_handler.cc
@@ -787,8 +787,7 @@ public:
}
matches.erase(prefix);
CandidateList result;
- std::copy(make_move_iterator(matches.begin()),
- make_move_iterator(matches.end()),
+ std::copy(matches.begin(), matches.end(),
inserter(result, result.begin()));
std::sort(result.begin(), result.end());
return { begin.coord(), end.coord(), std::move(result), buffer.timestamp() };