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:
Kefu Chai 2016-06-06 10:57:23 +08:00
commit 4e5a0186a1

View File

@ -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>