]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
fix -Wmismatched-tags warnings 790/head
authorNoah Watkins <noahwatkins@gmail.com>
Wed, 30 Oct 2013 14:51:43 +0000 (07:51 -0700)
committerSage Weil <sage@inktank.com>
Fri, 1 Nov 2013 23:17:23 +0000 (16:17 -0700)
Example: warning: class 'ObjecterDispatcher' was previously declared as
a struct [-Wmismatched-tags]

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
src/common/hobject.h
src/osd/OSD.h
src/osd/ReplicatedPG.h

index edaf04a301fd64817da8d69d97c762d394a17a80..8e56d660e3af7da1e00b470b8cfae152ec515ba6 100644 (file)
@@ -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)
 
index d08d5a566911d8e58526abcbe6ce89e58570de60..29615558fefc0b75593503ad3c19ebf2f0d7f259 100644 (file)
@@ -440,7 +440,7 @@ public:
                           bool force_new);
     ObjecterDispatcher(OSDService *o) : Dispatcher(cct), osd(o) {}
   } objecter_dispatcher;
-  friend class ObjecterDispatcher;
+  friend struct ObjecterDispatcher;
 
 
   // -- Watch --
index d1779d113203c98e3ea8ba12807376ff9777fcf7..6a16315fb7cc693a3b2fb7d32f2047ac73d15140 100644 (file)
@@ -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);