]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
tools/rbd_mirror: avoid forward declare CephContext in different ways
authorKefu Chai <kchai@redhat.com>
Tue, 3 Mar 2020 03:42:37 +0000 (11:42 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 3 Mar 2020 13:09:53 +0000 (21:09 +0800)
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 <kchai@redhat.com>
src/tools/rbd_mirror/PoolMetaCache.h

index cef4a689a7f15a9c1dd15a98f735e879c1201513..f0440120fee06c31ff2b4b46374d56712a16b7ea 100644 (file)
@@ -9,8 +9,6 @@
 #include "tools/rbd_mirror/Types.h"
 #include <map>
 
-struct CephContext;
-
 namespace rbd {
 namespace mirror {