mirror of
https://github.com/ceph/ceph
synced 2025-03-30 15:31:01 +00:00
Merge pull request #9503 from stiopaa1/common_cephjson_duplicateDeclaration
common/ceph_json.h: remove duplicate declaration Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
commit
4e5a0186a1
@ -344,7 +344,6 @@ void encode_json(const char *name, unsigned long val, ceph::Formatter *f);
|
||||
void encode_json(const char *name, long long val, ceph::Formatter *f);
|
||||
void encode_json(const char *name, const utime_t& val, ceph::Formatter *f);
|
||||
void encode_json(const char *name, const bufferlist& bl, ceph::Formatter *f);
|
||||
void encode_json(const char *name, long long val, ceph::Formatter *f);
|
||||
void encode_json(const char *name, long long unsigned val, ceph::Formatter *f);
|
||||
|
||||
template<class T>
|
||||
|
Loading…
Reference in New Issue
Block a user