From: Kefu Chai <kchai@redhat.com>
Date: Tue, 1 Jan 2019 08:38:15 +0000 (+0800)
Subject: crimson: workaround an ICE of GCC
X-Git-Tag: v14.1.0~529^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=98a7674369c363e4f79de4629eca5ea2523c6ede;p=ceph-ci.git

crimson: workaround an ICE of GCC

this change works around the FTBFS on arm64:

/home/jenkins-build/build/workspace/ceph-pull-requests-arm64/src/crimson/common/config_proxy.h:74:13:
internal compiler error: in tsubst_decomp_names, at cp/pt.c:16537
             for (auto& [obs, keys] : rev_obs) {
             ^~~
Please submit a full bug report,
with preprocessed source if appropriate.

it seems that this issue is a dup of
https://bugzilla.redhat.com/show_bug.cgi?id=1639019 .

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/common/config_proxy.h b/src/crimson/common/config_proxy.h
index 775df14f571..b5c84c12315 100644
--- a/src/crimson/common/config_proxy.h
+++ b/src/crimson/common/config_proxy.h
@@ -71,8 +71,8 @@ class ConfigProxy : public seastar::peering_sharded_service<ConfigProxy>
                                                      const std::string &key) {
                                             rev_obs[obs].insert(key);
                                           }, nullptr);
-            for (auto& [obs, keys] : rev_obs) {
-              obs->handle_conf_change(proxy, keys);
+            for (auto& obs_keys : rev_obs) {
+              obs_keys.first->handle_conf_change(proxy, obs_keys.second);
             }
           });
         }).finally([new_values] {