mirror of
https://github.com/storytold/harfbuzz.git
synced 2026-11-20 14:31:10 +01:00
[subset] Extract retained-condition pointer before the ternary
The universal first-match fix mixed hb::shared_ptr and nullptr in a conditional expression. GCC 13 rejects that expression, breaking the GCC-based CI jobs even though Clang and GCC 15 accept it. Use shared_ptr::get() so both operands have compatible pointer types. This preserves the existing ownership and null handling. Reproduced the rejected expression with GCC 13 and verified the fixed expression and C++11 amalgamation syntax check. The full Meson suite passes: 281 passed, 1 skipped. Local GCC C++11/C++20 and Clang C++11 checks also pass, as do all six reduced-feature CI profiles. Assisted-by: OpenAI Codex <noreply@openai.com>
This commit is contained in:
1 parent
e5ce527941
commit
2153daba2f
1 file changed
+1
-1
@@ -5435,7 +5435,7 @@ struct FeatureVariationRecord
|
||||
if (unlikely (!out)) return_trace (false);
|
||||
|
||||
hb_set_t *retained_conditions = c->feature_record_cond_idx_map ?
|
||||
c->feature_record_cond_idx_map->get (c->cur_feature_var_record_idx) : nullptr;
|
||||
c->feature_record_cond_idx_map->get (c->cur_feature_var_record_idx).get () : nullptr;
|
||||
if (!insert_catch_all && retained_conditions && retained_conditions->is_empty ())
|
||||
/* A null ConditionSet is the unconditional first-match record. */
|
||||
out->conditions = 0;
|
||||
|
||||
Reference in new issue
Block a user