Merge branch 'xpetra-mv' into muelu-tpetra-dep

trilinos · Jun 9, 2021 · 1ad8fed · 1ad8fed
2 parents 3421e3f + bec80dd
commit 1ad8fed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/xpetra/src/MultiVector/Xpetra_EpetraIntMultiVector.hpp b/packages/xpetra/src/MultiVector/Xpetra_EpetraIntMultiVector.hpp
@@ -734,7 +734,7 @@ const Epetra_IntMultiVector & toEpetra(const MultiVector<int, int, GlobalOrdinal
       //@{
   #ifdef HAVE_XPETRA_KOKKOS_REFACTOR
       typedef typename Xpetra::MultiVector<Scalar, LocalOrdinal, GlobalOrdinal, Node>::dual_view_type dual_view_type;
-
+#ifdef TPETRA_ENABLE_DEPRECATED_CODE
       typename dual_view_type::t_host_um getHostLocalView () const {
         typedef Kokkos::View< typename dual_view_type::t_host::data_type ,
                       Kokkos::LayoutLeft,
@@ -783,6 +783,7 @@ const Epetra_IntMultiVector & toEpetra(const MultiVector<int, int, GlobalOrdinal
       getLocalView () const {
         return this->MultiVector< Scalar, LocalOrdinal, GlobalOrdinal, Node >::template getLocalView<TargetDeviceType>();
       }
+#endif
   #endif
 
       //@}

diff --git a/packages/xpetra/src/Vector/Xpetra_EpetraIntVector.hpp b/packages/xpetra/src/Vector/Xpetra_EpetraIntVector.hpp
@@ -710,7 +710,7 @@ const Epetra_IntVector & toEpetra(const Vector<int, int, GlobalOrdinal, Node> &)
       //@{
   #ifdef HAVE_XPETRA_KOKKOS_REFACTOR
       typedef typename Xpetra::MultiVector<Scalar, LocalOrdinal, GlobalOrdinal, Node>::dual_view_type dual_view_type;
-
+#ifdef TPETRA_ENABLE_DEPRECATED_CODE
       typename dual_view_type::t_host_um getHostLocalView () const {
         typedef Kokkos::View< typename dual_view_type::t_host::data_type ,
                       Kokkos::LayoutLeft,
@@ -758,7 +758,7 @@ const Epetra_IntVector & toEpetra(const Vector<int, int, GlobalOrdinal, Node> &)
         return this->MultiVector< Scalar, LocalOrdinal, GlobalOrdinal, Node >::template getLocalView<TargetDeviceType>();
       }
   #endif
-
+#endif
       //@}
 
     protected: