fix the clang compiling error
Merge branch 'trunk'