diff options
| author | Dan Mick <dan.mick@inktank.com> | 2014-02-28 02:29:28 +0100 |
|---|---|---|
| committer | Dan Mick <dan.mick@inktank.com> | 2014-03-19 03:06:55 +0100 |
| commit | 1268dbb36e11c55f7160f416d8579676eb53d74f (patch) | |
| tree | 77e251b3407ca2586af7714a5f4a3da813e1dbeb /src/messages/MOSDSubOp.h | |
| parent | Merge pull request #1497 from dachary/wip-jerasure (diff) | |
| download | ceph-1268dbb36e11c55f7160f416d8579676eb53d74f.tar.xz ceph-1268dbb36e11c55f7160f416d8579676eb53d74f.zip | |
Change tid_t to ceph_tid_t to avoid conflicts with a popular type
Signed-off-by: Dan Mick <dan.mick@inktank.com>
Diffstat (limited to 'src/messages/MOSDSubOp.h')
| -rw-r--r-- | src/messages/MOSDSubOp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/messages/MOSDSubOp.h b/src/messages/MOSDSubOp.h index 9c405e60f3f..7c9c5048b2a 100644 --- a/src/messages/MOSDSubOp.h +++ b/src/messages/MOSDSubOp.h @@ -223,7 +223,7 @@ public: : Message(MSG_OSD_SUBOP, HEAD_VERSION, COMPAT_VERSION) { } MOSDSubOp(osd_reqid_t r, pg_shard_t from, spg_t p, const hobject_t& po, bool noop_, int aw, - epoch_t mape, tid_t rtid, eversion_t v) + epoch_t mape, ceph_tid_t rtid, eversion_t v) : Message(MSG_OSD_SUBOP, HEAD_VERSION, COMPAT_VERSION), map_epoch(mape), reqid(r), |