[master] Fix compilation errors in TestCPP for marmalade port.