From 6eb9a2523fdaa0d8ea7a2733e12a25db250db1e1 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 3 Mar 2020 11:42:37 +0800 Subject: [PATCH] tools/rbd_mirror: avoid forward declare CephContext in different ways this addresses the FTBFS caused by ``` /home/jenkins/workspace/ceph-master/src/tools/rbd_mirror/PoolMetaCache.h:12:1: error: declaration conflicts with target of using declaration already in scope struct CephContext; ^ /home/jenkins/workspace/ceph-master/src/include/common_fwd.h:10:9: note: target of using declaration class CephContext; ^ /home/jenkins/workspace/ceph-master/src/include/common_fwd.h:22:24: note: using declaration using TOPNSPC::common::CephContext; ^ In file included from /home/jenkins/workspace/ceph-master/src/tools/rbd_mirror/PoolMetaCache.cc:6: /home/jenkins/workspace/ceph-master/src/tools/rbd_mirror/PoolMetaCache.h:19:17: error: reference to 'CephContext' is ambiguous PoolMetaCache(CephContext* cct) ^ ``` Signed-off-by: Kefu Chai --- src/tools/rbd_mirror/PoolMetaCache.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/tools/rbd_mirror/PoolMetaCache.h b/src/tools/rbd_mirror/PoolMetaCache.h index cef4a689a7f1..f0440120fee0 100644 --- a/src/tools/rbd_mirror/PoolMetaCache.h +++ b/src/tools/rbd_mirror/PoolMetaCache.h @@ -9,8 +9,6 @@ #include "tools/rbd_mirror/Types.h" #include -struct CephContext; - namespace rbd { namespace mirror { -- 2.47.3