[PATCH 2/5] cppcheck: Add workaround for cppcheck bug 14847