Merge pull request #4516 from RosettaCommons/roccomoretti/fix_cppcheck Fix issue identified by cppcheck.