]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge pull request #21211 from tchaikov/wip-clang-without-map-merge
authorKefu Chai <tchaikov@gmail.com>
Sat, 7 Apr 2018 09:29:15 +0000 (17:29 +0800)
committerGitHub <noreply@github.com>
Sat, 7 Apr 2018 09:29:15 +0000 (17:29 +0800)
commit8c7f8bd43349657e6c0dbab704f158fc74eb5635
tree4c3eafae95c313bbf7c9553fe7b5fef87e78285f
parent9bfb1f624620e22b2a15fd24e2219414b4d0c742
parent3263b90e1f6cc0816495ed6bfb9f324852307dd1
Merge pull request #21211 from tchaikov/wip-clang-without-map-merge

cmake,mds: detect std::map::merge() before using it.

Reviewed-by: Zheng Yan <zyan@redhat.com>