File tree Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -598,8 +598,8 @@ void linkingt::duplicate_code_symbol(
598
598
599
599
while (!conflicts.empty ())
600
600
{
601
- const typet &t1=ns. follow ( conflicts.front ().first );
602
- const typet &t2=ns. follow ( conflicts.front ().second );
601
+ const typet &t1=follow_tags_symbols (ns, conflicts.front ().first );
602
+ const typet &t2=follow_tags_symbols (ns, conflicts.front ().second );
603
603
604
604
// void vs. non-void return type may be acceptable if the
605
605
// return value is never used
@@ -626,7 +626,8 @@ void linkingt::duplicate_code_symbol(
626
626
old_symbol.value .is_nil ()!=new_symbol.value .is_nil ())
627
627
{
628
628
if (warn_msg.empty ())
629
- warn_msg=" different pointer types in function" ;
629
+ warn_msg=" pointer parameter types differ between "
630
+ " declaration and definition" ;
630
631
replace=new_symbol.value .is_not_nil ();
631
632
}
632
633
// transparent union with (or entirely without) implementation is
@@ -812,7 +813,7 @@ void linkingt::duplicate_object_symbol(
812
813
if (old_type.id ()==ID_struct ||
813
814
old_type.id ()==ID_union ||
814
815
old_type.id ()==ID_array ||
815
- old_type.id ()==ID_c_enum_tag )
816
+ old_type.id ()==ID_c_enum )
816
817
detailed_conflict_report (
817
818
old_symbol,
818
819
new_symbol,
You can’t perform that action at this time.
0 commit comments