From f20aaf00ee3dea64cd6e39a659d1345a6b231a43 Mon Sep 17 00:00:00 2001 From: coranos Date: Tue, 27 Feb 2024 07:16:35 -0600 Subject: [PATCH] merging --- nano/node/CMakeLists.txt | 4 +--- nano/node/active_transactions.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nano/node/CMakeLists.txt b/nano/node/CMakeLists.txt index 0c87df5f9f..1e1bf0f064 100644 --- a/nano/node/CMakeLists.txt +++ b/nano/node/CMakeLists.txt @@ -132,8 +132,6 @@ add_library( openclconfig.cpp openclwork.hpp openclwork.cpp - optimistic_scheduler.cpp - optimistic_scheduler.hpp peer_exclusion.hpp peer_exclusion.cpp portmapping.hpp @@ -234,4 +232,4 @@ add_dependencies(node ipc_flatbuffers_lib) include_directories(${CMAKE_SOURCE_DIR}/submodules) include_directories(${CMAKE_SOURCE_DIR}/submodules/cpptoml/include) include_directories( - ${CMAKE_SOURCE_DIR}/submodules/nano-pow-server/deps/cpptoml/include) + ${CMAKE_SOURCE_DIR}/submodules/nano-pow-server/deps/cpptoml/include) \ No newline at end of file diff --git a/nano/node/active_transactions.cpp b/nano/node/active_transactions.cpp index 2e15791551..5c9de4397d 100644 --- a/nano/node/active_transactions.cpp +++ b/nano/node/active_transactions.cpp @@ -835,4 +835,4 @@ std::unique_ptr nano::recently_cemented_cache::c auto composite = std::make_unique (name); composite->add_component (std::make_unique (container_info{ "cemented", cemented.size (), sizeof (decltype (cemented)::value_type) })); return composite; -} +} \ No newline at end of file