Initial set of 1.74 changes

boostorg / wave

Boost.org wave module

http://boost.org/libs/wave

21 stars 49 forks source link

Closed jefftrull closed 4 years ago

jefftrull commented 4 years ago

These have had a good long time to simmer in develop and the __VA_OPT__ support in particular will be nice to release.

I'm still hoping to have something for __has_include prior to tomorrow's feature freeze but just in case it seemed wise to prepare this.

jefftrull commented 4 years ago

The conflict seems to have something to do with the allocator fixes, which went into both master and develop. I'll track it down.

jefftrull commented 4 years ago

Looks like the cleanest fix for the conflict is to directly merge the missing commit from @glenfe, despite the fact it is already in develop...