ios-2286: compilation fixes for Xcode 6.