Index: core/include/fxcrt/fx_basic.h |
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h |
index 4aa823e06d1a61fae8530cd16a7eb9759e7960ca..4e7c8c84b47a4778e69eadb88c2ead21db56f23a 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" |
@@ -1096,7 +1098,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; |