Fix compiler errors in Xcode 6.1.1
Merge pull request #1196 from programmarchy/v1.2-xcode-6.1

Fix compiler errors in Xcode 6.1.1