Created
September 27, 2011 18:58
-
-
Save sethrj/1245913 to your computer and use it in GitHub Desktop.
Patch Trilinos 10.x to have fewer warnings in GCC
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -crB original-packages/amesos/src/Amesos_BaseSolver.h packages/amesos/src/Amesos_BaseSolver.h | |
*** original-packages/amesos/src/Amesos_BaseSolver.h 2010-12-09 12:24:45.000000000 -0500 | |
--- packages/amesos/src/Amesos_BaseSolver.h 2011-03-05 13:51:01.000000000 -0500 | |
*************** | |
*** 409,414 **** | |
--- 409,415 ---- | |
//! Redefined from Teuchos::ParameterListAcceptor | |
virtual void setParameterList(Teuchos::RCP<Teuchos::ParameterList> const& paramList) | |
{ | |
+ (void)paramList; | |
// paramList_ = paramlist ; | |
// this->SetParameters( *paramList_ ); | |
} | |
*************** | |
*** 429,435 **** | |
} | |
//! Extracts timing information from the current solver and places it in the parameter list. | |
! virtual void GetTiming( Teuchos::ParameterList &TimingParameterList ) const {} | |
//@} | |
--- 430,438 ---- | |
} | |
//! Extracts timing information from the current solver and places it in the parameter list. | |
! virtual void GetTiming( Teuchos::ParameterList &TimingParameterList ) const { | |
! (void)TimingParameterList; | |
! } | |
//@} | |
diff -crB original-packages/teuchos/src/Teuchos_RCPNode.hpp packages/teuchos/src/Teuchos_RCPNode.hpp | |
*** original-packages/teuchos/src/Teuchos_RCPNode.hpp 2010-12-09 12:25:39.000000000 -0500 | |
--- packages/teuchos/src/Teuchos_RCPNode.hpp 2011-03-05 13:50:08.000000000 -0500 | |
*************** | |
*** 81,86 **** | |
--- 81,88 ---- | |
default: | |
TEST_FOR_EXCEPT(true); | |
} | |
+ #else | |
+ (void)strength; | |
#endif | |
} | |
*************** | |
*** 703,708 **** | |
--- 705,712 ---- | |
<< " has_ownership="<<node_->has_ownership()<<"}"; | |
RCPNodeTracer::addNewRCPNode(node_, os.str()); | |
} | |
+ #else | |
+ (void)newNode; | |
#endif | |
} | |
#ifdef TEUCHOS_DEBUG | |
diff -crB original-packages/ | |
/src/BelosBlockCGIter.hpp packages/belos/src/BelosBlockCGIter.hpp | |
*** original-packages/belos/src/BelosBlockCGIter.hpp 2011-03-05 14:52:46.000000000 -0500 | |
--- packages/belos/src/BelosBlockCGIter.hpp 2011-03-05 14:47:38.000000000 -0500 | |
*************** | |
*** 168,186 **** | |
//@} | |
! | |
//! @name Status methods | |
! //@{ | |
//! \brief Get the current iteration count. | |
int getNumIters() const { return iter_; } | |
! | |
//! \brief Reset the iteration count. | |
void resetNumIters( int iter=0 ) { iter_ = iter; } | |
//! Get the norms of the residuals native to the solver. | |
//! \return A std::vector of length blockSize containing the native residuals. | |
! Teuchos::RCP<const MV> getNativeResiduals( std::vector<MagnitudeType> *norms ) const { return R_; } | |
//! Get the current update to the linear system. | |
/*! \note This method returns a null pointer because the linear problem is current. | |
--- 168,186 ---- | |
//@} | |
! | |
//! @name Status methods | |
! //@{ | |
//! \brief Get the current iteration count. | |
int getNumIters() const { return iter_; } | |
! | |
//! \brief Reset the iteration count. | |
void resetNumIters( int iter=0 ) { iter_ = iter; } | |
//! Get the norms of the residuals native to the solver. | |
//! \return A std::vector of length blockSize containing the native residuals. | |
! Teuchos::RCP<const MV> getNativeResiduals( std::vector<MagnitudeType> *norms ) const { (void)norms; return R_; } | |
//! Get the current update to the linear system. | |
/*! \note This method returns a null pointer because the linear problem is current. | |
diff -crB original-packages/belos/src/BelosCGIter.hpp packages/belos/src/BelosCGIter.hpp | |
*** original-packages/belos/src/BelosCGIter.hpp 2011-03-05 14:52:46.000000000 -0500 | |
--- packages/belos/src/BelosCGIter.hpp 2011-03-05 14:43:20.000000000 -0500 | |
*************** | |
*** 176,182 **** | |
//! Get the norms of the residuals native to the solver. | |
//! \return A std::vector of length blockSize containing the native residuals. | |
! Teuchos::RCP<const MV> getNativeResiduals( std::vector<MagnitudeType> *norms ) const { return R_; } | |
//! Get the current update to the linear system. | |
/*! \note This method returns a null pointer because the linear problem is current. | |
--- 176,182 ---- | |
//! Get the norms of the residuals native to the solver. | |
//! \return A std::vector of length blockSize containing the native residuals. | |
! Teuchos::RCP<const MV> getNativeResiduals( std::vector<MagnitudeType> *norms ) const { (void)norms; return R_; } | |
//! Get the current update to the linear system. | |
/*! \note This method returns a null pointer because the linear problem is current. | |
*************** | |
*** 267,272 **** | |
--- 267,273 ---- | |
stateStorageInitialized_(false), | |
iter_(0) | |
{ | |
+ (void)params; | |
} | |
////////////////////////////////////////////////////////////////////////////////////////////////// | |
diff -crB original-packages/belos/epetra/src/BelosEpetraAdapter.hpp packages/belos/epetra/src/BelosEpetraAdapter.hpp | |
*** original-packages/belos/epetra/src/BelosEpetraAdapter.hpp 2011-03-05 14:52:46.000000000 -0500 | |
--- packages/belos/epetra/src/BelosEpetraAdapter.hpp 2011-03-05 14:38:59.000000000 -0500 | |
*************** | |
*** 222,228 **** | |
bool UseTranspose() const { return (false); }; | |
//! If set true, the transpose of this operator will be applied [not functional for this operator]. | |
! int SetUseTranspose(bool UseTranspose_in) { return 0; }; | |
//! Returns true if this object can provide an approximate inf-norm [always false for this operator]. | |
bool HasNormInf() const { return (false); }; | |
--- 222,228 ---- | |
bool UseTranspose() const { return (false); }; | |
//! If set true, the transpose of this operator will be applied [not functional for this operator]. | |
! int SetUseTranspose(bool UseTranspose_in) { (void)UseTranspose_in; return 0; }; | |
//! Returns true if this object can provide an approximate inf-norm [always false for this operator]. | |
bool HasNormInf() const { return (false); }; | |
diff -crB original-packages/belos/epetra/src/BelosEpetraOperator.h packages/belos/epetra/src/BelosEpetraOperator.h | |
*** original-packages/belos/epetra/src/BelosEpetraOperator.h 2011-03-05 14:52:46.000000000 -0500 | |
--- packages/belos/epetra/src/BelosEpetraOperator.h 2011-03-05 14:39:19.000000000 -0500 | |
*************** | |
*** 98,104 **** | |
//@{ | |
//! Set whether the operator or its inverse should be applied. [ This option is not implemented ] | |
! int SetUseTranspose( bool UseTranspose_in ) { return(-1); }; | |
//@} | |
//! @name Operator application methods | |
--- 98,104 ---- | |
//@{ | |
//! Set whether the operator or its inverse should be applied. [ This option is not implemented ] | |
! int SetUseTranspose( bool UseTranspose_in ) { (void)UseTranspose_in; return(-1); }; | |
//@} | |
//! @name Operator application methods | |
diff -crB original-packages/belos/src/BelosSolverManager.hpp packages/belos/src/BelosSolverManager.hpp | |
*** original-packages/belos/src/BelosSolverManager.hpp 2011-03-05 14:52:46.000000000 -0500 | |
--- packages/belos/src/BelosSolverManager.hpp 2011-03-05 14:43:51.000000000 -0500 | |
*************** | |
*** 118,123 **** | |
--- 118,124 ---- | |
const Teuchos::RCP<StatusTest<ScalarType,MV,OP> > &userConvStatusTest | |
) | |
{ | |
+ (void)userConvStatusTest; | |
TEST_FOR_EXCEPT_MSG(true, "Error, the function setUserConvStatusTest() has not been" | |
<< " overridden for the class" << this->description() << " yet!"); | |
} | |
diff -crB original-packages/teuchos/src/Teuchos_SerialDenseMatrix.hpp packages/teuchos/src/Teuchos_SerialDenseMatrix.hpp | |
*** original-packages/teuchos/src/Teuchos_SerialDenseMatrix.hpp 2011-03-05 14:52:46.000000000 -0500 | |
--- packages/teuchos/src/Teuchos_SerialDenseMatrix.hpp 2011-03-05 14:50:15.000000000 -0500 | |
*************** | |
*** 401,414 **** | |
template<typename OrdinalType, typename ScalarType> | |
SerialDenseMatrix<OrdinalType, ScalarType>::SerialDenseMatrix() | |
! : CompObject(), Object("Teuchos::SerialDenseMatrix"), numRows_(0), numCols_(0), stride_(0), valuesCopied_(false), values_(0) | |
{} | |
template<typename OrdinalType, typename ScalarType> | |
SerialDenseMatrix<OrdinalType, ScalarType>::SerialDenseMatrix( | |
OrdinalType numRows_in, OrdinalType numCols_in, bool zeroOut | |
) | |
! : CompObject(), Object("Teuchos::SerialDenseMatrix"), numRows_(numRows_in), numCols_(numCols_in), stride_(numRows_in) | |
{ | |
values_ = new ScalarType[stride_*numCols_]; | |
valuesCopied_ = true; | |
--- 401,414 ---- | |
template<typename OrdinalType, typename ScalarType> | |
SerialDenseMatrix<OrdinalType, ScalarType>::SerialDenseMatrix() | |
! : CompObject(), Object("Teuchos::SerialDenseMatrix"), BLAS<OrdinalType, ScalarType>(), numRows_(0), numCols_(0), stride_(0), valuesCopied_(false), values_(0) | |
{} | |
template<typename OrdinalType, typename ScalarType> | |
SerialDenseMatrix<OrdinalType, ScalarType>::SerialDenseMatrix( | |
OrdinalType numRows_in, OrdinalType numCols_in, bool zeroOut | |
) | |
! : CompObject(), Object("Teuchos::SerialDenseMatrix"), BLAS<OrdinalType, ScalarType>(), numRows_(numRows_in), numCols_(numCols_in), stride_(numRows_in) | |
{ | |
values_ = new ScalarType[stride_*numCols_]; | |
valuesCopied_ = true; | |
*************** | |
*** 421,427 **** | |
DataAccess CV, ScalarType* values_in, OrdinalType stride_in, OrdinalType numRows_in, | |
OrdinalType numCols_in | |
) | |
! : CompObject(), Object("Teuchos::SerialDenseMatrix"), numRows_(numRows_in), numCols_(numCols_in), stride_(stride_in), | |
valuesCopied_(false), values_(values_in) | |
{ | |
if(CV == Copy) | |
--- 421,427 ---- | |
DataAccess CV, ScalarType* values_in, OrdinalType stride_in, OrdinalType numRows_in, | |
OrdinalType numCols_in | |
) | |
! : CompObject(), Object("Teuchos::SerialDenseMatrix"), BLAS<OrdinalType, ScalarType>(), numRows_(numRows_in), numCols_(numCols_in), stride_(stride_in), | |
valuesCopied_(false), values_(values_in) | |
{ | |
if(CV == Copy) | |
*************** | |
*** 434,440 **** | |
} | |
template<typename OrdinalType, typename ScalarType> | |
! SerialDenseMatrix<OrdinalType, ScalarType>::SerialDenseMatrix(const SerialDenseMatrix<OrdinalType, ScalarType> &Source, ETransp trans) : CompObject(), Object("Teuchos::SerialDenseMatrix"), numRows_(0), numCols_(0), stride_(0), valuesCopied_(true), values_(0) | |
{ | |
if ( trans == Teuchos::NO_TRANS ) | |
{ | |
--- 434,440 ---- | |
} | |
template<typename OrdinalType, typename ScalarType> | |
! SerialDenseMatrix<OrdinalType, ScalarType>::SerialDenseMatrix(const SerialDenseMatrix<OrdinalType, ScalarType> &Source, ETransp trans) : CompObject(), Object("Teuchos::SerialDenseMatrix"), BLAS<OrdinalType, ScalarType>(), numRows_(0), numCols_(0), stride_(0), valuesCopied_(true), values_(0) | |
{ | |
if ( trans == Teuchos::NO_TRANS ) | |
{ | |
*************** | |
*** 476,482 **** | |
OrdinalType numRows_in, OrdinalType numCols_in, OrdinalType startRow, | |
OrdinalType startCol | |
) | |
! : CompObject(), Object("Teuchos::SerialDenseMatrix"), numRows_(numRows_in), numCols_(numCols_in), stride_(Source.stride_), | |
valuesCopied_(false), values_(Source.values_) | |
{ | |
if(CV == Copy) | |
--- 476,482 ---- | |
OrdinalType numRows_in, OrdinalType numCols_in, OrdinalType startRow, | |
OrdinalType startCol | |
) | |
! : CompObject(), Object("Teuchos::SerialDenseMatrix"), BLAS<OrdinalType, ScalarType>(), numRows_(numRows_in), numCols_(numCols_in), stride_(Source.stride_), | |
valuesCopied_(false), values_(Source.values_) | |
{ | |
if(CV == Copy) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment