Fix build after cppcheck-related changes
Merge pull request #8 from jafyvilla/master

Fix build after cppcheck-related changes