Index: core/include/fxcrt/fx_basic.h |
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h |
index fd35de906d28decc332d71953f26ffa9b409e8cd..4a3b0ceb2f815b5221802cb433a5575c20199c80 100644 |
--- a/core/include/fxcrt/fx_basic.h |
+++ b/core/include/fxcrt/fx_basic.h |
@@ -7,6 +7,8 @@ |
#ifndef CORE_INCLUDE_FXCRT_FX_BASIC_H_ |
#define CORE_INCLUDE_FXCRT_FX_BASIC_H_ |
+#include <algorithm> |
+ |
#include "fx_memory.h" |
#include "fx_stream.h" |
#include "fx_string.h" |
@@ -991,7 +993,7 @@ class CFX_SortListArray { |
return; |
} |
while (nCount > 0) { |
- int32_t temp_count = FX_MIN(nCount, FX_DATALIST_LENGTH); |
+ int32_t temp_count = std::min(nCount, FX_DATALIST_LENGTH); |
DataList list; |
list.data = FX_Alloc2D(uint8_t, temp_count, unit); |
list.start = nStart; |