mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 17:46:38 -04:00
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 archivers/pbzip2 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 char>'
820 | static_assert(is_same<_CharT, typename traits_type::char_type>::value,
| ^
./BZ2StreamScanner.h:128:25: note: in instantiation of template class 'std::basic_string<unsigned char>' requested here
128 | basic_string<CharType> _bz2Header;
| ^
/usr/include/c++/v1/__fwd/string.h:23:29: note: template is declared here
23 | struct _LIBCPP_TEMPLATE_VIS char_traits;
| ^
This can be fixed by defining `_bz2Header` and `_bz2HeaderZero` as
`std::vector<CharType>` instead of `std::basic_string<CharType>`. It
requieres a few other changes, such as replacing `operator=` with
`assign`, and `compare` with `equal`.
[1] https://libcxx.llvm.org/ReleaseNotes/19.html#deprecations-and-removals
PR: 282528
Approved by: farrokhi (maintainer)
MFH: 2024Q4
(cherry picked from commit 29c80f114e
)
22 lines
856 B
C
22 lines
856 B
C
--- BZ2StreamScanner.h.orig 2015-12-17 23:32:49 UTC
|
|
+++ BZ2StreamScanner.h
|
|
@@ -44,7 +44,7 @@ class BZ2StreamScanner (public)
|
|
|
|
size_t getInBuffSize() const { return ( _inBuffEnd - _inBuff ); }
|
|
size_t getInBuffCapacity() const { return _inBuffCapacity; }
|
|
- const basic_string<CharType> & getHeader() const { return _bz2Header; }
|
|
+ const vector<CharType> & getHeader() const { return _bz2Header; }
|
|
size_t getHeaderSize() const { return _bz2Header.size(); }
|
|
int getErrState() const { return _errState; }
|
|
bool failed() { return ( _errState != 0 ); }
|
|
@@ -125,8 +125,8 @@ class BZ2StreamScanner (public)
|
|
int _hInFile; // input file descriptor
|
|
bool _eof;
|
|
|
|
- basic_string<CharType> _bz2Header;
|
|
- basic_string<CharType> _bz2HeaderZero;
|
|
+ vector<CharType> _bz2Header;
|
|
+ vector<CharType> _bz2HeaderZero;
|
|
bool _bz2HeaderFound;
|
|
bool _searchStatus;
|
|
|