Merge Pull Request #13746 from cgcgcg/Trilinos/warnings

Automatically Merged using Trilinos Pull Request AutoTester PR Title: b'Silence warnings' PR Author: cgcgcg
trilinos · Jan 24, 2025 · 4c14b7e · 4c14b7e
2 parents 643fc11 + b6a7b72
commit 4c14b7e
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 4 deletions.
diff --git a/packages/amesos2/src/Amesos2_Factory.hpp b/packages/amesos2/src/Amesos2_Factory.hpp
@@ -50,6 +50,8 @@
 
 #include "Amesos2_config.h"
 
+#include "Teuchos_CompilerCodeTweakMacros.hpp"
+
 #include "Amesos2_Solver.hpp"
 #include "Amesos2_SolverTraits.hpp"
 
@@ -640,7 +642,7 @@ struct throw_no_matrix_support_exception {
         return handle_solver_matrix_and_type_support<MUMPS,Matrix,Vector>::apply(A,X,B);
       }
 #endif
-              
+
 #ifdef HAVE_AMESOS2_STRUMPACK
     if((solverName == "STRUMPACK") || (solverName == "strumpack") ||
        (solverName == "amesos2_STRUMPACK") || (solverName == "amesos2_strumpack"))
@@ -666,6 +668,7 @@ struct throw_no_matrix_support_exception {
     std::string err_msg = solver_name + " is not enabled or is not supported";
     TEUCHOS_TEST_FOR_EXCEPTION(true, std::invalid_argument, err_msg);
     //return( Teuchos::null ); // unreachable
+    TEUCHOS_UNREACHABLE_RETURN(Teuchos::null);
   }
 
 } // end namespace Amesos2

diff --git a/packages/muelu/src/MueCentral/MueLu_VerbosityLevel.cpp b/packages/muelu/src/MueCentral/MueLu_VerbosityLevel.cpp
@@ -90,8 +90,10 @@ MsgType toVerbLevel(const std::string& verbLevelStr) {
   std::string lcVerb = lowerCase(verbLevelStr);
   if (verbMap.find(lcVerb) != verbMap.end())
     return verbMap[lcVerb];
-  else
+  else {
     TEUCHOS_TEST_FOR_EXCEPTION(true, Exceptions::RuntimeError, "MueLu::ParameterListInterpreter():: invalid verbosity level: " << verbLevelStr);
+    TEUCHOS_UNREACHABLE_RETURN(Errors);
+  }
 }
 
 }  // namespace MueLu
diff --git a/packages/panzer/adapters-stk/src/Panzer_STK_WorksetFactory.cpp b/packages/panzer/adapters-stk/src/Panzer_STK_WorksetFactory.cpp
@@ -8,6 +8,8 @@
 // *****************************************************************************
 // @HEADER
 
+#include "Teuchos_CompilerCodeTweakMacros.hpp"
+
 #include <Panzer_SetupPartitionedWorksetUtilities.hpp>
 #include "Panzer_STK_WorksetFactory.hpp"
 
@@ -119,6 +121,7 @@ getWorksets(const panzer::WorksetDescriptor & worksetDesc,
   }
   else {
     TEUCHOS_ASSERT(false);
+    TEUCHOS_UNREACHABLE_RETURN(Teuchos::null);
   }
 }
 

diff --git a/packages/panzer/mini-em/src/solvers/MiniEM_Interpolation.cpp b/packages/panzer/mini-em/src/solvers/MiniEM_Interpolation.cpp
@@ -8,6 +8,7 @@
 // *****************************************************************************
 // @HEADER
 
+#include "Teuchos_CompilerCodeTweakMacros.hpp"
 #include "MiniEM_Interpolation.hpp"
 #include "Panzer_Interpolation.hpp"
 
@@ -87,8 +88,10 @@ request(const Teko::RequestMesg & rm) {
       build();
     }
     return interp_;
-  } else
+  } else {
     TEUCHOS_ASSERT(false);
+    TEUCHOS_UNREACHABLE_RETURN(Teuchos::null);
+  }
 }
 
 void

diff --git a/packages/panzer/mini-em/src/solvers/MiniEM_Utils.cpp b/packages/panzer/mini-em/src/solvers/MiniEM_Utils.cpp
@@ -11,6 +11,7 @@
 #ifndef _MiniEM_Utils_cpp_
 #define _MiniEM_Utils_cpp_
 
+#include "Teuchos_CompilerCodeTweakMacros.hpp"
 #include "MiniEM_Utils.hpp"
 #include "Thyra_DiagonalLinearOpBase.hpp"
 #include "Thyra_DefaultDiagonalLinearOp.hpp"
@@ -206,8 +207,10 @@ namespace mini_em {
       // return Teuchos::rcp_const_cast<Thyra::LinearOpBase<double> >(thyConst);
       return thyConst;
 #endif
-    } else
+    } else {
       TEUCHOS_ASSERT(false);
+      TEUCHOS_UNREACHABLE_RETURN(Teuchos::null);
+    }
   }
 
   bool isMatrixFreeOperator(const Teko::LinearOp& op) {

diff --git a/packages/teko/src/Teko_GaussSeidelPreconditionerFactory.cpp b/packages/teko/src/Teko_GaussSeidelPreconditionerFactory.cpp
@@ -11,6 +11,7 @@
 
 #include "Teko_BlockUpperTriInverseOp.hpp"
 #include "Teko_BlockLowerTriInverseOp.hpp"
+#include "Teuchos_CompilerCodeTweakMacros.hpp"
 
 using Teuchos::rcp;
 using Teuchos::RCP;
@@ -54,6 +55,7 @@ LinearOp GaussSeidelPreconditionerFactory::buildPreconditionerOperator(
   }
 
   TEUCHOS_ASSERT(false);  // we should never make it here!
+  TEUCHOS_UNREACHABLE_RETURN(Teuchos::null);
 }
 
 //! Initialize from a parameter list

diff --git a/packages/teko/src/Teko_InverseLibrary.cpp b/packages/teko/src/Teko_InverseLibrary.cpp
@@ -367,6 +367,7 @@ Teuchos::RCP<InverseFactory> InverseLibrary::getInverseFactory(const std::string
   }
 
   TEUCHOS_ASSERT(false);
+  TEUCHOS_UNREACHABLE_RETURN(Teuchos::null);
 }
 
 //! Print the inverses and parameter lists available for use

diff --git a/packages/xpetra/src/MultiVector/Xpetra_MultiVectorFactory_def.hpp b/packages/xpetra/src/MultiVector/Xpetra_MultiVectorFactory_def.hpp
@@ -41,6 +41,7 @@ MultiVectorFactory<Scalar, LocalOrdinal, GlobalOrdinal, Node>::
 
   XPETRA_FACTORY_ERROR_IF_EPETRA(map->lib());
   XPETRA_FACTORY_END;
+  TEUCHOS_UNREACHABLE_RETURN(Teuchos::null);
 }
 
 template <class Scalar, class LocalOrdinal, class GlobalOrdinal, class Node>
-Original file line number
+Diff line change
@@ Expand Up @@
       }
       TEUCHOS_ASSERT(false);
+      TEUCHOS_UNREACHABLE_RETURN(Teuchos::null);
     }
     //! Print the inverses and parameter lists available for use
@@ Expand Down @@