update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / dmclock / support / src / indirect_intrusive_heap.h

diff --git a/ceph/src/dmclock/support/src/indirect_intrusive_heap.h b/ceph/src/dmclock/support/src/indirect_intrusive_heap.h
index 8c5dfa9757623f5f384743264152b3e99b87811b..d84a4878441abacd41e5abfeaf5739b21d1a4bb7 100644 (file)
--- a/ceph/src/dmclock/support/src/indirect_intrusive_heap.h
+++ b/ceph/src/dmclock/support/src/indirect_intrusive_heap.h
@@ -48,7 +48,7 @@ namespace crimson {
           typename T,
           IndIntruHeapData T::*heap_info,
           typename C,
-          uint K = 2>
+          unsigned K = 2>
   class IndIntruHeap {
 
     // shorthand
@@ -394,7 +394,7 @@ namespace crimson {
       return out;
     }
 
-    // can only be called if I is copyable; copies heap into a vector
+    // can only be called if I is copiable; copies heap into a vector
     // and sorts it before displaying it
     std::ostream&
     display_sorted(std::ostream& out,