commit 7fa50235f6a5d65ee6d63b57ca3b2e5aeb92d45b
author Stephen Hines <srhines@google.com> Thu Jul 19 16:50:20 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jul 19 16:50:20 2018 -0700
tree 75a81163e89f09c092a7719e8a1757f214034a83
parent 088bf6b8966d9c58714c7cc2a9d107a9a5c0f348
parent 4411b373be4214e03d38f583f9edfd6ac3c95159

Merge "Remove "template" keyword from non-templated calls." am: 9f9372bcc1
am: 4411b373be

Change-Id: Ia4f907dfc7d3ad2f04d3a61d43b6c6ba4c78930e

libs/vr/libpdx/private/pdx/rpc/variant.h

diff --git a/libs/vr/libpdx/private/pdx/rpc/variant.h b/libs/vr/libpdx/private/pdx/rpc/variant.h
index 2cc9664..bdcb293 100644
--- a/libs/vr/libpdx/private/pdx/rpc/variant.h
+++ b/libs/vr/libpdx/private/pdx/rpc/variant.h
@@ -292,7 +292,7 @@
 
   template <typename T>
   T& get(TypeTag<T>) {
-    return rest_.template get(TypeTag<T>{});
+    return rest_.get(TypeTag<T>{});
   }
   template <typename T>
   const T& get(TypeTag<T>) const {
@@ -300,7 +300,7 @@
   }
   template <typename T>
   constexpr std::int32_t index(TypeTag<T>) const {
-    return 1 + rest_.template index(TypeTag<T>{});
+    return 1 + rest_.index(TypeTag<T>{});
   }
 
   template <typename... Args>