Macron, Carney meet to reaffirm France-Canada ties after Trump's map row