]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/os/seastore: do not redefine default argument
authorKefu Chai <kchai@redhat.com>
Fri, 7 May 2021 05:03:24 +0000 (13:03 +0800)
committerKefu Chai <kchai@redhat.com>
Fri, 7 May 2021 05:55:51 +0000 (13:55 +0800)
we should not redefine a default argument of a method of templated class.

this change also address following error from clang:

../src/crimson/os/seastore/onode_manager/staged-fltree/node.cc:621:30: error: template parameter redefines default argument
template <bool FORCE_MERGE = false>
                             ^
../src/crimson/os/seastore/onode_manager/staged-fltree/node.h:438:32: note: previous default template argument defined here
  template <bool FORCE_MERGE = false>
                               ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/os/seastore/onode_manager/staged-fltree/node.cc

index 401ceccee4c5d5dd3c5787c96d44bade2657ad53..8e505d66f857977482cd734b90581e39535ac7dc 100644 (file)
@@ -618,7 +618,7 @@ node_future<> Node::erase_node(context_t c, Ref<Node>&& this_ref)
   return parent_info().ptr->erase_child(c, std::move(this_ref));
 }
 
-template <bool FORCE_MERGE = false>
+template <bool FORCE_MERGE>
 node_future<> Node::fix_parent_index(
     context_t c, Ref<Node>&& this_ref, bool check_downgrade)
 {