Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

frama-c
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

e00856fa

Commit e00856fa authored 6 months ago by Thibault Martin

Downloads
- Plain Diff

Merge branch 'fix/andre/mergecil-conflict-warning' into 'master'

[Kernel] improve mergecil warning about conflicting types

See merge request frama-c/frama-c!4783

parents 9e60de8f 159736b1

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/kernel_internals/typing/mergecil.ml 12 additions, 8 deletions

src/kernel_internals/typing/mergecil.ml
tests/cil/oracle/cpu_a.res.oracle 2 additions, 2 deletions

tests/cil/oracle/cpu_a.res.oracle
tests/cil/oracle/cpu_b.res.oracle 2 additions, 2 deletions

tests/cil/oracle/cpu_b.res.oracle
tests/spec/oracle/multiple_file_1.res.oracle 2 additions, 2 deletions

tests/spec/oracle/multiple_file_1.res.oracle

with 18 additions and 14 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment