summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist/plib/palloc.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/netlist/plib/palloc.h')
-rwxr-xr-x[-rw-r--r--]src/lib/netlist/plib/palloc.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/netlist/plib/palloc.h b/src/lib/netlist/plib/palloc.h
index 035fbdb749d..c7a9f19c1c4 100644..100755
--- a/src/lib/netlist/plib/palloc.h
+++ b/src/lib/netlist/plib/palloc.h
@@ -18,6 +18,7 @@
#include <type_traits>
#include <utility>
#include <vector>
+#include <algorithm>
#if defined(_WIN32) || defined(_WIN64) || defined(_MSC_VER)
#include <malloc.h>
@@ -283,7 +284,8 @@ namespace plib {
static inline void *allocate( size_t alignment, size_t size )
{
m_stat_cur_alloc() += size;
- m_stat_max_alloc() = std::max(m_stat_max_alloc(), m_stat_cur_alloc());
+ if (m_stat_max_alloc() < m_stat_cur_alloc())
+ m_stat_max_alloc() = m_stat_cur_alloc();
#if (PUSE_ALIGNED_ALLOCATION)
#if defined(_WIN32) || defined(_WIN64) || defined(_MSC_VER)