mgr/DaemonState: forward-declare types from MMgrReport.h

This requires un-inlining constructor and destructor.

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

diff --git a/src/mgr/DaemonState.cc b/src/mgr/DaemonState.cc
index def6aa4f38f794f2a8f17478b2f75fcd28c33f56..37231285f678eee4780d065050791dc404dede86 100644 (file)
--- a/src/mgr/DaemonState.cc
+++ b/src/mgr/DaemonState.cc
@@ -22,6 +22,7 @@
 #include "common/Clock.h" // for ceph_clock_now()
 #include "common/debug.h"
 #include "common/Formatter.h"
+#include "messages/MMgrReport.h"
 
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_mgr
@@ -212,6 +213,9 @@ const std::map<std::string,std::string>& DaemonState::_get_config_defaults()
   return config_defaults;
 }
 
+DaemonStateIndex::DaemonStateIndex() = default;
+DaemonStateIndex::~DaemonStateIndex() = default;
+
 void DaemonStateIndex::insert(DaemonStatePtr dm)
 {
   std::unique_lock l{lock};

diff --git a/src/mgr/DaemonState.h b/src/mgr/DaemonState.h
index 1dbfc69da12b1b74e13508b1f0d5f982d18c6ab3..5f59152522275508e95a1e7c7295840942e2e09f 100644 (file)
--- a/src/mgr/DaemonState.h
+++ b/src/mgr/DaemonState.h
@@ -30,8 +30,6 @@
 
 #include "msg/msg_types.h"
 
-// For PerfCounterType
-#include "messages/MMgrReport.h"
 #include "DaemonHealthMetric.h"
 #include "DaemonKey.h"
 
@@ -39,6 +37,9 @@ namespace ceph {
   class Formatter;
 }
 
+class PerfCounterType;
+class MMgrReport;
+
 // An instance of a performance counter type, within
 // a particular daemon.
 class PerfCounterInstance
@@ -244,7 +245,8 @@ private:
   }
 
 public:
-  DaemonStateIndex() {}
+  DaemonStateIndex();
+  ~DaemonStateIndex();
 
   // FIXME: shouldn't really be public, maybe construct DaemonState
   // objects internally to avoid this.