]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson: workaround an ICE of GCC 25733/head
authorKefu Chai <kchai@redhat.com>
Tue, 1 Jan 2019 08:38:15 +0000 (16:38 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 1 Jan 2019 08:38:16 +0000 (16:38 +0800)
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>
src/crimson/common/config_proxy.h

index 775df14f571b36846a0297d55967031aff1f782a..b5c84c123157b4c6ef6171f552ef705fd481e0cd 100644 (file)
@@ -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] {