diff options
| author | Yuri Gorshenin <y@maps.me> | 2017-02-13 14:04:56 +0300 |
|---|---|---|
| committer | Sergey Yershov <syershov@maps.me> | 2017-02-13 14:08:31 +0300 |
| commit | 4e072c2183e54c4fbc0ab026a74e8766be542fdc (patch) | |
| tree | f494259b0a880589913ace141be2de8eab6df1bf | |
| parent | 5f43e2cd31e540b0c3d30b6c26eb49459689b52f (diff) | |
[build] CMake build fix.
| -rw-r--r-- | indexer/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | indexer/indexer_tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | indexer/road_shields_parser.cpp | 22 | ||||
| -rw-r--r-- | qt/CMakeLists.txt | 1 |
4 files changed, 10 insertions, 15 deletions
diff --git a/indexer/CMakeLists.txt b/indexer/CMakeLists.txt index 8596e0a2b2..b7c93770d1 100644 --- a/indexer/CMakeLists.txt +++ b/indexer/CMakeLists.txt @@ -6,7 +6,6 @@ set( SRC altitude_loader.cpp altitude_loader.hpp - banners.cpp banners.hpp categories_holder_loader.cpp categories_holder.cpp diff --git a/indexer/indexer_tests/CMakeLists.txt b/indexer/indexer_tests/CMakeLists.txt index e2d1f2eef4..c276b0b00a 100644 --- a/indexer/indexer_tests/CMakeLists.txt +++ b/indexer/indexer_tests/CMakeLists.txt @@ -2,7 +2,6 @@ project(indexer_tests) set( SRC - banners_test.cpp categories_test.cpp cell_coverer_test.cpp cell_id_test.cpp diff --git a/indexer/road_shields_parser.cpp b/indexer/road_shields_parser.cpp index f071c7f141..f1a4f77303 100644 --- a/indexer/road_shields_parser.cpp +++ b/indexer/road_shields_parser.cpp @@ -16,18 +16,16 @@ using ftypes::RoadShieldType; uint32_t constexpr kMaxRoadShieldBytesSize = 8; -std::array<std::string, 63> const kStatesCode { - "US", "SR", "FSR", "AL", "AK", "AZ", "AR", "CA", "CO", "CT", "DE", "DC", "FL", "GA", - "HI", "ID", "IL", "IN", "IA", "KS", "KY", "LA", "ME", "MD", "MA", "MI", "MN", "MS", - "MO", "MT", "NE", "NV", "NH", "NJ", "NM", "NY", "NC", "ND", "OH", "OK", "OR", "PA", - "RI", "SC", "SD", "TN", "TX", "UT", "VT", "VA", "WA", "WV", "WI", "WY", "AS", "GU", - "MP", "PR", "VI", "UM", "FM", "MH", "PW", -}; - -std::array<std::string, 13> const kModifiers { - "alt", "alternate", "bus", "business", "bypass", "historic", "connector", "loop", - "scenic", "spur", "temporary", "toll", "truck" -}; +std::array<std::string, 63> const kStatesCode = {{ + "US", "SR", "FSR", "AL", "AK", "AZ", "AR", "CA", "CO", "CT", "DE", "DC", "FL", "GA", "HI", "ID", + "IL", "IN", "IA", "KS", "KY", "LA", "ME", "MD", "MA", "MI", "MN", "MS", "MO", "MT", "NE", "NV", + "NH", "NJ", "NM", "NY", "NC", "ND", "OH", "OK", "OR", "PA", "RI", "SC", "SD", "TN", "TX", "UT", + "VT", "VA", "WA", "WV", "WI", "WY", "AS", "GU", "MP", "PR", "VI", "UM", "FM", "MH", "PW", +}}; + +std::array<std::string, 13> const kModifiers = {{ + "alt", "alternate", "bus", "business", "bypass", "historic", "connector", + "loop", "scenic", "spur", "temporary", "toll", "truck"}}; class RoadShieldParser { diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt index 8f65d1545a..fc069f6fba 100644 --- a/qt/CMakeLists.txt +++ b/qt/CMakeLists.txt @@ -124,7 +124,6 @@ copy_resources( cuisine-strings eula.html - banners.txt categories.txt classificator.txt colors.txt |