From dc1426a19d3b42fbb4ababe0d125e3420c3b73c5 Mon Sep 17 00:00:00 2001
From: sdottaka <sdottaka@users.sourceforge.net>
Date: Sun, 17 May 2015 12:53:09 +0900
Subject: [PATCH] ChildFrm.cpp: Use ucr::toTString() instad of A2CT() for the
 warning "C6255 Unprotected use of alloca"

--HG--
branch : stable
---
 Src/ChildFrm.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Src/ChildFrm.cpp b/Src/ChildFrm.cpp
index 590613ae5..beb727e0a 100644
--- a/Src/ChildFrm.cpp
+++ b/Src/ChildFrm.cpp
@@ -831,7 +831,7 @@ void CChildFrame::MergeStatus::SetLineInfo(LPCTSTR szLine, int nColumn,
 		if (m_nCodepage != nCodepage)
 		{
 			const char *pszCodepageName = GetEncodingNameFromCodePage(nCodepage);
-			m_sCodepageName = pszCodepageName ? A2CT(pszCodepageName) : _T("");
+			m_sCodepageName = pszCodepageName ? ucr::toTString(pszCodepageName) : _T("");
 			if (bHasBom)
 				m_sCodepageName += _T(" with BOM");
 		}
-- 
2.11.0