]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32415 into master
authorSage Weil <sage@redhat.com>
Sun, 29 Dec 2019 02:31:33 +0000 (20:31 -0600)
committerSage Weil <sage@redhat.com>
Sun, 29 Dec 2019 02:31:33 +0000 (20:31 -0600)
* refs/pull/32415/head:
include/cpp-btree: use inline variable to define btree_is_key_compare_to
include/cpp-btree: use std::conditional_t<>
include/cpp-btree: use static_assert()
include/interval_set: use interval_set when appropriate
include/interval_set: rename some types
include/cpp-btree: add emplace_hint()

Reviewed-by: Sage Weil <sage@redhat.com>

Trivial merge