diff --git a/mythtv/libs/libmythmetadata/dirscan.cpp b/mythtv/libs/libmythmetadata/dirscan.cpp
index c473fcf0097..ed18acc8819 100644
--- a/mythtv/libs/libmythmetadata/dirscan.cpp
+++ b/mythtv/libs/libmythmetadata/dirscan.cpp
@@ -35,6 +35,7 @@ namespace
 
         bool extension_ignored(const QString &extension) const
         {
+            //NOLINTNEXTLINE(modernize-use-auto)
             ext_map::const_iterator p = m_extensions.find(extension.toLower());
             if (p != m_extensions.end())
                 return p->second;
diff --git a/mythtv/libs/libmythmetadata/videometadatalistmanager.cpp b/mythtv/libs/libmythmetadata/videometadatalistmanager.cpp
index 28d2b616175..326644b769f 100644
--- a/mythtv/libs/libmythmetadata/videometadatalistmanager.cpp
+++ b/mythtv/libs/libmythmetadata/videometadatalistmanager.cpp
@@ -37,6 +37,7 @@ class VideoMetadataListManagerImp
 
     VideoMetadataPtr byFilename(const QString &file_name) const
     {
+        //NOLINTNEXTLINE(modernize-use-auto)
         string_to_meta::const_iterator p = m_fileMap.find(file_name);
         if (p != m_fileMap.end())
         {
@@ -47,6 +48,7 @@ class VideoMetadataListManagerImp
 
     VideoMetadataPtr byID(unsigned int db_id) const
     {
+        //NOLINTNEXTLINE(modernize-use-auto)
         int_to_meta::const_iterator p = m_idMap.find(db_id);
         if (p != m_idMap.end())
         {