去掉void*的隐式转换
Merge remote-tracking branch 'origin/bug-fix'