Skip to content

fix: Rename template parameter BLOCK_SIZE to avoid macro conflict #127

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

Merged
liuq19 merged 1 commit into from
Feb 13, 2026
Merged

fix: Rename template parameter BLOCK_SIZE to avoid macro conflict #127

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
4 changes: 2 additions & 2 deletions include/sonic/internal/arch/common/unicode_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ sonic_force_inline bool handle_unicode_codepoint(const uint8_t **src_ptr,
return offset > 0;
}

template <size_t BLOCK_SIZE>
template <size_t SONIC_BLOCK_SIZE>
sonic_force_inline uint64_t GetEscaped(uint64_t &prev_escaped,
uint64_t backslash) {
uint64_t with_prev_backslash = backslash & ~prev_escaped;
Expand All @@ -277,7 +277,7 @@ sonic_force_inline uint64_t GetEscaped(uint64_t &prev_escaped,
odd_bits;
// & backslash to clear escaped char
uint64_t escaped_with_prev = (escaped ^ (backslash | prev_escaped));
prev_escaped = ((escaped & backslash) >> (BLOCK_SIZE - 1)) & 0x1ULL;
prev_escaped = ((escaped & backslash) >> (SONIC_BLOCK_SIZE - 1)) & 0x1ULL;
return escaped_with_prev;
}

Expand Down
Loading