Merge pull request #16278 from kinnewig/make_teuchos_rcp

dealii · Nov 20, 2023 · e3f890a · e3f890a
2 parents 715e22d + 0c5468d
commit e3f890a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/include/deal.II/base/trilinos_utilities.h b/include/deal.II/base/trilinos_utilities.h
@@ -210,8 +210,24 @@ namespace Utilities
       using Teuchos::make_rcp;
 #  endif // defined DOXYGEN || !DEAL_II_TRILINOS_VERSION_GTE(14, 0, 0)
     }    // namespace internal
-  }      // namespace Trilinos
-#endif   // DEAL_II_TRILINOS_WITH_TPETRA
+
+
+
+    /* ------------------------- Inline functions ---------------------- */
+    namespace internal
+    {
+#  if !DEAL_II_TRILINOS_VERSION_GTE(14, 0, 0)
+      template <class T, class... Args>
+      inline Teuchos::RCP<T>
+      make_rcp(Args &&...args)
+      {
+        return Teuchos::RCP<T>(new T(std::forward<Args>(args)...));
+      }
+#  endif // !DEAL_II_TRILINOS_VERSION_GTE(14, 0, 0)
+    }    // namespace internal
+
+  }    // namespace Trilinos
+#endif // DEAL_II_TRILINOS_WITH_TPETRA
 
 } // namespace Utilities
 

diff --git a/source/base/trilinos_utilities.cc b/source/base/trilinos_utilities.cc
@@ -169,23 +169,6 @@ namespace Utilities
     }
   } // namespace Trilinos
 #endif
-
-
-#ifdef DEAL_II_TRILINOS_WITH_TPETRA
-  namespace Trilinos
-  {
-#  if !DEAL_II_TRILINOS_VERSION_GTE(14, 0, 0)
-    template <class T, class... Args>
-    Teuchos::RCP<T>
-    make_rcp(Args &&...args)
-    {
-      return Teuchos::RCP<T>(new T(std::forward<Args>(args)...));
-    }
-#  endif // !DEAL_II_TRILINOS_VERSION_GTE(14, 0, 0)
-
-  }    // namespace Trilinos
-#endif // DEAL_II_TRILINOS_WITH_TPETRA
-
 } // namespace Utilities
 
 DEAL_II_NAMESPACE_CLOSE