Fixed new clang errors in Xcode 6.3b2

This commit is contained in:
Minh Nguyễn
2015-02-23 13:50:04 -08:00
parent d5b8d57a7f
commit 6565836a25
2 changed files with 1 additions and 2 deletions

View File

@@ -646,7 +646,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
// constrain to +/-30 degrees when merely rotating like Apple does
//
if ( ! self.isRotationAllowed && fabsf(self.pinch.scale) < 10)
if ( ! self.isRotationAllowed && std::abs(self.pinch.scale) < 10)
{
newDegrees = fminf(newDegrees, 30);
newDegrees = fmaxf(newDegrees, -30);

View File

@@ -43,7 +43,6 @@ TileParser::TileParser(const std::string &data, VectorTileData &tile_,
spriteAtlas(spriteAtlas_),
sprite(sprite_),
collision(util::make_unique<Collision>(tile.id.z, 4096, tile.source.tile_size, tile.depth)) {
assert(&tile != nullptr);
assert(style);
assert(sprite);
assert(collision);