The following changes are in develop but not in master. Should these be merged? They all look fine (and beneficial) to me. C:\Projects\boost-git\boost\libs\units>git log master..develop commit cc97c0f253a250a15f0b2174ec12a338772248b6 Merge: 87778d2 12f0a2e Author: Jürgen Hunold <jhunold@gmx.eu> Date: Thu Nov 6 20:44:33 2014 +0100 Merge pull request #14 from mkurdej/fix/doc-information Fix documentation on information system units. commit 87778d23197aeceaccedeea2c3df43f2fa9f9a85 Merge: b40a903 45058c0 Author: Jürgen Hunold <jhunold@gmx.eu> Date: Thu Nov 6 20:43:04 2014 +0100 Merge pull request #13 from mkurdej/fix/header-guards Fix header guards and namespace trailing comments. commit 12f0a2eb0a2ac2925fe04d8afb744e7178e37ddc Author: Marek Kurdej <mkurdej@users.noreply.github.com> Date: Thu Nov 6 12:32:02 2014 +0100 Fix quickbook warning about deprecated '\n' in generated base_units.qbk. commit 9ba957d7208322bf752d61c7d5401bb358af5f0b Author: Marek Kurdej <mkurdej@users.noreply.github.com> Date: Thu Nov 6 12:22:02 2014 +0100 Add doc for boost/units/systems/information.hpp. commit 2042d4d72337d05e1606eb385d5b1b3865739e70 Author: Marek Kurdej <mkurdej@users.noreply.github.com> Date: Thu Nov 6 12:14:53 2014 +0100 Fix documentation on information system units (not only base units). commit aaffc7fa6f8c05cff396b6fc71a3ef8b79192330 Author: Marek Kurdej <mkurdej@users.noreply.github.com> Date: Wed Nov 5 18:24:23 2014 +0100 Fix documentation on information system units. commit 45058c08f7c2372cef729237a21a87a036245d2d Author: Marek Kurdej <mkurdej@users.noreply.github.com> Date: Mon Nov 3 13:59:10 2014 +0100 Fix header guards and namespace trailing comments.
Hi Peter, Am Donnerstag, 15. Januar 2015, 19:10:00 schrieb Peter Dimov:
The following changes are in develop but not in master. Should these be merged? They all look fine (and beneficial) to me.
Thanks for the heads-up. The usual "let tests cycle and forget to merge" syndrome. Merged to master. Yours, Jürgen -- * Dipl.-Math. Jürgen Hunold ! * voice: ++49 4257 300 ! Fährstraße 1 * fax : ++49 4257 300 ! 31609 Balge/Sebbenhausen * jhunold@gmx.eu ! Germany
Jürgen Hunold wrote:
Am Donnerstag, 15. Januar 2015, 19:10:00 schrieb Peter Dimov:
The following changes are in develop but not in master. Should these be merged? They all look fine (and beneficial) to me.
Thanks for the heads-up. The usual "let tests cycle and forget to merge" syndrome. Merged to master.
Thanks Jürgen. Should I go ahead and replace the references to math::static_gcd with integer::static_gcd, or do you prefer taking care of it yourself?
Hi Peter, Am Donnerstag, 15. Januar 2015, 21:32:24 schrieb Peter Dimov:
Should I go ahead and replace the references to math::static_gcd with integer::static_gcd, or do you prefer taking care of it yourself?
Seems I'm missing some context here :-) If this is part of the dependency cleanup, please prepare a pull request. And note that we'll need Boost.Math at least for https://svn.boost.org/trac/boost/ticket/6893 Yours, Jürgen -- * Dipl.-Math. Jürgen Hunold ! * voice: ++49 4257 300 ! Fährstraße 1 * fax : ++49 4257 300 ! 31609 Balge/Sebbenhausen * jhunold@gmx.eu ! Germany
Jürgen Hunold wrote:
Am Donnerstag, 15. Januar 2015, 21:32:24 schrieb Peter Dimov:
Should I go ahead and replace the references to math::static_gcd with integer::static_gcd, or do you prefer taking care of it yourself?
Seems I'm missing some context here :-)
The context is that we've moved the GCD/LCM utilities (common_factor*.hpp) from Boost.Math to Boost.Integer, so we're fixing the places that refer to them by their old names.
If this is part of the dependency cleanup, please prepare a pull request.
I will. I've one question though. In Jamfile.v2, as part of the project requirements, there's this: <include>../../.. I don't believe that this is needed, as b2 will automatically pass the proper <include> location. Typically, the above results in passing the same -I twice, and causes no harm; my configuration however is a bit special in that I've moved my headers to $BOOST/include, so the above actually causes breakages for me (but will not for anyone else). So, should I remove this <include>../../.. as part of the pull request?
participants (2)
-
Jürgen Hunold
-
Peter Dimov