Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[struct_pack][fix] fix undef macro __has_feature #564

Merged
merged 1 commit into from
Jan 11, 2024
Merged

[struct_pack][fix] fix undef macro __has_feature #564

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions include/ylt/struct_pack/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,16 @@ template class string_thief<decltype(&std::string::_Mypair),
void string_set_length_hacker(std::string &, std::size_t);

#ifndef __clang__
#define __has_feature(X) false
#define struct_pack_has_feature(X) false
#else
#define struct_pack_has_feature __has_feature
#endif

template <typename ch>
inline void resize(std::basic_string<ch> &raw_str, std::size_t sz) {
std::string &str = *reinterpret_cast<std::string *>(&raw_str);
#if defined(__SANITIZE_ADDRESS__) || __has_feature(address_sanitizer) || \
#if defined(__SANITIZE_ADDRESS__) || \
struct_pack_has_feature(address_sanitizer) || \
(!defined(NDEBUG) && defined(_MSVC_STL_VERSION))
raw_str.resize(sz);
#elif defined(__GLIBCXX__) || defined(_LIBCPP_VERSION) || \
Expand Down Expand Up @@ -248,7 +251,7 @@ template class vector_thief<decltype(&std::vector<char>::_Mypair),

template <typename ch>
inline void resize(std::vector<ch> &raw_vec, std::size_t sz) {
#if defined(__SANITIZE_ADDRESS__) || __has_feature(address_sanitizer)
#if defined(__SANITIZE_ADDRESS__) || struct_pack_has_feature(address_sanitizer)
raw_vec.resize(sz);
#elif defined(__GLIBCXX__) || \
(defined(_LIBCPP_VERSION) && defined(_LIBCPP_HAS_NO_ASAN)) || \
Expand All @@ -262,9 +265,7 @@ inline void resize(std::vector<ch> &raw_vec, std::size_t sz) {
}
#endif

#ifndef __clang__
#undef __has_feature
#endif
#undef struct_pack_has_feature

template <typename T>
inline void resize(T &str, std::size_t sz) {
Expand Down
Loading