Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7aa68ba7 authored by Stephen Hines's avatar Stephen Hines Committed by android-build-merger
Browse files

Merge "Remove more "template" keywords from calls that aren't templated." am:...

Merge "Remove more "template" keywords from calls that aren't templated." am: a9a0e147 am: 3a7c6099
am: f9b3985c

Change-Id: If9dce3d89afdec393b94cf619d66a5479cad5efd
parents 5c0f68e9 f9b3985c
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ class Variant {
  template <typename T>
  constexpr std::int32_t index_of() const {
    static_assert(HasType<T>::value, "T is not an element type of Variant.");
    return value_.template index(DecayedTypeTag<T>{});
    return value_.index(DecayedTypeTag<T>{});
  }

  // Returns the index of the active type. If the Variant is empty -1 is
@@ -575,7 +575,7 @@ class Variant {
  template <typename T>
  T* get() {
    if (is<T>())
      return &value_.template get(DecayedTypeTag<T>{});
      return &value_.get(DecayedTypeTag<T>{});
    else
      return nullptr;
  }
@@ -589,7 +589,7 @@ class Variant {
  template <std::size_t I>
  TypeForIndex<I>* get() {
    if (is<TypeForIndex<I>>())
      return &value_.template get(TypeTagForIndex<I>{});
      return &value_.get(TypeTagForIndex<I>{});
    else
      return nullptr;
  }