From 3a12cb80d8cb855b9a5c6aa8d16c6371346f2372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cezary=20Skrzy=C5=84ski?=
 <cezary.skrzynski@ng-analytics.com>
Date: Wed, 12 Aug 2020 19:30:19 +0200
Subject: [PATCH] #939 de-template BaseElmProxy over ColT

---
 .../collection/proxy_traits/proxy_elm_traits.h    |  2 +-
 src/vt/vrt/proxy/base_collection_elm_proxy.h      |  5 ++---
 src/vt/vrt/proxy/base_collection_elm_proxy.impl.h |  8 ++++----
 src/vt/vrt/proxy/base_elm_proxy.h                 | 15 +++++++--------
 src/vt/vrt/proxy/collection_elm_proxy.h           |  2 +-
 src/vt/vrt/proxy/collection_proxy.impl.h          |  2 +-
 src/vt/vrt/proxy/collection_proxy_untyped.impl.h  |  2 +-
 7 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/vt/vrt/collection/proxy_traits/proxy_elm_traits.h b/src/vt/vrt/collection/proxy_traits/proxy_elm_traits.h
index eb8370ebbd..48324be400 100644
--- a/src/vt/vrt/collection/proxy_traits/proxy_elm_traits.h
+++ b/src/vt/vrt/collection/proxy_traits/proxy_elm_traits.h
@@ -59,7 +59,7 @@ namespace vt { namespace vrt { namespace collection {
 namespace elm_proxy {
 
 template <typename ColT, typename IndexT>
-using Chain4 = LBable<ColT,IndexT,BaseCollectionElmProxy<ColT,IndexT>>;
+using Chain4 = LBable<ColT,IndexT,BaseCollectionElmProxy<IndexT>>;
 
 template <typename ColT, typename IndexT>
 using Chain3 = Gettable<ColT,IndexT,Chain4<ColT,IndexT>>;
diff --git a/src/vt/vrt/proxy/base_collection_elm_proxy.h b/src/vt/vrt/proxy/base_collection_elm_proxy.h
index 55c717918d..06f1821799 100644
--- a/src/vt/vrt/proxy/base_collection_elm_proxy.h
+++ b/src/vt/vrt/proxy/base_collection_elm_proxy.h
@@ -50,12 +50,11 @@
 
 namespace vt { namespace vrt { namespace collection {
 
-template <typename ColT, typename IndexT>
+template <typename IndexT>
 struct BaseCollectionElmProxy {
-  using CollectionType = ColT;
   using IndexType = IndexT;
   using ProxyType = VirtualProxyType;
-  using ElementProxyType = BaseElmProxy<ColT, IndexT>;
+  using ElementProxyType = BaseElmProxy<IndexT>;
 
   BaseCollectionElmProxy() = default;
   BaseCollectionElmProxy(
diff --git a/src/vt/vrt/proxy/base_collection_elm_proxy.impl.h b/src/vt/vrt/proxy/base_collection_elm_proxy.impl.h
index a972366d5f..85c52b9ad0 100644
--- a/src/vt/vrt/proxy/base_collection_elm_proxy.impl.h
+++ b/src/vt/vrt/proxy/base_collection_elm_proxy.impl.h
@@ -51,15 +51,15 @@
 
 namespace vt { namespace vrt { namespace collection {
 
-template <typename ColT, typename IndexT>
-BaseCollectionElmProxy<ColT, IndexT>::BaseCollectionElmProxy(
+template <typename IndexT>
+BaseCollectionElmProxy<IndexT>::BaseCollectionElmProxy(
   ProxyType const& in_col_proxy, ElementProxyType const& in_elm_proxy
 ) : col_proxy_(in_col_proxy), elm_proxy_(in_elm_proxy)
 { }
 
-template <typename ColT, typename IndexT>
+template <typename IndexT>
 template <typename SerializerT>
-void BaseCollectionElmProxy<ColT, IndexT>::serialize(SerializerT& s) {
+void BaseCollectionElmProxy<IndexT>::serialize(SerializerT& s) {
   s | col_proxy_ | elm_proxy_;
 }
 
diff --git a/src/vt/vrt/proxy/base_elm_proxy.h b/src/vt/vrt/proxy/base_elm_proxy.h
index a491b85b74..b160e30ff1 100644
--- a/src/vt/vrt/proxy/base_elm_proxy.h
+++ b/src/vt/vrt/proxy/base_elm_proxy.h
@@ -58,10 +58,9 @@ namespace vt { namespace vrt { namespace collection {
 static struct virtual_proxy_elm_empty { } virtual_proxy_elm_empty_tag { };
 #pragma GCC diagnostic pop
 
-template <typename ColT, typename IndexT>
+template <typename IndexT>
 struct BaseElmProxy {
   using IndexType = IndexT;
-  using CollectionType = ColT;
 
   explicit BaseElmProxy(IndexT const& in_idx)
     : idx_(in_idx)
@@ -90,14 +89,14 @@ struct BaseElmProxy {
 
 }}} /* end namespace vt::vrt::collection */
 
-template <typename ColT, typename IndexT>
-using ElmType = ::vt::vrt::collection::BaseElmProxy<ColT,IndexT>;
+template <typename IndexT>
+using ElmType = ::vt::vrt::collection::BaseElmProxy<IndexT>;
 
 namespace std {
-  template <typename ColT, typename IndexT>
-  struct hash<ElmType<ColT,IndexT>> {
-    size_t operator()(ElmType<ColT,IndexT> const& in) const {
-      return std::hash<typename ElmType<ColT,IndexT>::IndexType>()(
+  template <typename IndexT>
+  struct hash<ElmType<IndexT>> {
+    size_t operator()(ElmType<IndexT> const& in) const {
+      return std::hash<typename ElmType<IndexT>::IndexType>()(
         in.getIndex()
       );
     }
diff --git a/src/vt/vrt/proxy/collection_elm_proxy.h b/src/vt/vrt/proxy/collection_elm_proxy.h
index 49f5568432..11c73fb76e 100644
--- a/src/vt/vrt/proxy/collection_elm_proxy.h
+++ b/src/vt/vrt/proxy/collection_elm_proxy.h
@@ -65,7 +65,7 @@ struct VrtElmProxy : ProxyCollectionElmTraits<ColT, IndexT> {
 
   VrtElmProxy(
     VirtualProxyType const& in_col_proxy,
-    BaseElmProxy<ColT, IndexT> const& in_elm_proxy
+    BaseElmProxy<IndexT> const& in_elm_proxy
   ) : ProxyCollectionElmTraits<ColT, IndexT>(in_col_proxy, in_elm_proxy)
   { }
 
diff --git a/src/vt/vrt/proxy/collection_proxy.impl.h b/src/vt/vrt/proxy/collection_proxy.impl.h
index 25f27f1077..3370b5aaec 100644
--- a/src/vt/vrt/proxy/collection_proxy.impl.h
+++ b/src/vt/vrt/proxy/collection_proxy.impl.h
@@ -83,7 +83,7 @@ CollectionProxy<ColT, IndexT>::operator()(Tp&& tp, Tn&&... tn) const {
 template <typename ColT, typename IndexT>
 typename CollectionProxy<ColT, IndexT>::ElmProxyType
 CollectionProxy<ColT, IndexT>::index(IndexT const& idx) const {
-  return ElmProxyType{this->proxy_,BaseElmProxy<ColT, IndexT>{idx}};
+  return ElmProxyType{this->proxy_,BaseElmProxy<IndexT>{idx}};
 }
 
 template <typename ColT, typename IndexT>
diff --git a/src/vt/vrt/proxy/collection_proxy_untyped.impl.h b/src/vt/vrt/proxy/collection_proxy_untyped.impl.h
index f8e4c8cb45..2a6a4d43f7 100644
--- a/src/vt/vrt/proxy/collection_proxy_untyped.impl.h
+++ b/src/vt/vrt/proxy/collection_proxy_untyped.impl.h
@@ -58,7 +58,7 @@ namespace vt { namespace vrt { namespace collection {
 template <typename ColT, typename IndexT>
 CollectionUntypedProxy::ElmProxyType<ColT, IndexT>
 CollectionUntypedProxy::index(IndexT const& idx) const {
-  return ElmProxyType<ColT, IndexT>{proxy_,BaseElmProxy<ColT,IndexT>{idx}};
+  return ElmProxyType<ColT, IndexT>{proxy_,BaseElmProxy<IndexT>{idx}};
 }
 
 template <typename ColT, typename IndexT>