Fix the xcode 6.1 compilation issue