mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 01:26:39 -04:00
2b65317363
As noted in the libc++ 19 release notes [1], std::char_traits<> is now
only provided for char, char8_t, char16_t, char32_t and wchar_t, and any
instantiation for other types will fail.
This causes graphics/libemf to fail to compile with clang 19 and libc++
19, resulting in errors similar to:
/usr/include/c++/v1/string:820:42: error: implicit instantiation of undefined template 'std::char_traits<unsigned short>'
820 | static_assert(is_same<_CharT, typename traits_type::char_type>::value,
| ^
libemf.cpp:982:30: note: in instantiation of template class 'std::basic_string<unsigned short>' requested here
982 | std::basic_string<WCHAR> filename_w( filename, filename + filename_count );
| ^
/usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here
23 | struct _LIBCPP_TEMPLATE_VIS char_traits;
| ^
libemf should really use char16_t for its 16-bit character type, but the
code is full of Windows assumptions that WCHAR is unsigned short. Since
std::basic_string<unsigned short> is no longer available, use
std::basic_string<char16_t> instead, and cast the result to the
appropriate type for GetEnhMetaFileW().
[1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals
PR: 281516
Approved by: maintainer timeout (~2 weeks)
MFH: 2024Q3
24 lines
697 B
C++
24 lines
697 B
C++
--- libemf/libemf.cpp.orig 2020-06-07 13:10:20 UTC
|
|
+++ libemf/libemf.cpp
|
|
@@ -72,8 +72,7 @@ namespace EMF {
|
|
if ( not bigEndian() ) {
|
|
return a;
|
|
}
|
|
-#include <byteswap.h>
|
|
- return bswap_32(a);
|
|
+ return __builtin_bswap32(a);
|
|
}
|
|
|
|
/*!
|
|
@@ -980,9 +979,9 @@ extern "C" {
|
|
|
|
int filename_count = ::strlen( filename );
|
|
|
|
- std::basic_string<WCHAR> filename_w( filename, filename + filename_count );
|
|
+ std::basic_string<char16_t> filename_w( filename, filename + filename_count );
|
|
|
|
- HENHMETAFILE handle = GetEnhMetaFileW( filename_w.c_str() );
|
|
+ HENHMETAFILE handle = GetEnhMetaFileW( reinterpret_cast<LPCWSTR>(filename_w.c_str()) );
|
|
|
|
return handle;
|
|
}
|