max - > std::max

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58952 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficePPTXFile/Editor/WMFToImageConverter.h

@@ -6,6 +6,8 @@
 
 #include "../../DocxFormat/Source/SystemUtility/File.h"
 
+#include <algorithm>
+
 #ifdef BUILD_CONFIG_FULL_VERSION
 
 namespace NSWMFToImageConverter
@@ -154,7 +156,7 @@ namespace NSWMFToImageConverter
 				oASCImage.get_Width(&_lw);
 				oASCImage.get_Height(&_lh);
 
-				LONG lMax = max(_lw, _lh);
+                LONG lMax = std::max (_lw, _lh);
 				double dKoef = 1000.0 / lMax;
 				
 				dW = (double)dKoef * _lw * 100;

Common/DocxFormat/Source/XML/Utils.h

@@ -8,6 +8,7 @@
 #include <comutil.h>
 #endif
 
+#include <algorithm>
 
 #ifndef _USE_NULLABLE_PROPERTY_
 using namespace NSCommon;
@@ -287,7 +288,7 @@ namespace XmlUtils
 		{
 			if (NULL == m_pData)
 			{
-				m_lSize = max(nSize, 1000);				
+                m_lSize = std::max((int) nSize, 1000);
 				m_pData = (wchar_t*)malloc(m_lSize * sizeof(wchar_t));
 
 				m_lSizeCur = 0;