AdaCore / Certyflie

GNU General Public License v3.0
32 stars 17 forks source link

Compatibility with CE 2018 #19

Closed simonjwright closed 6 years ago

simonjwright commented 6 years ago

CE 2018 (and GCC 8) now reports a 'use type' which has no effect. CE 2018 has changed the definition of Interfaces.C.Extensions.bool incompatibly.

Fabien-Chouteau commented 6 years ago

Hi @simonjwright

Thanks for you patch, do you mind trying to apply this on my changes in #20 ?

simonjwright commented 6 years ago

@Fabien-Chouteau, it applied cleanly. Do you need me to do anything else?

Fabien-Chouteau commented 6 years ago

Can you rebase on the AdaCore:ravenscar-cf-stable branch? We just merged the changes from #20.

simonjwright commented 6 years ago

I hope I’ve done the right thing. I had to do

git checkout adacore  # your ravenscar-cf-stable
git pull
git checkout ce-compatibility
git rebase adacore
git pull --rebase     # scary
git push
Fabien-Chouteau commented 6 years ago

Hi Simon, It's not right because your commit is below the commits of our branch. Try the following: git pull --rebase https://github.com/AdaCore/Certyflie ravenscar-cf-stable git push

simonjwright commented 6 years ago

No;

$ git push
To github.com:simonjwright/Certyflie.git
 ! [rejected]        ce-compatibility -> ce-compatibility (non-fast-forward)
error: failed to push some refs to 'git@github.com:simonjwright/Certyflie.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

I don’t really see what the problem was with my first request, since it cherry-picked OK on top of your updated branch, and Github says it can be merged automatically. I’ve force-reset my branch to its original state; if that’s really not enough I’ll close this request and start a new one (from the top of your current branch, of course)

Fabien-Chouteau commented 6 years ago

Thanks @simonjwright !

simonjwright commented 6 years ago

OK!