Merge pull request #4274 from masterleinad/fix_tpetraext_mmhelpers_de…

…cl_cuda-8 Tpetra: Use explicit default template arguments in TpetraExt_MMHelpers_decl.hpp
trilinos · Jan 29, 2019 · 80e2cb3 · 80e2cb3
2 parents 813dd70 + 8189c6c
commit 80e2cb3
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/packages/tpetra/core/ext/TpetraExt_MMHelpers_decl.hpp b/packages/tpetra/core/ext/TpetraExt_MMHelpers_decl.hpp
@@ -118,10 +118,10 @@ class CrsWrapper {
                        const Teuchos::ArrayView<const Scalar> &values) = 0;
 };
 
-template <class Scalar = CrsMatrix<>::scalar_type,
-          class LocalOrdinal = typename CrsMatrix<Scalar>::local_ordinal_type,
-          class GlobalOrdinal = typename CrsMatrix<Scalar, LocalOrdinal>::global_ordinal_type,
-          class Node = typename CrsMatrix<Scalar, LocalOrdinal, GlobalOrdinal>::node_type>
+template <class Scalar = ::Tpetra::Details::DefaultTypes::scalar_type,
+          class LocalOrdinal = ::Tpetra::Details::DefaultTypes::local_ordinal_type,
+          class GlobalOrdinal = ::Tpetra::Details::DefaultTypes::global_ordinal_type,
+          class Node = ::Tpetra::Details::DefaultTypes::node_type>
 class CrsWrapper_CrsMatrix :
     public CrsWrapper<Scalar, LocalOrdinal, GlobalOrdinal, Node> {
 public:
@@ -146,13 +146,10 @@ class CrsWrapper_CrsMatrix :
   crs_matrix_type& crsmat_;
 };
 
-
-template <class Scalar = CrsMatrix<>::scalar_type,
-          class LocalOrdinal = typename CrsMatrix<Scalar>::local_ordinal_type,
-          class GlobalOrdinal =
-            typename CrsMatrix<Scalar, LocalOrdinal>::global_ordinal_type,
-          class Node =
-            typename CrsMatrix<Scalar, LocalOrdinal, GlobalOrdinal>::node_type>
+template <class Scalar = ::Tpetra::Details::DefaultTypes::scalar_type,
+          class LocalOrdinal = ::Tpetra::Details::DefaultTypes::local_ordinal_type,
+          class GlobalOrdinal = ::Tpetra::Details::DefaultTypes::global_ordinal_type,
+          class Node = ::Tpetra::Details::DefaultTypes::node_type>
 class CrsWrapper_GraphBuilder :
     public CrsWrapper<Scalar, LocalOrdinal, GlobalOrdinal, Node> {
 public: