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