Clang 3.4 compatibility changes

To support xcode 5.1