avoid colliding names

dtr-org · Oct 10, 2018 · d0d595c · d0d595c
1 parent 7b87be8
commit d0d595c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/proposer/transactionpicker.cpp b/src/proposer/transactionpicker.cpp
@@ -74,11 +74,11 @@ class BlockAssemblerAdapter final : public TransactionPicker {
   };
 };
 
-std::unique_ptr<TransactionPicker> TransactionPicker::BlockAssemblerAdapter(
+std::unique_ptr<TransactionPicker> TransactionPicker::MakeBlockAssemblerAdapter(
     const CChainParams &chainParams) {
 
   return std::unique_ptr<TransactionPicker>(
-      new class BlockAssemblerAdapter(chainParams));
+      new BlockAssemblerAdapter(chainParams));
 }
 
 }  // namespace proposer
diff --git a/src/proposer/transactionpicker.h b/src/proposer/transactionpicker.h
@@ -66,7 +66,7 @@ class TransactionPicker {
   virtual ~TransactionPicker() = default;
 
   //! \brief Factory method for creating a BlockAssemblerAdapter
-  static std::unique_ptr<TransactionPicker> BlockAssemblerAdapter(
+  static std::unique_ptr<TransactionPicker> MakeBlockAssemblerAdapter(
       const ::CChainParams &);
 };
 

diff --git a/src/test/proposer/blockassembleradapter_tests.cpp b/src/test/proposer/blockassembleradapter_tests.cpp
@@ -26,7 +26,7 @@ BOOST_AUTO_TEST_CASE(block_assembler_adapter_test) {
   // transactions will have to be mocked.
 
   std::unique_ptr<proposer::TransactionPicker> blockAssemblerAdapter =
-      proposer::TransactionPicker::BlockAssemblerAdapter(::Params());
+      proposer::TransactionPicker::MakeBlockAssemblerAdapter(::Params());
 
   proposer::TransactionPicker::PickTransactionsParameters params;