From 3e162d95a00364222334edff9402c0c233bd98cc Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Wed, 31 Mar 2021 01:03:15 +0300 Subject: [PATCH] Remove http_client.h include from etcd_state_client.h --- src/cluster_client.cpp | 1 + src/etcd_state_client.h | 4 +++- src/osd.cpp | 1 + src/osd_cluster.cpp | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/cluster_client.cpp b/src/cluster_client.cpp index dee811cf..dc0ea627 100644 --- a/src/cluster_client.cpp +++ b/src/cluster_client.cpp @@ -2,6 +2,7 @@ // License: VNPL-1.1 or GNU GPL-2.0+ (see README.md for details) #include +#include #include "cluster_client.h" cluster_client_t::cluster_client_t(ring_loop_t *ringloop, timerfd_manager_t *tfd, json11::Json & config) diff --git a/src/etcd_state_client.h b/src/etcd_state_client.h index 8059793a..1fb3fe22 100644 --- a/src/etcd_state_client.h +++ b/src/etcd_state_client.h @@ -3,8 +3,8 @@ #pragma once +#include "json11/json11.hpp" #include "osd_id.h" -#include "http_client.h" #include "timerfd_manager.h" #define ETCD_CONFIG_WATCH_ID 1 @@ -52,6 +52,8 @@ struct pool_config_t std::map pg_config; }; +struct websocket_t; + struct etcd_state_client_t { protected: diff --git a/src/osd.cpp b/src/osd.cpp index 17192888..14ecafb2 100644 --- a/src/osd.cpp +++ b/src/osd.cpp @@ -8,6 +8,7 @@ #include #include "osd.h" +#include "http_client.h" osd_t::osd_t(blockstore_config_t & config, ring_loop_t *ringloop) { diff --git a/src/osd_cluster.cpp b/src/osd_cluster.cpp index 8d06d011..607b9591 100644 --- a/src/osd_cluster.cpp +++ b/src/osd_cluster.cpp @@ -4,6 +4,7 @@ #include "osd.h" #include "base64.h" #include "etcd_state_client.h" +#include "http_client.h" #include "osd_rmw.h" // Startup sequence: