summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2017-09-07 19:38:34 +0800
committerMaxime Coste <mawww@kakoune.org>2017-09-07 19:38:34 +0800
commitfdf7cf394414860628b39534d899de47152848bb (patch)
tree9eda06161ede06c216f3a28a03dc1825fb7aab01 /src
parentbd66aff808350e8d51246f184e121c0224d166a3 (diff)
Small code simplifications
Diffstat (limited to 'src')
-rw-r--r--src/diff.hh2
-rw-r--r--src/value.hh2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/diff.hh b/src/diff.hh
index cb28921c..49c5b504 100644
--- a/src/diff.hh
+++ b/src/diff.hh
@@ -168,7 +168,7 @@ void find_diff_rec(Iterator a, int begA, int endA,
append_diff(diffs, {Diff::Keep, suffix_len, 0});
}
-template<typename Iterator, typename Equal = std::equal_to<typename std::iterator_traits<Iterator>::value_type>>
+template<typename Iterator, typename Equal = std::equal_to<>>
Vector<Diff> find_diff(Iterator a, int N, Iterator b, int M, Equal eq = Equal{})
{
const int max = 2 * (N + M) + 1;
diff --git a/src/value.hh b/src/value.hh
index 1e39ac65..51394c7d 100644
--- a/src/value.hh
+++ b/src/value.hh
@@ -19,7 +19,7 @@ struct Value
template<typename T,
typename = std::enable_if_t<not std::is_same<Value, T>::value>>
Value(T&& val)
- : m_value{new Model<std::remove_reference_t<T>>{std::forward<T>(val)}} {}
+ : m_value{new Model<std::decay_t<T>>{std::forward<T>(val)}} {}
Value(const Value& val) = delete;
Value(Value&&) = default;