diff options
| author | Mike Taves <mwtoews@gmail.com> | 2020-04-07 21:07:09 +1200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2020-04-07 22:01:10 +0200 |
| commit | 2eac355c7354547a7b1038fe3ebb661a1c7b302f (patch) | |
| tree | 38068aedfdd32599961344278ea2af5f3db3cea8 /src/iso19111 | |
| parent | 0853daaeb117c227db9c648785f3f81ef85956a3 (diff) | |
| download | PROJ-2eac355c7354547a7b1038fe3ebb661a1c7b302f.tar.gz PROJ-2eac355c7354547a7b1038fe3ebb661a1c7b302f.zip | |
Test GCC 4.8 and CMake 3.9; resolve a few shadowed declaration warnings
Diffstat (limited to 'src/iso19111')
| -rw-r--r-- | src/iso19111/datum.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/iso19111/datum.cpp b/src/iso19111/datum.cpp index 1dbe2cab..6f115908 100644 --- a/src/iso19111/datum.cpp +++ b/src/iso19111/datum.cpp @@ -203,10 +203,10 @@ void Datum::setAnchor(const util::optional<std::string> &anchor) { void Datum::setProperties( const util::PropertyMap &properties) // throw(InvalidValueTypeException) { - std::string publicationDate; - properties.getStringValue("PUBLICATION_DATE", publicationDate); - if (!publicationDate.empty()) { - d->publicationDate = common::DateTime::create(publicationDate); + std::string publicationDateResult; + properties.getStringValue("PUBLICATION_DATE", publicationDateResult); + if (!publicationDateResult.empty()) { + d->publicationDate = common::DateTime::create(publicationDateResult); } ObjectUsage::setProperties(properties); } @@ -1376,13 +1376,13 @@ bool GeodeticReferenceFrame::hasEquivalentNameToUsingAlias( if (dbContext) { if (!identifiers().empty()) { const auto &id = identifiers().front(); - auto aliases = + auto aliasesResult = dbContext->getAliases(*(id->codeSpace()), id->code(), nameStr(), "geodetic_datum", std::string()); const char *otherName = other->nameStr().c_str(); - for (const auto &alias : aliases) { + for (const auto &aliasResult : aliasesResult) { if (metadata::Identifier::isEquivalentName(otherName, - alias.c_str())) { + aliasResult.c_str())) { return true; } } @@ -1395,13 +1395,13 @@ bool GeodeticReferenceFrame::hasEquivalentNameToUsingAlias( return false; } - auto aliases = + auto aliasesResult = dbContext->getAliases(std::string(), std::string(), nameStr(), "geodetic_datum", std::string()); const char *otherName = other->nameStr().c_str(); - for (const auto &alias : aliases) { + for (const auto &aliasResult : aliasesResult) { if (metadata::Identifier::isEquivalentName(otherName, - alias.c_str())) { + aliasResult.c_str())) { return true; } } |