From 98dfce1c36f8f594d2a771855db72abae45d18f1 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 2 Mar 2020 20:45:03 +0800 Subject: [PATCH] mgr/MgrCap.h: avoid forward declare CephContext in different ways this addresses the FTBFS like ``` home/jenkins/workspace/ceph-master/src/mgr/MgrCap.h:12:1: error: declaration conflicts with target of using declaration already in scope class 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/mgr/MgrCap.cc:24: ``` Signed-off-by: Kefu Chai --- src/mgr/MgrCap.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mgr/MgrCap.h b/src/mgr/MgrCap.h index 3482ff21eed..f7a8bd5f8e6 100644 --- a/src/mgr/MgrCap.h +++ b/src/mgr/MgrCap.h @@ -4,13 +4,12 @@ #ifndef CEPH_MGRCAP_H #define CEPH_MGRCAP_H -#include +#include +#include "include/common_fwd.h" #include "include/types.h" #include "common/entity_name.h" -class CephContext; - static const __u8 MGR_CAP_R = (1 << 1); // read static const __u8 MGR_CAP_W = (1 << 2); // write static const __u8 MGR_CAP_X = (1 << 3); // execute -- 2.47.3