From 78494ed0994987d204fe89ea61b3ad3830481267 Mon Sep 17 00:00:00 2001 From: Sergey Magidovich Date: Mon, 18 Apr 2016 12:28:09 +0300 Subject: [PATCH] clang-format. --- indexer/osm_editor.cpp | 6 +++--- indexer/osm_editor.hpp | 3 +-- map/framework.cpp | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp index e84946968c..31ef58da99 100644 --- a/indexer/osm_editor.cpp +++ b/indexer/osm_editor.cpp @@ -793,7 +793,8 @@ void Editor::SaveUploadedInformation(FeatureTypeInfo const & fromUploader) // Macros is used to avoid code duplication. #define GET_FEATURE_TYPE_INFO_BODY \ - do { \ + do \ + { \ auto const matchedMwm = m_features.find(mwmId); \ if (matchedMwm == m_features.end()) \ return nullptr; \ @@ -804,8 +805,7 @@ void Editor::SaveUploadedInformation(FeatureTypeInfo const & fromUploader) \ /* TODO(AlexZ): Should we process deleted/created features as well?*/ \ return &matchedIndex->second; \ - } \ - while (false) \ + } while (false) Editor::FeatureTypeInfo const * Editor::GetFeatureTypeInfo(MwmSet::MwmId const & mwmId, uint32_t index) const diff --git a/indexer/osm_editor.hpp b/indexer/osm_editor.hpp index c109e7abc2..a049d2ff65 100644 --- a/indexer/osm_editor.hpp +++ b/indexer/osm_editor.hpp @@ -155,8 +155,7 @@ private: string m_uploadError; }; /// @returns pointer to m_features[id][index] if exists, nullptr otherwise. - FeatureTypeInfo const * - GetFeatureTypeInfo(MwmSet::MwmId const & mwmId, uint32_t index) const; + FeatureTypeInfo const * GetFeatureTypeInfo(MwmSet::MwmId const & mwmId, uint32_t index) const; FeatureTypeInfo * GetFeatureTypeInfo(MwmSet::MwmId const & mwmId, uint32_t index); void SaveUploadedInformation(FeatureTypeInfo const & fromUploader); diff --git a/map/framework.cpp b/map/framework.cpp index d308555fa8..8b2e85de48 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -2459,8 +2459,7 @@ osm::LocalizedStreet LocalizeStreet(model::FeaturesFetcher const & model, Featur } vector TakeSomeStreetsAndLocalize( - vector const & streets, - model::FeaturesFetcher const & model) + vector const & streets, model::FeaturesFetcher const & model) { vector results;