diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-09-03 02:17:36 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-09-17 12:28:55 +0300 |
| commit | 83a019d021ccac037af677d6a0d19065d1e61c8a (patch) | |
| tree | 64287772fc2d4c23087c5fc02df94d8a4e0dc47d /include | |
| parent | 1304502f8182573176352bcab167d08963ba4c67 (diff) | |
| download | qtlocation-mapboxgl-83a019d021ccac037af677d6a0d19065d1e61c8a.tar.gz | |
[build] Fix clang format and tidy checks
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/util/default_styles.hpp | 13 | ||||
| -rw-r--r-- | include/mbgl/util/util.hpp | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/include/mbgl/util/default_styles.hpp b/include/mbgl/util/default_styles.hpp index 335d3ea5f9..e1c53178b0 100644 --- a/include/mbgl/util/default_styles.hpp +++ b/include/mbgl/util/default_styles.hpp @@ -1,7 +1,8 @@ #pragma once -#include <vector> +#include <array> #include <string> +#include <vector> namespace mbgl { namespace util { @@ -13,17 +14,19 @@ struct DefaultStyle { const unsigned currentVersion; }; +// clang-format off constexpr const DefaultStyle streets = { "mapbox://styles/mapbox/streets-v11", "Streets", 11 }; constexpr const DefaultStyle outdoors = { "mapbox://styles/mapbox/outdoors-v11", "Outdoors", 11 }; constexpr const DefaultStyle light = { "mapbox://styles/mapbox/light-v10", "Light", 10 }; constexpr const DefaultStyle dark = { "mapbox://styles/mapbox/dark-v10", "Dark", 10 }; constexpr const DefaultStyle satellite = { "mapbox://styles/mapbox/satellite-v9", "Satellite", 9 }; constexpr const DefaultStyle satelliteStreets = { "mapbox://styles/mapbox/satellite-streets-v11", "Satellite Streets", 11 }; +// clang-format on -const DefaultStyle orderedStyles[] = { - streets, outdoors, light, dark, satellite, satelliteStreets, -}; -const size_t numOrderedStyles = sizeof(orderedStyles) / sizeof(DefaultStyle); +constexpr std::array<const DefaultStyle, 6> orderedStyles = { + {streets, outdoors, light, dark, satellite, satelliteStreets}}; + +constexpr size_t numOrderedStyles = orderedStyles.size(); } // end namespace default_styles } // end namespace util diff --git a/include/mbgl/util/util.hpp b/include/mbgl/util/util.hpp index 178f1cba48..52d9ad85b7 100644 --- a/include/mbgl/util/util.hpp +++ b/include/mbgl/util/util.hpp @@ -23,6 +23,7 @@ // Compiler defines for making symbols visible, otherwise they // will be defined as hidden by default. +// clang-format off #if defined WIN32 #ifdef MBGL_BUILDING_LIB #ifdef __GNUC__ @@ -40,3 +41,4 @@ #else #define MBGL_EXPORT __attribute__((visibility ("default"))) // NOLINT #endif +// clang-format on |