From: Yao Zongyou <yaozongyou@vip.qq.com>
Date: Thu, 31 Jan 2019 02:41:25 +0000 (+0800)
Subject: mon: remove futile class forward declaration
X-Git-Tag: v14.1.1~129^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e95bb632adb50f19c4c574d4caf9c86cfa066612;p=ceph.git

mon: remove futile class forward declaration

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
---

diff --git a/src/mon/AuthMonitor.h b/src/mon/AuthMonitor.h
index 89c548cf079a..082b4b979ced 100644
--- a/src/mon/AuthMonitor.h
+++ b/src/mon/AuthMonitor.h
@@ -24,9 +24,7 @@
 #include "mon/PaxosService.h"
 #include "mon/MonitorDBStore.h"
 
-class MMonCommand;
 struct MAuth;
-struct MMonGlobalID;
 class KeyRing;
 class Monitor;
 
diff --git a/src/mon/ConfigKeyService.h b/src/mon/ConfigKeyService.h
index 23826397ebce..c0073e504869 100644
--- a/src/mon/ConfigKeyService.h
+++ b/src/mon/ConfigKeyService.h
@@ -19,9 +19,6 @@
 
 class Paxos;
 class Monitor;
-namespace ceph {
-class Formatter;
-}
 
 class ConfigKeyService : public QuorumService
 {
diff --git a/src/mon/HealthMonitor.h b/src/mon/HealthMonitor.h
index 50a1699de658..05f3bba977a9 100644
--- a/src/mon/HealthMonitor.h
+++ b/src/mon/HealthMonitor.h
@@ -16,9 +16,6 @@
 
 #include "mon/PaxosService.h"
 
-//forward declaration
-namespace ceph { class Formatter; }
-
 class HealthMonitor : public PaxosService
 {
   version_t version = 0;
diff --git a/src/mon/LogMonitor.h b/src/mon/LogMonitor.h
index 964058418aa9..215ef485e5a7 100644
--- a/src/mon/LogMonitor.h
+++ b/src/mon/LogMonitor.h
@@ -25,7 +25,6 @@
 #include "common/LogEntry.h"
 #include "include/str_map.h"
 
-class MMonCommand;
 class MLog;
 
 static const string LOG_META_CHANNEL = "$channel";
diff --git a/src/mon/MDSMonitor.h b/src/mon/MDSMonitor.h
index 2f82e8afb0ac..fa918e443f9d 100644
--- a/src/mon/MDSMonitor.h
+++ b/src/mon/MDSMonitor.h
@@ -27,9 +27,6 @@
 #include "msg/Messenger.h"
 #include "messages/MMDSBeacon.h"
 
-class MMonCommand;
-class MMDSLoadTargets;
-class MMDSMap;
 class FileSystemCommandHandler;
 
 class MDSMonitor : public PaxosService, public PaxosFSMap {
diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index 6ac86687d09b..afe2f3a82e01 100644
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -31,7 +31,6 @@ class MMonGetVersionReply;
 struct MMonSubscribeAck;
 class MMonCommandAck;
 struct MAuthReply;
-class MAuthRotating;
 class LogClient;
 class AuthAuthorizer;
 class AuthMethodList;
diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 4528b651b440..b97659f02fb5 100644
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -100,18 +100,6 @@ class PaxosService;
 class PerfCounters;
 class AdminSocketHook;
 
-class MMonGetMap;
-class MMonGetVersion;
-class MMonMetadata;
-class MMonSync;
-class MMonScrub;
-class MMonProbe;
-struct MMonSubscribe;
-struct MRoute;
-struct MForward;
-struct MTimeCheck2;
-struct MMonHealth;
-
 #define COMPAT_SET_LOC "feature_set"
 
 class C_MonContext final : public FunctionContext {
diff --git a/src/mon/MonmapMonitor.h b/src/mon/MonmapMonitor.h
index 6268194afb56..c9e1f89097a7 100644
--- a/src/mon/MonmapMonitor.h
+++ b/src/mon/MonmapMonitor.h
@@ -29,10 +29,6 @@
 #include "MonMap.h"
 #include "MonitorDBStore.h"
 
-class MMonMap;
-class MMonCommand;
-class MMonJoin;
-
 class MonmapMonitor : public PaxosService {
  public:
   MonmapMonitor(Monitor *mn, Paxos *p, const string& service_name)