Fix c++ compile errors with lockstat
Fix c++ compile errors with lockstat

aclements/sv6,bowlofstew/sv6,bowlofstew/sv6,aclements/sv6,aclements/sv6,aclements/sv6,bowlofstew/sv6,aclements/sv6,bowlofstew/sv6,bowlofstew/sv6