MXS-2205 Combine maxscale/monitor.h with maxscale/monitor.hh

2018-12-03 13:05:32 +02:00
parent 97bb7e7e1a
commit 8a570eb6a1
5 changed files with 415 additions and 433 deletions
--- a/server/core/load_utils.cc
+++ b/server/core/load_utils.cc
@ -35,7 +35,7 @@
 #include <maxscale/router.h>
 #include <maxscale/filter.h>
 #include <maxscale/authenticator.h>
-#include <maxscale/monitor.h>
+#include <maxscale/monitor.hh>
 #include <maxscale/query_classifier.h>

 #include "internal/modules.hh"
--- a/server/modules/monitor/mariadbmon/mariadbserver.hh
+++ b/server/modules/monitor/mariadbmon/mariadbserver.hh
@ -15,7 +15,7 @@
 #include <functional>
 #include <string>
 #include <memory>
-#include <maxscale/monitor.h>
+#include <maxscale/monitor.hh>
 #include <maxbase/stopwatch.hh>
 #include "server_utils.hh"

--- a/server/modules/routing/maxinfo/maxinfo.cc
+++ b/server/modules/routing/maxinfo/maxinfo.cc
@ -39,7 +39,7 @@
 #include <maxscale/router.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
-#include <maxscale/monitor.h>
+#include <maxscale/monitor.hh>
 #include <maxbase/atomic.h>
 #include <maxscale/dcb.h>
 #include <maxscale/maxscale.h>