From 1d78ed88ff9078febdbb5c37173b313da5c023a3 Mon Sep 17 00:00:00 2001 From: Maoni Stephens Date: Sat, 6 Jul 2019 00:09:32 -0700 Subject: [PATCH] fix merge error (#25573) --- src/utilcode/util.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/utilcode/util.cpp b/src/utilcode/util.cpp index 0e142cf..8f62d53 100644 --- a/src/utilcode/util.cpp +++ b/src/utilcode/util.cpp @@ -758,9 +758,10 @@ BYTE * ClrVirtualAllocWithinRange(const BYTE *pMinAddr, currentProcsOnNode = max(currentProcsOnNode, procsOnNode); } - *max_procs_per_node = currentProcsOnNode; - *total_nodes = m_nNodes; } + + *max_procs_per_node = currentProcsOnNode; + *total_nodes = m_nNodes; return true; } -- 2.7.4