diff options
| author | Alex Zolotarev <alex@maps.me> | 2016-02-05 13:37:15 +0300 |
|---|---|---|
| committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:16:51 +0300 |
| commit | 5eff1f6a5f8dde1184c6f00bc1bd7ad7fed441ff (patch) | |
| tree | 8fe77516b7b1998a463ec755ccdb9ea8e1b17ca0 /indexer/scales.hpp | |
| parent | 1ebea6b6ef3183ab008a3776a5a04d5be7ca42ab (diff) | |
Added constexpr specifier to scales functions.
Diffstat (limited to 'indexer/scales.hpp')
| -rw-r--r-- | indexer/scales.hpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indexer/scales.hpp b/indexer/scales.hpp index 476ea2e48d..2e0b21048a 100644 --- a/indexer/scales.hpp +++ b/indexer/scales.hpp @@ -6,26 +6,26 @@ namespace scales { - int const UPPER_STYLE_SCALE = 19; + constexpr int UPPER_STYLE_SCALE = 19; /// Upper scale for data generation and indexer buckets. - inline int GetUpperScale() { return 17; } + constexpr int GetUpperScale() { return 17; } /// Upper scale according to drawing rules. - inline int GetUpperStyleScale() { return UPPER_STYLE_SCALE; } + constexpr int GetUpperStyleScale() { return UPPER_STYLE_SCALE; } /// Upper scales for World visible styles and indexer buckets. - inline int GetUpperWorldScale() { return 9; } + constexpr int GetUpperWorldScale() { return 9; } /// Upper scale level for countries. - inline int GetUpperCountryScale() { return GetUpperWorldScale() + 1; } + constexpr int GetUpperCountryScale() { return GetUpperWorldScale() + 1; } /// Upper scale for user comfort view (e.g. location zoom). - inline int GetUpperComfortScale() { return UPPER_STYLE_SCALE - 2; } + constexpr int GetUpperComfortScale() { return UPPER_STYLE_SCALE - 2; } /// Default navigation mode scale - inline int GetNavigationScale() { return UPPER_STYLE_SCALE - 3; } + constexpr int GetNavigationScale() { return UPPER_STYLE_SCALE - 3; } /// Default pedestrian navigation mode scale - inline int GetPedestrianNavigationScale() { return UPPER_STYLE_SCALE - 2; } + constexpr int GetPedestrianNavigationScale() { return UPPER_STYLE_SCALE - 2; } /// Default navigation 3d mode scale - inline int GetNavigation3dScale() { return UPPER_STYLE_SCALE - 2; } + constexpr int GetNavigation3dScale() { return UPPER_STYLE_SCALE - 2; } /// Default pedestrian navigation 3d mode scale - inline int GetPedestrianNavigation3dScale() { return UPPER_STYLE_SCALE - 2; } + constexpr int GetPedestrianNavigation3dScale() { return UPPER_STYLE_SCALE - 2; } int GetMinAllowableIn3dScale(); |