Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-24 07:46:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

change deprecated wstring_convert to Boost.Locale and fix #6779 issue

Browse Source
This commit is contained in:
Cristian Ritter
2025-06-11 18:21:58 -03:00
committed by Thomas Krijnen
parent 2c0b1691ae
commit 94452b4a7a
1 changed files with 3 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcparse/IfcCharacterDecoder.cpp
+3 -38
View File
@@ -37,6 +37,7 @@
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <algorithm> #include <algorithm>
#include <boost/locale.hpp>
#define FIRST_SOLIDUS (1 << 1) #define FIRST_SOLIDUS (1 << 1)
#define PAGE (1 << 2) #define PAGE (1 << 2)
@@ -417,45 +418,9 @@ std::u32string::value_type IfcUtil::convert_codepage(int codepage, int character
} }
std::string IfcUtil::convert_utf8(const std::u32string& string) { std::string IfcUtil::convert_utf8(const std::u32string& string) {
return std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t>().to_bytes(string); return boost::locale::conv::utf_to_utf<char>(string);
} }
#ifdef _MSC_VER
// bug in msvc 2015 and 2017, unsure if fixed in later versions
// edit: maybe not bug actually, but a gap in the standard?
std::u32string IfcUtil::convert_utf8(const std::string& s) { std::u32string IfcUtil::convert_utf8(const std::string& s) {
bool is_ascii = true; return boost::locale::conv::utf_to_utf<char32_t>(s);
for (char c : s) {
if (static_cast<unsigned char>(c) >= 128) {
is_ascii = false;
break;
}
}
if (is_ascii) {
return std::u32string(s.begin(), s.end());
} else {
auto converted = std::wstring_convert<std::codecvt_utf8<int32_t>, int32_t>().from_bytes(s);
return std::u32string(reinterpret_cast<char32_t const*>(converted.data()));
}
} }
#else
std::u32string IfcUtil::convert_utf8(const std::string& s) {
bool is_ascii = true;
for (char c : s) {
if (static_cast<unsigned char>(c) >= 128) {
is_ascii = false;
break;
}
}
if (is_ascii) {
return std::u32string(s.begin(), s.end());
} else {
return std::wstring_convert<std::codecvt_utf8<std::u32string::value_type>, std::u32string::value_type>().from_bytes(s);
}
}
#endif