Internal changes

PiperOrigin-RevId: 704291385
protocolbuffers · Dec 9, 2024 · 717b5e6 · 717b5e6
1 parent 936525f
commit 717b5e6
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
@@ -69,7 +69,7 @@ struct PtrAndLen;
 namespace internal {
 namespace v2 {
 class TableDriven;
-};
+}  // namespace v2
 
 template <typename Key, typename T>
 class MapFieldLite;
@@ -89,10 +89,6 @@ class DynamicMapField;
 
 class GeneratedMessageReflection;
 
-namespace v2 {
-class TableDriven;
-}  // namespace v2
-
 // The largest valid serialization for a message is INT_MAX, so we can't have
 // more than 32-bits worth of elements.
 using map_index_t = uint32_t;
@@ -1120,7 +1116,7 @@ class Map : private internal::KeyMapBase<internal::KeyForBase<Key>> {
     }
 
     // Allow implicit conversion to const_iterator.
-    operator const_iterator() const {  // NOLINT(runtime/explicit)
+    operator const_iterator() const {  // NOLINT(google-explicit-constructor)
       return const_iterator(static_cast<const BaseIt&>(*this));
     }