[cpp] Put spaces inside angle brackets to please gcc