@@ -244,14 +244,14 @@ auto any::unthunkVariant(const any& a) -> const any& {
244244auto any::operator[](const char rhs[]) const -> const any& {
245245 const any& variant = unthunkVariant(*this);
246246 assert(variant.type == Type::Map);
247− const any::map::const_iterator begin = variant.m->begin();
248− const any::map::const_iterator end = variant.m->end();
249− for (any::map::const_iterator it = begin; it != end; ++it) {
247+ const auto begin = variant.m->cbegin();
248+ const auto end = variant.m->cend();
249+ for (auto it = begin; it != end; ++it) {
250250 if (it->first == rhs) {
251251 return it->second;
252252 }
253253 }
254− for (any::map::const_iterator it = begin; it != end; ++it) {
254+ for (auto it = begin; it != end; ++it) {
255255 if (strcmp(it->first, rhs) == 0) {
256256 return it->second;
257257 }
@@ -274,14 +274,14 @@ auto any::operator[](const any& rhs) const -> const any& {
274274auto any::contains(const char key[]) const -> bool {
275275 const any& variant = unthunkVariant(*this);
276276 assert(variant.type == Type::Map);
277− const any::map::const_iterator begin = variant.m->begin();
278− const any::map::const_iterator end = variant.m->end();
279− for (any::map::const_iterator it = begin; it != end; ++it) {
277+ const auto begin = variant.m->cbegin();
278+ const auto end = variant.m->cend();
279+ for (auto it = begin; it != end; ++it) {
280280 if (it->first == key) {
281281 return true;
282282 }
283283 }
284− for (any::map::const_iterator it = begin; it != end; ++it) {
284+ for (auto it = begin; it != end; ++it) {
285285 if (strcmp(it->first, key) == 0) {
286286 return true;
287287 }