Merge branch 'qflow-master' into hotfix-1.4.1

This commit is contained in:
Jinhao 2016-10-31 05:42:45 +08:00
commit 60c35b07f6

View File

@ -102,7 +102,7 @@
#define _CRT_SECURE_NO_DEPRECATE
#pragma warning(disable : 4996)
#if (_MSC_VER == 1900)
#if (_MSC_VER >= 1900)
// google: break any code that tries to use codecvt<char16_t> or codecvt<char32_t>.
// google: It appears the C++ libs haven't been compiled with native char16_t/char32_t support.
// google: Those definitions are for codecvt<wchar_t>::id, codecvt<unsigned short>::id and codecvt<char>::id respectively.