pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

clang-format.

Browse source
This commit is contained in:
Sergey Magidovich 2016-04-18 12:28:09 +03:00
parent 8923adacfd
commit 78494ed099
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
indexer/osm_editor.cpp
View file

@ -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

3
indexer/osm_editor.hpp
View file

@ -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);

3
map/framework.cpp
View file

@ -2459,8 +2459,7 @@ osm::LocalizedStreet LocalizeStreet(model::FeaturesFetcher const & model, Featur
}
vector<osm::LocalizedStreet> TakeSomeStreetsAndLocalize(
vector<search::ReverseGeocoder::Street> const & streets,
model::FeaturesFetcher const & model)
vector<search::ReverseGeocoder::Street> const & streets, model::FeaturesFetcher const & model)
{
vector<osm::LocalizedStreet> results;