From c8c9733e0ff6a457368d24eabf8d522a92d74cfa Mon Sep 17 00:00:00 2001 From: cutealien Date: Sun, 12 Oct 2014 22:32:39 +0000 Subject: [PATCH] Allow compiling on VS with (/Zc:wchar_t-) set. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4966 dfc29bdd-3216-0410-991c-e03cc46cb475 --- include/irrXML.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/irrXML.h b/include/irrXML.h index 4e51b508..67ac76e9 100644 --- a/include/irrXML.h +++ b/include/irrXML.h @@ -383,7 +383,10 @@ namespace io xmlChar(unsigned long in) : c(static_cast(in)) {} #else explicit xmlChar(unsigned char in) : c(static_cast(in)) {} + +#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED) // VS compiling without native wchar_t can't have it explicit xmlChar(unsigned short in) : c(static_cast(in)) {} +#endif explicit xmlChar(unsigned int in) : c(static_cast(in)) {} explicit xmlChar(unsigned long in) : c(static_cast(in)) {} #endif