From: Michal Jarzabek Date: Sun, 5 Jun 2016 21:15:48 +0000 (+0100) Subject: common/ceph_json.h: remove duplicate declaration X-Git-Tag: v11.0.0~317^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d6d5da1bc1ad47d3bf7710666d25b8395b980a43;p=ceph.git common/ceph_json.h: remove duplicate declaration Signed-off-by: Michal Jarzabek --- diff --git a/src/common/ceph_json.h b/src/common/ceph_json.h index a812d7af1a26..e18752ac411d 100644 --- a/src/common/ceph_json.h +++ b/src/common/ceph_json.h @@ -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