From 8a9cf478e03068b900c69ea4915f3335e6e4bc88 Mon Sep 17 00:00:00 2001
From: Henner Zeller <hzeller@google.com>
Date: Fri, 27 Oct 2023 22:51:13 -0700
Subject: [PATCH] Disambiguate templated and non-templated typedefs with the
 same name.

Using-declarations with the same name with and without template is
ambiguous for gcc (tested with 12.3.0, 13.x). Disambiguate them.

PiperOrigin-RevId: 577390198
---
 .../domains/unique_elements_container_of_impl.h        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fuzztest/internal/domains/unique_elements_container_of_impl.h b/fuzztest/internal/domains/unique_elements_container_of_impl.h
index 35d573a6b..c3fc06ffa 100644
--- a/fuzztest/internal/domains/unique_elements_container_of_impl.h
+++ b/fuzztest/internal/domains/unique_elements_container_of_impl.h
@@ -42,8 +42,8 @@ template <typename T, typename InnerDomain>
 class UniqueElementsContainerImpl
     : public DomainBase<UniqueElementsContainerImpl<T, InnerDomain>, T,
                         corpus_type_t<UniqueDomain<InnerDomain>>> {
-  using UniqueDomainValueT = UniqueDomainValueT<InnerDomain>;
-  using UniqueDomain = UniqueDomain<InnerDomain>;
+  using InnerUniqueDomainValueT = UniqueDomainValueT<InnerDomain>;
+  using InnerUniqueDomain = UniqueDomain<InnerDomain>;
 
  public:
   using typename UniqueElementsContainerImpl::DomainBase::corpus_type;
@@ -66,13 +66,13 @@ class UniqueElementsContainerImpl
   }
 
   value_type GetValue(const corpus_type& v) const {
-    UniqueDomainValueT unique_values = unique_domain_.GetValue(v);
+    InnerUniqueDomainValueT unique_values = unique_domain_.GetValue(v);
     return value_type(unique_values.begin(), unique_values.end());
   }
 
   std::optional<corpus_type> FromValue(const value_type& v) const {
     return unique_domain_.FromValue(
-        value_type_t<UniqueDomain>(v.begin(), v.end()));
+        value_type_t<InnerUniqueDomain>(v.begin(), v.end()));
   }
 
   auto GetPrinter() const { return unique_domain_.GetPrinter(); }
@@ -100,7 +100,7 @@ class UniqueElementsContainerImpl
   }
 
  private:
-  UniqueDomain unique_domain_;
+  InnerUniqueDomain unique_domain_;
 };
 
 }  // namespace fuzztest::internal