Merge Pull Request #13280 from sebrowne/Trilinos/deprecated-warnings

Automatically Merged using Trilinos Pull Request AutoTester PR Title: b'Xpetra: Make deprecation warnings optional' PR Author: sebrowne
trilinos · Jul 24, 2024 · 505da08 · 505da08
2 parents 8f1a163 + a7459b0
commit 505da08
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 0 deletions.
diff --git a/packages/xpetra/cmake/Xpetra_config.hpp.in b/packages/xpetra/cmake/Xpetra_config.hpp.in
@@ -32,4 +32,6 @@
 
 @XPETRA_DEPRECATED_DECLARATIONS@
 
+#cmakedefine Xpetra_SHOW_DEPRECATED_WARNINGS
+
 #endif // XPETRA_CONFIG_HPP
diff --git a/packages/xpetra/src/CrsGraph/Xpetra_EpetraCrsGraph.hpp b/packages/xpetra/src/CrsGraph/Xpetra_EpetraCrsGraph.hpp
@@ -62,8 +62,10 @@
 
 #if defined(XPETRA_ENABLE_DEPRECATED_CODE)
 #ifdef __GNUC__
+#if defined(Xpetra_SHOW_DEPRECATED_WARNINGS)
 #warning "The header file Trilinos/packages/xpetra/src/CrsGraph/Xpetra_EpetraCrsGraph.hpp is deprecated."
 #endif
+#endif
 #else
 #error "The header file Trilinos/packages/xpetra/src/CrsGraph/Xpetra_EpetraCrsGraph.hpp is deprecated."
 #endif

diff --git a/packages/xpetra/src/CrsMatrix/Xpetra_EpetraCrsMatrix.hpp b/packages/xpetra/src/CrsMatrix/Xpetra_EpetraCrsMatrix.hpp
@@ -71,8 +71,10 @@
 
 #if defined(XPETRA_ENABLE_DEPRECATED_CODE)
 #ifdef __GNUC__
+#if defined(Xpetra_SHOW_DEPRECATED_WARNINGS)
 #warning "The header file Trilinos/packages/xpetra/src/CrsMatrix/Xpetra_EpetraCrsMatrix.hpp is deprecated."
 #endif
+#endif
 #else
 #error "The header file Trilinos/packages/xpetra/src/CrsMatrix/Xpetra_EpetraCrsMatrix.hpp is deprecated."
 #endif

diff --git a/packages/xpetra/src/Export/Xpetra_EpetraExport.hpp b/packages/xpetra/src/Export/Xpetra_EpetraExport.hpp
@@ -56,8 +56,10 @@
 
 #if defined(XPETRA_ENABLE_DEPRECATED_CODE)
 #ifdef __GNUC__
+#if defined(Xpetra_SHOW_DEPRECATED_WARNINGS)
 #warning "The header file Trilinos/packages/xpetra/src/Export/Xpetra_EpetraExport.hpp is deprecated."
 #endif
+#endif
 #else
 #error "The header file Trilinos/packages/xpetra/src/Export/Xpetra_EpetraExport.hpp is deprecated."
 #endif

diff --git a/packages/xpetra/src/Import/Xpetra_EpetraImport.hpp b/packages/xpetra/src/Import/Xpetra_EpetraImport.hpp
@@ -58,8 +58,10 @@
 
 #if defined(XPETRA_ENABLE_DEPRECATED_CODE)
 #ifdef __GNUC__
+#if defined(Xpetra_SHOW_DEPRECATED_WARNINGS)
 #warning "The header file Trilinos/packages/xpetra/src/Import/Xpetra_EpetraImport.hpp is deprecated."
 #endif
+#endif
 #else
 #error "The header file Trilinos/packages/xpetra/src/Import/Xpetra_EpetraImport.hpp is deprecated."
 #endif

diff --git a/packages/xpetra/src/Map/Xpetra_EpetraMap.hpp b/packages/xpetra/src/Map/Xpetra_EpetraMap.hpp
@@ -61,8 +61,10 @@
 
 #if defined(XPETRA_ENABLE_DEPRECATED_CODE)
 #ifdef __GNUC__
+#if defined(Xpetra_SHOW_DEPRECATED_WARNINGS)
 #warning "The header file Trilinos/packages/xpetra/src/Map/Xpetra_EpetraMap.hpp is deprecated."
 #endif
+#endif
 #else
 #error "The header file Trilinos/packages/xpetra/src/Map/Xpetra_EpetraMap.hpp is deprecated."
 #endif

diff --git a/packages/xpetra/src/MultiVector/Xpetra_EpetraIntMultiVector.hpp b/packages/xpetra/src/MultiVector/Xpetra_EpetraIntMultiVector.hpp
@@ -58,8 +58,10 @@
 
 #if defined(XPETRA_ENABLE_DEPRECATED_CODE)
 #ifdef __GNUC__
+#if defined(Xpetra_SHOW_DEPRECATED_WARNINGS)
 #warning "The header file Trilinos/packages/xpetra/src/MultiVector/Xpetra_EpetraIntMultiVector.hpp is deprecated."
 #endif
+#endif
 #else
 #error "The header file Trilinos/packages/xpetra/src/MultiVector/Xpetra_EpetraIntMultiVector.hpp is deprecated."
 #endif

diff --git a/packages/xpetra/src/MultiVector/Xpetra_EpetraMultiVector.hpp b/packages/xpetra/src/MultiVector/Xpetra_EpetraMultiVector.hpp
@@ -69,8 +69,10 @@
 
 #if defined(XPETRA_ENABLE_DEPRECATED_CODE)
 #ifdef __GNUC__
+#if defined(Xpetra_SHOW_DEPRECATED_WARNINGS)
 #warning "The header file Trilinos/packages/xpetra/src/MultiVector/Xpetra_EpetraMultiVector.hpp is deprecated."
 #endif
+#endif
 #else
 #error "The header file Trilinos/packages/xpetra/src/MultiVector/Xpetra_EpetraMultiVector.hpp is deprecated."
 #endif

diff --git a/packages/xpetra/src/Operator/Xpetra_EpetraOperator.hpp b/packages/xpetra/src/Operator/Xpetra_EpetraOperator.hpp
@@ -61,8 +61,10 @@
 
 #if defined(XPETRA_ENABLE_DEPRECATED_CODE)
 #ifdef __GNUC__
+#if defined(Xpetra_SHOW_DEPRECATED_WARNINGS)
 #warning "The header file Trilinos/packages/xpetra/src/Operator/Xpetra_EpetraOperator.hpp is deprecated."
 #endif
+#endif
 #else
 #error "The header file Trilinos/packages/xpetra/src/Operator/Xpetra_EpetraOperator.hpp is deprecated."
 #endif

diff --git a/packages/xpetra/src/Vector/Xpetra_EpetraIntVector.hpp b/packages/xpetra/src/Vector/Xpetra_EpetraIntVector.hpp
@@ -59,8 +59,10 @@
 
 #if defined(XPETRA_ENABLE_DEPRECATED_CODE)
 #ifdef __GNUC__
+#if defined(Xpetra_SHOW_DEPRECATED_WARNINGS)
 #warning "The header file Trilinos/packages/xpetra/src/Vector/Xpetra_EpetraIntVector.hpp is deprecated."
 #endif
+#endif
 #else
 #error "The header file Trilinos/packages/xpetra/src/Vector/Xpetra_EpetraIntVector.hpp is deprecated."
 #endif

diff --git a/packages/xpetra/src/Vector/Xpetra_EpetraVector.hpp b/packages/xpetra/src/Vector/Xpetra_EpetraVector.hpp
@@ -62,8 +62,10 @@
 
 #if defined(XPETRA_ENABLE_DEPRECATED_CODE)
 #ifdef __GNUC__
+#if defined(Xpetra_SHOW_DEPRECATED_WARNINGS)
 #warning "The header file Trilinos/packages/xpetra/src/Vector/Xpetra_EpetraVector.hpp is deprecated."
 #endif
+#endif
 #else
 #error "The header file Trilinos/packages/xpetra/src/Vector/Xpetra_EpetraVector.hpp is deprecated."
 #endif
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,4 +32,6 @@

		@XPETRA_DEPRECATED_DECLARATIONS@

		#cmakedefine Xpetra_SHOW_DEPRECATED_WARNINGS

		#endif // XPETRA_CONFIG_HPP