From: Kefu Chai <tchaikov@gmail.com>
Date: Sat, 7 Apr 2018 09:29:15 +0000 (+0800)
Subject: Merge pull request #21211 from tchaikov/wip-clang-without-map-merge
X-Git-Tag: v13.1.0~377
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8c7f8bd43349657e6c0dbab704f158fc74eb5635;p=ceph.git

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>
---

8c7f8bd43349657e6c0dbab704f158fc74eb5635