From: Kefu Chai <kchai@redhat.com>
Date: Tue, 3 Sep 2019 16:53:24 +0000 (+0800)
Subject: dmclock: pick up change to use specified C++ settings if any
X-Git-Tag: v14.2.5~267^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F30114%2Fhead;p=ceph.git

dmclock: pick up change to use specified C++ settings if any

see https://github.com/ceph/dmclock/pull/73

so dmclock won't pass `-std=c++11` even if the parent project already
have `-std=c++17` in CXX_FLAGS.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit fb83b331de9636e5de3d756e490748d5bfb9c4dc)

Conflicts: dmclock
  this change is not cherry-picked from master, because master is using
  a different dmclock version. so in this change, only the minimum fix
  is included.
---

diff --git a/src/dmclock b/src/dmclock
index acfde8e45c0..4496dbc6515 160000
--- a/src/dmclock
+++ b/src/dmclock
@@ -1 +1 @@
-Subproject commit acfde8e45c0715e35046b581c72772a66d2133a1
+Subproject commit 4496dbc6515db96e08660ac38883329c5009f3e9