diff options
| author | Mikhail Gorbushin <m.gorbushin@corp.mail.ru> | 2019-04-04 13:51:28 +0300 |
|---|---|---|
| committer | Maksim Andrianov <maksimandrianov1@gmail.com> | 2019-04-04 15:10:22 +0300 |
| commit | d6498ffef128053f16994b1156fa02d2770ec6d5 (patch) | |
| tree | 2a1009c25d8ccc85c6b2af8b0aa3a81c15ff916a /generator | |
| parent | 773d2bcda661140496b4b826c7d1411d19890491 (diff) | |
[generator] fix style
Diffstat (limited to 'generator')
| -rw-r--r-- | generator/generator_tests/intermediate_data_test.cpp | 8 | ||||
| -rw-r--r-- | generator/intermediate_elements.hpp | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/generator/generator_tests/intermediate_data_test.cpp b/generator/generator_tests/intermediate_data_test.cpp index 3cb6812f6e..84c56f9ba6 100644 --- a/generator/generator_tests/intermediate_data_test.cpp +++ b/generator/generator_tests/intermediate_data_test.cpp @@ -136,10 +136,10 @@ UNIT_TEST(Intermediate_Data_way_element_save_load_test) UNIT_TEST(Intermediate_Data_relation_element_save_load_test) { - RelationElement::TMembers testData = {{1, "inner"}, - {2, "outer"}, - {3, "unknown"}, - {4, "inner role"}}; + std::vector<RelationElement::Member> testData = {{1, "inner"}, + {2, "outer"}, + {3, "unknown"}, + {4, "inner role"}}; RelationElement e1; diff --git a/generator/intermediate_elements.hpp b/generator/intermediate_elements.hpp index 3a18367a69..0beeb35419 100644 --- a/generator/intermediate_elements.hpp +++ b/generator/intermediate_elements.hpp @@ -87,10 +87,10 @@ struct WayElement class RelationElement { public: - using TMembers = std::vector<std::pair<uint64_t, std::string>>; + using Member = std::pair<uint64_t, std::string>; - TMembers nodes; - TMembers ways; + std::vector<Member> nodes; + std::vector<Member> ways; std::map<std::string, std::string> tags; bool IsValid() const { return !(nodes.empty() && ways.empty()); } @@ -147,7 +147,7 @@ public: writer.Write(str.data(), sz); }; - auto MembersWriter = [&writer, &StringWriter](TMembers const & members) + auto MembersWriter = [&writer, &StringWriter](std::vector<Member> const & members) { uint64_t count = members.size(); WriteVarUint(writer, count); @@ -187,7 +187,7 @@ public: r.Read(&str[0], sz); }; - auto MembersReader = [&r, &StringReader](TMembers & members) + auto MembersReader = [&r, &StringReader](std::vector<Member> & members) { uint64_t count = ReadVarUint<uint64_t>(r); members.resize(count); @@ -237,7 +237,7 @@ public: } protected: - bool FindRoleImpl(TMembers const & container, uint64_t id, std::string & role) const + bool FindRoleImpl(std::vector<Member> const & container, uint64_t id, std::string & role) const { for (auto const & e : container) { |