From 5d0d0a9122fe8e4632e1137db170a425e072f581 Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Wed, 30 Oct 2013 07:51:43 -0700 Subject: [PATCH] fix -Wmismatched-tags warnings Example: warning: class 'ObjecterDispatcher' was previously declared as a struct [-Wmismatched-tags] Signed-off-by: Noah Watkins --- src/common/hobject.h | 2 +- src/osd/OSD.h | 2 +- src/osd/ReplicatedPG.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/hobject.h b/src/common/hobject.h index edaf04a301fd..8e56d660e3af 100644 --- a/src/common/hobject.h +++ b/src/common/hobject.h @@ -184,7 +184,7 @@ public: friend bool operator>=(const hobject_t&, const hobject_t&); friend bool operator==(const hobject_t&, const hobject_t&); friend bool operator!=(const hobject_t&, const hobject_t&); - friend class ghobject_t; + friend struct ghobject_t; }; WRITE_CLASS_ENCODER(hobject_t) diff --git a/src/osd/OSD.h b/src/osd/OSD.h index d08d5a566911..29615558fefc 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -440,7 +440,7 @@ public: bool force_new); ObjecterDispatcher(OSDService *o) : Dispatcher(cct), osd(o) {} } objecter_dispatcher; - friend class ObjecterDispatcher; + friend struct ObjecterDispatcher; // -- Watch -- diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index d1779d113203..6a16315fb7cc 100644 --- a/src/osd/ReplicatedPG.h +++ b/src/osd/ReplicatedPG.h @@ -928,7 +928,7 @@ protected: void cancel_copy(CopyOpRef cop, bool requeue); void cancel_copy_ops(bool requeue); - friend class C_Copyfrom; + friend struct C_Copyfrom; // -- scrub -- virtual void _scrub(ScrubMap& map); -- 2.47.3