Re: [boost] [1.60][spirit] Unmerged changes prevent compilation

Subject: Re: [boost] [1.60][spirit] Unmerged changes prevent compilation
From: Joel de Guzman (djowel_at_[hidden])
Date: 2015-11-10 13:16:22

On 11/11/15 2:05 AM, Andrey Semashev wrote:
> On Tue, Nov 10, 2015 at 8:49 PM, Marshall Clow <mclow.lists_at_[hidden]> wrote:
>> On Mon, Nov 9, 2015 at 6:17 PM, Joel de Guzman <djowel_at_[hidden]> wrote:
>>
>>> On 11/10/15 6:56 AM, Andrey Semashev wrote:
>>>
>>>> On Tuesday, November 10, 2015 06:36:58 AM Joel de Guzman wrote:
>>>>
>>>>> On 11/10/15 1:05 AM, Andrey Semashev wrote:
>>>>>
>>>>>> Hi,
>>>>>>
>>>>>> The latest 1.60 beta RC fails to build Boost.Log because some changes in
>>>>>> Boost.Spirit has not been merged to master. At least these patches need
>>>>>> to be merged to master:
>>>>>>
>>>>>> 1. Fix the duplicate definition of strip_single_element_vector
>>>>>> specialization:
>>>>>>
>>>>>>
>>>>>> https://github.com/boostorg/spirit/commit/4d8899fdfe26237d6d983a7ac5528d00
>>>>>> f1416ec7
>>>>>>
>>>>>> 2. Fix an attempt to construct an instance of none_t:
>>>>>>
>>>>>>
>>>>>> https://github.com/boostorg/spirit/commit/534cf39f15ced047359ee8b6dfe43463
>>>>>> 5fdcc500
>>>>>>
>>>>>> 3. Although it's not strictly a build breaker, this change fixes a bunch
>>>>>> of warnings about signed/unsigned mismatch:
>>>>>>
>>>>>> https://github.com/boostorg/spirit/pull/140
>>>>>>
>>>>>> After applying those patches to the RC Boost.Log builds successfully.
>>>>>>
>>>>>> These commits and the PR has been in develop for quite some time, could
>>>>>> someone merge them to master, please?
>>>>>>
>>>>>
>>>>> I'm sorry for this. I'll do it.
>>>>>
>>>>
>>>> Thanks, Joel.
>>>>
>>>
>>> Done. All spirit tests pass here.
>>>
>>>
>> I'm not seeing those commits at:
>> https://github.com/boostorg/spirit/commits/master
>
> I can see them. I think, Joel just merged develop into master, so some
> of the commits are further back in the history.

I had to revert the most recent unstable changes to develop, so it's
not really a simple merge to master. I needed to make sure that I
merge what is stable, and has been stable for quite some time now.

Regards,
-- 
Joel de Guzman
http://www.ciere.com
http://boost-spirit.com
http://www.cycfi.com/