[master] Fix compilation errors in TestCPP for marmalade port.
Merge pull request #5892 from dumganhar/master

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