Skip to content

Commit 9c36eb5

Browse files
committed
Merge branch 'main' into autobuild
2 parents 93457a1 + 2afb6b0 commit 9c36eb5

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ set(ENTROPY_CORE_HEADERS
4444
src/EntropyCore.h
4545
src/ServiceLocator.h
4646
src/TypeSystem/GenericHandle.h
47+
src/TypeSystem/TypeID.h
48+
src/TypeSystem/Reflection.h
4749
src/Graph/DirectedAcyclicGraph.h
4850
src/Graph/AcyclicNodeHandle.h
4951
src/Debug/INamed.h

src/Concurrency/NodeScheduler.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ bool NodeScheduler::deferNode(NodeHandle node) {
110110
// Track peak deferred count
111111
{
112112
std::lock_guard<std::mutex> statsLock(_statsMutex);
113-
_stats.peakDeferred = std::max(_stats.peakDeferred, _deferredQueue.size());
113+
_stats.peakDeferred = max(_stats.peakDeferred, _deferredQueue.size());
114114
}
115115

116116
// Publish event
@@ -144,7 +144,7 @@ size_t NodeScheduler::processDeferredNodes(size_t maxToSchedule) {
144144
{
145145
std::lock_guard<std::shared_mutex> lock(_deferredMutex); // Exclusive lock for modifying queue
146146

147-
size_t count = std::min(toProcess, _deferredQueue.size());
147+
size_t count = min(toProcess, _deferredQueue.size());
148148
nodesToSchedule.reserve(count);
149149

150150
for (size_t i = 0; i < count; ++i) {
@@ -174,7 +174,7 @@ size_t NodeScheduler::scheduleReadyNodes(const std::vector<NodeHandle>& nodes) {
174174
if (_config.enableBatchScheduling && nodes.size() > 1) {
175175
// Schedule in batches for better efficiency
176176
for (size_t i = 0; i < nodes.size(); i += _config.batchSize) {
177-
size_t batchEnd = std::min(i + _config.batchSize, nodes.size());
177+
size_t batchEnd = min(i + _config.batchSize, nodes.size());
178178

179179
for (size_t j = i; j < batchEnd; ++j) {
180180
if (scheduleNode(nodes[j])) {

0 commit comments

Comments
 (0)