Name conflict

nanocurrency · Feb 8, 2024 · 0c24485 · 0c24485
1 parent aa1ef31
commit 0c24485
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/nano/node/active_transactions.cpp b/nano/node/active_transactions.cpp
@@ -34,7 +34,7 @@ nano::active_transactions::active_transactions (nano::node & node_a, nano::confi
 	});
 
 	// Notify elections about alternative (forked) blocks
-	block_processor.processed.add ([this] (auto const & result, auto const & block, auto const & context) {
+	block_processor.block_processed.add ([this] (auto const & result, auto const & block, auto const & context) {
 		switch (result.code)
 		{
 			case nano::process_result::fork:

diff --git a/nano/node/block_broadcast.cpp b/nano/node/block_broadcast.cpp
@@ -14,7 +14,7 @@ void nano::block_broadcast::connect (nano::block_processor & block_processor)
 	{
 		return;
 	}
-	block_processor.processed.add ([this] (auto const & result, auto const & block, auto const & context) {
+	block_processor.block_processed.add ([this] (auto const & result, auto const & block, auto const & context) {
 		switch (result.code)
 		{
 			case nano::process_result::progress:

diff --git a/nano/node/blockprocessor.cpp b/nano/node/blockprocessor.cpp
@@ -41,7 +41,7 @@ nano::block_processor::block_processor (nano::node & node_a, nano::write_databas
 		// For every batch item: notify the 'processed' observer.
 		for (auto const & [result, block, context] : items)
 		{
-			processed.notify (result, block, context);
+			block_processed.notify (result, block, context);
 		}
 	});
 	processing_thread = std::thread ([this] () {

diff --git a/nano/node/blockprocessor.hpp b/nano/node/blockprocessor.hpp
@@ -88,7 +88,7 @@ class block_processor final
 	using processed_batch_t = std::deque<processed_t>;
 
 	// The batch observer feeds the processed obsever
-	nano::observer_set<nano::process_return const &, std::shared_ptr<nano::block> const &, context const &> processed;
+	nano::observer_set<nano::process_return const &, std::shared_ptr<nano::block> const &, context const &> block_processed;
 	nano::observer_set<processed_batch_t const &> batch_processed;
 
 private: