[Boost-commit] svn:boost r82152 - trunk/libs/locale/src/encoding

Subject: [Boost-commit] svn:boost r82152 - trunk/libs/locale/src/encoding
From: artyomtnk_at_[hidden]
Date: 2012-12-21 10:05:35

Author: artyom
Date: 2012-12-21 10:05:35 EST (Fri, 21 Dec 2012)
New Revision: 82152
URL: http://svn.boost.org/trac/boost/changeset/82152

Log:
Closing #7386
Applied recommeded changes

Text files modified: 
   trunk/libs/locale/src/encoding/wconv_codepage.ipp |     6 +++++-                                  
   1 files changed, 5 insertions(+), 1 deletions(-)

Modified: trunk/libs/locale/src/encoding/wconv_codepage.ipp
==============================================================================
--- trunk/libs/locale/src/encoding/wconv_codepage.ipp	(original)
+++ trunk/libs/locale/src/encoding/wconv_codepage.ipp	2012-12-21 10:05:35 EST (Fri, 21 Dec 2012)
@@ -51,10 +51,12 @@
         { "cp1257",     1257, 0 },
         { "cp874",      874, 0 },
         { "cp932",      932, 0 },
+        { "cp936",      936, 0 },
         { "eucjp",      20932, 0 },
         { "euckr",      51949, 0 },
         { "gb18030",    54936, 0 },
-        { "gb2312",     936, 0 },
+        { "gb2312",     20936, 0 },
+        { "gbk",        936, 0 },
         { "iso2022jp",  50220, 0 },
         { "iso2022kr",  50225, 0 },
         { "iso88591",   28591, 0 },
@@ -70,6 +72,7 @@
         { "iso88599",   28599, 0 },
         { "koi8r",      20866, 0 },
         { "koi8u",      21866, 0 },
+        { "ms936",      936, 0 },
         { "shiftjis",   932, 0 },
         { "sjis",       932, 0 },
         { "usascii",    20127, 0 },
@@ -84,6 +87,7 @@
         { "windows1257",        1257, 0 },
         { "windows874",         874, 0 },
         { "windows932",         932, 0 },
+        { "windows936",         936, 0 },
     };
 
     size_t remove_substitutions(std::vector<char> &v)