From 9f3b9799702a19ea3e73a016c76ecbc6319127cc Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Mon, 23 Jan 2017 23:59:32 -0800 Subject: [PATCH] Fix windows compile error --- DataSpec/DNAMP1/STRG.hpp | 2 +- DataSpec/DNAMP2/STRG.hpp | 2 +- hecl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DataSpec/DNAMP1/STRG.hpp b/DataSpec/DNAMP1/STRG.hpp index 1cbd09055..ee6e713d9 100644 --- a/DataSpec/DNAMP1/STRG.hpp +++ b/DataSpec/DNAMP1/STRG.hpp @@ -51,7 +51,7 @@ struct STRG : ISTRG auto search = langMap.find(lang); if (search != langMap.end()) #if HECL_UCS2 - return search->second->at(idx); + return hecl::Char16ToWide(search->second->at(idx)); #else return hecl::Char16ToUTF8(search->second->at(idx)); #endif diff --git a/DataSpec/DNAMP2/STRG.hpp b/DataSpec/DNAMP2/STRG.hpp index 8121806b3..88348ea6c 100644 --- a/DataSpec/DNAMP2/STRG.hpp +++ b/DataSpec/DNAMP2/STRG.hpp @@ -57,7 +57,7 @@ struct STRG : ISTRG auto search = langMap.find(lang); if (search != langMap.end()) #if HECL_UCS2 - return search->second->at(idx); + return hecl::Char16ToWide(search->second->at(idx)); #else return hecl::Char16ToUTF8(search->second->at(idx)); #endif diff --git a/hecl b/hecl index 767d2a471..5d797e53e 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 767d2a471138dfa7f68e3254fdb942151b02cb78 +Subproject commit 5d797e53ecffbbf2e612bc0e21eed2c495985ca0