mirror of
https://github.com/ceph/ceph
synced 2025-02-22 02:27:29 +00:00
mon,auth,common: include necessary headers
we cannot assume the included header alway indirectly include the use types in this case, CephContext is defined by ceph_context.h, and g_ceph_context is declared by global_context.h. so we need to included them respectively. and remove unused headers. Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
parent
a8b55d034e
commit
09d3f546b3
@ -23,6 +23,7 @@
|
||||
#include "include/assert.h"
|
||||
#include "common/Clock.h"
|
||||
#include "common/armor.h"
|
||||
#include "common/ceph_context.h"
|
||||
#include "common/ceph_crypto.h"
|
||||
#include "common/hex.h"
|
||||
#include "common/safe_io.h"
|
||||
|
@ -18,6 +18,7 @@
|
||||
#include <sstream>
|
||||
#include <algorithm>
|
||||
#include "auth/KeyRing.h"
|
||||
#include "common/ceph_context.h"
|
||||
#include "common/config.h"
|
||||
#include "common/debug.h"
|
||||
#include "common/errno.h"
|
||||
|
@ -20,6 +20,7 @@
|
||||
|
||||
#include "auth/KeyRing.h"
|
||||
#include "include/random.h"
|
||||
#include "common/ceph_context.h"
|
||||
#include "common/config.h"
|
||||
#include "common/dout.h"
|
||||
|
||||
|
@ -14,6 +14,7 @@
|
||||
|
||||
#include "CephxProtocol.h"
|
||||
#include "common/Clock.h"
|
||||
#include "common/ceph_context.h"
|
||||
#include "common/config.h"
|
||||
#include "common/debug.h"
|
||||
#include "include/buffer.h"
|
||||
|
@ -16,6 +16,7 @@
|
||||
#ifndef CEPH_COND_H
|
||||
#define CEPH_COND_H
|
||||
|
||||
#include "common/Clock.h"
|
||||
#include "include/Context.h"
|
||||
|
||||
class Cond {
|
||||
|
@ -14,7 +14,6 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <map>
|
||||
#include <sstream>
|
||||
#include <sys/stat.h>
|
||||
#include <iostream>
|
||||
|
||||
|
@ -2,6 +2,7 @@
|
||||
// vim: ts=8 sw=2 smarttab
|
||||
|
||||
#include "common/SloppyCRCMap.h"
|
||||
#include "common/Formatter.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
@ -156,7 +157,7 @@ void SloppyCRCMap::decode(bufferlist::const_iterator& bl)
|
||||
DECODE_FINISH(bl);
|
||||
}
|
||||
|
||||
void SloppyCRCMap::dump(Formatter *f) const
|
||||
void SloppyCRCMap::dump(ceph::Formatter *f) const
|
||||
{
|
||||
f->dump_unsigned("block_size", block_size);
|
||||
f->open_array_section("crc_map");
|
||||
|
@ -5,7 +5,10 @@
|
||||
#define CEPH_COMMON_SLOPPYCRCMAP_H
|
||||
|
||||
#include "include/encoding.h"
|
||||
#include "common/Formatter.h"
|
||||
|
||||
namespace ceph {
|
||||
class Formatter;
|
||||
}
|
||||
|
||||
/**
|
||||
* SloppyCRCMap
|
||||
@ -65,7 +68,7 @@ public:
|
||||
|
||||
void encode(bufferlist& bl) const;
|
||||
void decode(bufferlist::const_iterator& bl);
|
||||
void dump(Formatter *f) const;
|
||||
void dump(ceph::Formatter *f) const;
|
||||
static void generate_test_instances(std::list<SloppyCRCMap*>& ls);
|
||||
};
|
||||
WRITE_CLASS_ENCODER(SloppyCRCMap)
|
||||
|
@ -4,9 +4,8 @@
|
||||
#include <list>
|
||||
#include <set>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
#include <vector>
|
||||
#include <boost/utility/string_view.hpp>
|
||||
|
||||
|
||||
namespace ceph {
|
||||
|
||||
|
@ -15,6 +15,7 @@
|
||||
#ifndef CEPH_MON_SESSION_H
|
||||
#define CEPH_MON_SESSION_H
|
||||
|
||||
#include "global/global_context.h"
|
||||
#include "include/xlist.h"
|
||||
#include "msg/msg_types.h"
|
||||
#include "mon/mon_types.h"
|
||||
|
Loading…
Reference in New Issue
Block a user