Fix mac build: "<::" cannot begin a template-argument list

Change-Id: Iddc71ca948ae478aa865378e0f3d3c7bbdcc577b