Fix Xcode 6 compile error
Merge pull request #1371 from mengxy/master

Fix Xcode 6 compile error