Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2016-06-28 15:48:59 +0300
committerVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2016-07-23 10:25:10 +0300
commit06a48f68e87d06147d726827d131af4bd19bd62c (patch)
tree3f9c0b995ee242bfefd26b86f08650bb4e8b9ed6 /indexer
parent7de86381e97a0606dd7db6dcba600178d9095202 (diff)
git-clang-format
Diffstat (limited to 'indexer')
-rw-r--r--indexer/feature.cpp3
-rw-r--r--indexer/feature_altitude.hpp10
-rw-r--r--indexer/feature_loader.cpp13
-rw-r--r--indexer/old/feature_loader_101.hpp4
4 files changed, 17 insertions, 13 deletions
diff --git a/indexer/feature.cpp b/indexer/feature.cpp
index 7153bc6476..b9cd39253f 100644
--- a/indexer/feature.cpp
+++ b/indexer/feature.cpp
@@ -302,7 +302,8 @@ void FeatureType::Deserialize(feature::LoaderBase * pLoader, TBuffer buffer)
m_pLoader->InitFeature(this);
- m_header2Parsed = m_pointsParsed = m_trianglesParsed = m_metadataParsed = m_altitudeParsed = false;
+ m_header2Parsed = m_pointsParsed = m_trianglesParsed = m_metadataParsed = m_altitudeParsed =
+ false;
m_innerStats.MakeZero();
}
diff --git a/indexer/feature_altitude.hpp b/indexer/feature_altitude.hpp
index 916e88f04b..393b4777dd 100644
--- a/indexer/feature_altitude.hpp
+++ b/indexer/feature_altitude.hpp
@@ -24,7 +24,10 @@ class Altitude
{
public:
Altitude() = default;
- Altitude(uint32_t featureId, Altitudes const & altitudes) : m_featureId(featureId), m_altitudes(altitudes) {}
+ Altitude(uint32_t featureId, Altitudes const & altitudes)
+ : m_featureId(featureId), m_altitudes(altitudes)
+ {
+ }
template <class TSink>
void Serialize(TSink & sink) const
@@ -42,9 +45,10 @@ public:
private:
/// @TODO Note. Feature id is located here because there's no index for altitudes.
- /// There's only pairs sorted by feature id. Before merging to master some index has to be implemented.
+ /// There's only pairs sorted by feature id. Before merging to master some index has to be
+ /// implemented.
/// Don't forget to remove |m_featureId|.
uint32_t m_featureId = 0;
Altitudes m_altitudes;
};
-} // namespace feature
+} // namespace feature
diff --git a/indexer/feature_loader.cpp b/indexer/feature_loader.cpp
index 950f134959..4c6609272e 100644
--- a/indexer/feature_loader.cpp
+++ b/indexer/feature_loader.cpp
@@ -309,13 +309,12 @@ void LoaderCurrent::ParseAltitude()
try
{
DDVector<TAltitudeIndexEntry, FilesContainerR::TReader> idx(m_Info.GetAltitudeReader());
- auto it = lower_bound(
- idx.begin(), idx.end(),
- TAltitudeIndexEntry{static_cast<uint32_t>(m_pF->m_id.m_index), 0, 0},
- [](TAltitudeIndexEntry const & v1, TAltitudeIndexEntry const & v2)
- {
- return v1.featureId < v2.featureId;
- });
+ auto it = lower_bound(idx.begin(), idx.end(),
+ TAltitudeIndexEntry{static_cast<uint32_t>(m_pF->m_id.m_index), 0, 0},
+ [](TAltitudeIndexEntry const & v1, TAltitudeIndexEntry const & v2)
+ {
+ return v1.featureId < v2.featureId;
+ });
if (it == idx.end())
return;
diff --git a/indexer/old/feature_loader_101.hpp b/indexer/old/feature_loader_101.hpp
index 7c07657013..83f74b8853 100644
--- a/indexer/old/feature_loader_101.hpp
+++ b/indexer/old/feature_loader_101.hpp
@@ -36,8 +36,8 @@ namespace old_101 { namespace feature
void ParseHeader2() override;
uint32_t ParseGeometry(int scale) override;
uint32_t ParseTriangles(int scale) override;
- void ParseMetadata() override {} /// not supported in this version
- void ParseAltitude() override {} /// not supported in this version
+ void ParseMetadata() override {} /// not supported in this version
+ void ParseAltitude() override {} /// not supported in this version
};
}
}