merging

BananoCoin · Feb 27, 2024 · f20aaf0 · f20aaf0
1 parent 2c89be6
commit f20aaf0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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)
diff --git a/nano/node/active_transactions.cpp b/nano/node/active_transactions.cpp
@@ -835,4 +835,4 @@ std::unique_ptr<nano::container_info_component> nano::recently_cemented_cache::c
 	auto composite = std::make_unique<container_info_composite> (name);
 	composite->add_component (std::make_unique<container_info_leaf> (container_info{ "cemented", cemented.size (), sizeof (decltype (cemented)::value_type) }));
 	return composite;
-}
+}