Merge pull request #1167 from serval2412/master

Fix cppcheck reports "Prefer prefix ++/-- operators for non-primitive ty...
Fix cppcheck report: Return value of std::remove_if() ignored. Elements remain in container