From: Adam C. Emerson Date: Mon, 23 Jan 2023 22:28:10 +0000 (-0500) Subject: cls/version: Move obj_version printer to cls_version_types.h X-Git-Tag: testing/wip-vshankar-testing-20250407.170244-debug~16^2~36 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f18755df7140692617b47668e444f9a56f6bb65f;p=ceph-ci.git cls/version: Move obj_version printer to cls_version_types.h Signed-off-by: Adam C. Emerson --- diff --git a/src/cls/version/cls_version_types.h b/src/cls/version/cls_version_types.h index dafa866e1f3..8c1c03cb2f8 100644 --- a/src/cls/version/cls_version_types.h +++ b/src/cls/version/cls_version_types.h @@ -4,9 +4,15 @@ #ifndef CEPH_CLS_VERSION_TYPES_H #define CEPH_CLS_VERSION_TYPES_H +#include +#include +#include +#include + #include "include/encoding.h" #include "include/types.h" + class JSONObj; @@ -63,6 +69,10 @@ struct obj_version { }; WRITE_CLASS_ENCODER(obj_version) +inline std::ostream& operator <<(std::ostream& m, const obj_version& v) { + return m << v.tag << ":" << v.ver; +} + enum VersionCond { VER_COND_NONE = 0, VER_COND_EQ, /* equal */ diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h index 7c03e49b52a..9c50d4a04f1 100644 --- a/src/rgw/rgw_common.h +++ b/src/rgw/rgw_common.h @@ -1024,12 +1024,6 @@ struct RGWObjVersionTracker { void generate_new_write_ver(CephContext* cct); }; -inline std::ostream& operator<<(std::ostream& out, const obj_version &v) -{ - out << v.tag << ":" << v.ver; - return out; -} - inline std::ostream& operator<<(std::ostream& out, const RGWObjVersionTracker &ot) { out << "{r=" << ot.read_version << ",w=" << ot.write_version << "}";