[boost] ptr_container unmerged changes?