Re: [boost] [release] 1.78.0 post-beta merges

On Nov 13, 2021, at 4:34 AM, Hans Dembinski wrote:

...

On 12. Nov 2021, at 02:15, Marshall Clow via Boost wrote:

The master branch is is now open for post-beta merges, but only as described in the Post-Beta Merge Policy. See <https://github.com/boostorg/wiki/wiki/Releases%3A-Beta-Merge-Policy https://github.com/boostorg/wiki/wiki/Releases%3A-Beta-Merge-Policy>

I would like to merge the following fixes to master

https://github.com/boostorg/histogram/commit/904cc3cbf2cd8f5d6a443afdc5923e9...

This just capitalises the name "histogram" in the meta json.

https://github.com/boostorg/histogram/commit/7ec89f45f6ecbb76e4932a91bd55258...

This is a fix for users that include windows.h, which has the line `#define small char` that conflicts with variable and method names in the library. The change deprecates the interface that causes the problem and introduces a new conflict-free interface. The deprecated interface is further ifdef'ed to be excluded when "small" is defined in the preprocessing stage. The change does not break the code for users that did not run into this problem, and it fixes the broken library for those that did.

Go ahead. — Marshall