From bf2ab3d8af22583c69b0c93ab59aade0cf57862c Mon Sep 17 00:00:00 2001 From: "Daniel J. Hofmann" Date: Mon, 11 Apr 2016 11:14:35 +0200 Subject: [PATCH] One-Definition-Rule violation in viewport --- include/util/viewport.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/util/viewport.hpp b/include/util/viewport.hpp index d4ed889e0..211aa5745 100644 --- a/include/util/viewport.hpp +++ b/include/util/viewport.hpp @@ -28,7 +28,7 @@ static constexpr double VIEWPORT_HEIGHT = 5 * web_mercator::TILE_SIZE; static double INV_LOG_2 = 1. / std::log(2); } -unsigned getFittedZoom(util::Coordinate south_west, util::Coordinate north_east) +inline unsigned getFittedZoom(util::Coordinate south_west, util::Coordinate north_east) { const auto min_x = web_mercator::degreeToPixel(toFloating(south_west.lon), detail::MAX_ZOOM); const auto max_y = web_mercator::degreeToPixel(toFloating(south_west.lat), detail::MAX_ZOOM);