On Tue, Nov 10, 2015 at 2:20 PM, Raffi Enficiaud < raffi.enficiaud@mines-paris.org> wrote:

Le 10/11/15 14:08, Tom Kent a écrit :

...

I have a fix for MSVC but some problems have also been reported for gcc4.4

...

c++0x mode. I can merge the fix for MSVC to develop and/or master once reopened.

Raffi

Since it is preventing building of the release binaries, I think this should be merged before the beta is released.

Tom

Right now the fix is on a feature branch and on develop. What is the best way of doing this?

@release managers: is it ok if I merge this patch to master? The relevant changes is confined in one single commit.

If that's the only change on the feature branch *and* it's a branch from the master commit on the super-project.. Post a message saying you want to update the super-project to reference that feature branch commit. If it's not the only change.. Make it so that it is and do the above. -- -- Rene Rivera -- Grafik - Don't Assume Anything -- Robot Dreams - http://robot-dreams.net -- rrivera/acm.org (msn) - grafikrobot/aim,yahoo,skype,efnet,gmail

Le 10/11/15 21:29, Rene Rivera a écrit :

...

...

Right now the fix is on a feature branch and on develop. What is the best way of doing this?

@release managers: is it ok if I merge this patch to master? The relevant changes is confined in one single commit.

If that's the only change on the feature branch *and* it's a branch from the master commit on the super-project.. Post a message saying you want to update the super-project to reference that feature branch commit.

Technically it's not a branch from the master commit, it's a branch from develop, but we stopped develop to the state of master (so the diff that will be merged to master contains only this change). Also no other changes will be leaking to master.

...

If it's not the only change.. Make it so that it is and do the above.

PS. But before that make sure the change is tested on develop.

You mean wait for the runners to cycle? I wish then that they are cycling fast. It's tested on our internal CI which includes msvc-9,11,12, gcc4.8 C++03/C++11, clangosx 6 C++03/C++11. I did not have the time to include gcc4.4 C++0x.