From 96b048329c828d29ab5e3ac67da6bdc841eb608b Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 18 Mar 2025 21:21:28 +0000
Subject: [PATCH] libgcobol: Use auto for container iterator types

libgcobol/ChangeLog:

	* charmaps.cc (__gg__raw_to_ascii): Use auto for complicated
	nested type.
	(__gg__raw_to_ebcdic): Likewise.
	(__gg__console_to_ascii): Likewise.
	(__gg__console_to_ebcdic): Likewise.
---
 libgcobol/charmaps.cc | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/libgcobol/charmaps.cc b/libgcobol/charmaps.cc
index 6a7975030df..f990e0ff698 100644
--- a/libgcobol/charmaps.cc
+++ b/libgcobol/charmaps.cc
@@ -439,8 +439,7 @@ __gg__raw_to_ascii(char **dest, size_t *dest_size, const char *in, size_t length
 
     // Check for that unicode code point in the subset of characters we
     // know about:
-    std::unordered_map<unsigned short, unsigned char>::const_iterator it =
-        utf8_to_cp1252_values.find(unicode_point);
+    auto it = utf8_to_cp1252_values.find(unicode_point);
     if( it == utf8_to_cp1252_values.end() )
         {
         // That unicode character isn't in our list
@@ -501,8 +500,7 @@ __gg__raw_to_ebcdic(char **dest, size_t *dest_size, const char *in, size_t lengt
                                                                 position );
         // Check for that unicode code point in the subset of characters we
         // know about:
-        std::unordered_map<unsigned short, unsigned char>::const_iterator it =
-            utf8_to_cp1252_values.find(unicode_point);
+        auto it = utf8_to_cp1252_values.find(unicode_point);
         if( it == utf8_to_cp1252_values.end() )
             {
             // That unicode character isn't in our list
@@ -769,8 +767,7 @@ void __gg__console_to_ascii(char * const str, size_t length)
             {
             // Check for that unicode code point in the subset of characters we
             // know about:
-            std::unordered_map<unsigned short, unsigned char>::const_iterator it
-                = utf8_to_cp1252_values.find(unicode_point);
+            auto it = utf8_to_cp1252_values.find(unicode_point);
             if( it == utf8_to_cp1252_values.end() )
                 {
                 // That unicode character isn't in our list
@@ -810,8 +807,7 @@ __gg__console_to_ebcdic(char * const str, size_t length)
             {
             // Check for that unicode code point in the subset of characters we
             // know about:
-            std::unordered_map<unsigned short, unsigned char>::const_iterator it
-                = utf8_to_cp1252_values.find(unicode_point);
+            auto it = utf8_to_cp1252_values.find(unicode_point);
             if( it == utf8_to_cp1252_values.end() )
                 {
                 // That unicode character isn't in our list